0ad-data: 0.0.18-1~getdeb1

* New upstream version
ckorn · Mar 15, 2015 · 7d8562e · 7d8562e
1 parent c6b10de
commit 7d8562e
Show file tree

Hide file tree

Showing 5 changed files with 169 additions and 15 deletions.
diff --git a/0ad-data/0ad-data-common.links b/0ad-data/0ad-data-common.links
@@ -1,4 +1,9 @@
-usr/share/fonts/truetype/dejavu/DejaVuSans.ttf                             usr/share/games/0ad/tools/fontbuilder/fonts/DejaVuSans.ttf
-usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf                         usr/share/games/0ad/tools/fontbuilder/fonts/DejaVuSansMono.ttf
+usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf                          usr/share/games/0ad/tools/fontbuilder/fonts/DejaVuSansMono.ttf
+usr/share/fonts/truetype/freefont/FreeMono.ttf                              usr/share/games/0ad/tools/fontbuilder/fonts/FreeMono.ttf
+usr/share/fonts/truetype/freefont/FreeSans.ttf                              usr/share/games/0ad/tools/fontbuilder/fonts/FreeSans.ttf
+usr/share/fonts/truetype/freefont/FreeSansBold.ttf                          usr/share/games/0ad/tools/fontbuilder/fonts/FreeSansBold.ttf
+usr/share/fonts/truetype/freefont/FreeSansOblique.ttf                       usr/share/games/0ad/tools/fontbuilder/fonts/FreeSansOblique.ttf
+usr/share/fonts/truetype/freefont/FreeSerif.ttf                             usr/share/games/0ad/tools/fontbuilder/fonts/FreeSerif.ttf
+usr/share/fonts/truetype/freefont/FreeSerifBold.ttf                         usr/share/games/0ad/tools/fontbuilder/fonts/FreeSerifBold.ttf
 usr/share/texmf/fonts/opentype/public/tex-gyre/texgyrepagella-bold.otf      usr/share/games/0ad/tools/fontbuilder/fonts/texgyrepagella-bold.otf
 usr/share/texmf/fonts/opentype/public/tex-gyre/texgyrepagella-regular.otf   usr/share/games/0ad/tools/fontbuilder/fonts/texgyrepagella-regular.otf
diff --git a/0ad-data/changelog b/0ad-data/changelog
@@ -1,14 +1,24 @@
-0ad-data (0.0.17-1~getdeb1) trusty; urgency=medium
+0ad-data (0.0.18-1~getdeb1) trusty; urgency=medium
 
   * New upstream version
 
- -- Christoph Korn <christoph.korn@getdeb.net>  Sat, 18 Oct 2014 21:05:29 +0200
+ -- Christoph Korn <christoph.korn@getdeb.net>  Sat, 14 Mar 2015 16:52:34 +0100
 
-0ad-data (0.0.16-1~getdeb1) trusty; urgency=medium
+0ad-data (0.0.17-1) unstable; urgency=medium
 
-  * New upstream version
+  * New upstream release.
+  * Add dependency on fonts-freefont-ttf | ttf-freefont.
+  * Update Standards version to 3.9.6, no changes required.
+
+ -- Vincent Cheng <vcheng@debian.org>  Mon, 13 Oct 2014 18:17:13 -0700
+
+0ad-data (0.0.16-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update my email address.
+  * Update Standards version to 3.9.5, no changes required.
 
- -- Christoph Korn <christoph.korn@getdeb.net>  Sun, 18 May 2014 00:09:08 +0200
+ -- Vincent Cheng <vcheng@debian.org>  Sat, 17 May 2014 16:23:59 -0700
 
 0ad-data (0.0.15-1) unstable; urgency=medium
 

diff --git a/0ad-data/control b/0ad-data/control
@@ -2,7 +2,7 @@ Source: 0ad-data
 Section: games
 Priority: optional
 Maintainer: GetDeb Package Ninjas <package.ninjas@getdeb.net>
-Uploaders: Vincent Cheng <Vincentc1208@gmail.com>
+Uploaders: Vincent Cheng <vcheng@debian.org>
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.15.5)
 Standards-Version: 3.9.5
@@ -27,8 +27,9 @@ Description: Real-time strategy game of ancient warfare (data files)
 Package: 0ad-data-common
 Architecture: all
 Pre-Depends: dpkg (>= 1.15.6~)
-Depends: fonts-texgyre,
-         fonts-dejavu-core,
+Depends: fonts-dejavu-core | ttf-dejavu-core,
+         fonts-freefont-ttf | ttf-freefont,
+         fonts-texgyre | tex-gyre,
          ${misc:Depends}
 Breaks: 0ad-data (<< 0.0.12-1~)
 Replaces: 0ad-data (<< 0.0.12-1~)

diff --git a/0ad-data/copyright b/0ad-data/copyright
@@ -10,7 +10,23 @@ Files: binaries/data/tools/fontbuilder/fonts/DejaVuSans.ttf
        binaries/data/tools/fontbuilder/fonts/DevaVuSansMono.ttf
 Copyright: 2003 Bitstream, Inc.
            2006 Tavmjong Bah
-License: Bitstream-Vera-Fonts and Arev-Fonts
+License: Bitstream Vera Fonts and Arev Fonts
+
+Files: binaries/data/tools/fontbuilder/fonts/FreeMono.ttf
+       binaries/data/tools/fontbuilder/fonts/FreeSans.ttf
+       binaries/data/tools/fontbuilder/fonts/FreeSansBold.ttf
+       binaries/data/tools/fontbuilder/fonts/FreeSansOblique.ttf
+       binaries/data/tools/fontbuilder/fonts/FreeSerif.ttf
+       binaries/data/tools/fontbuilder/fonts/FreeSerifBold.ttf
+Copyright: 2002-2009 Free Software Foundation
+License: GPL-3+ with Font exception
+
+Files: binaries/data/tools/fontbuilder/fonts/LinBiolinum_Kah.ttf
+       binaries/data/tools/fontbuilder/fonts/LinBiolinum_Rah.ttf
+       binaries/data/tools/fontbuilder/fonts/LinBiolinum_RBah.ttf
+       binaries/data/tools/fontbuilder/fonts/LinBiolinum_RIah.ttf
+Copyright: 2003-2009 Philipp H. Poll <philthelion@users.sourceforge.net>
+License: GPL-3+ with Font exception and OFL-1.1
 
 Files: binaries/data/tools/fontbuilder/fonts/texgyrepagella-bold.otf
        binaries/data/tools/fontbuilder/fonts/texgyrepagella-regular.otf
@@ -28,10 +44,10 @@ License: GPL-2+
 
 Files: debian/*
 Copyright: 2010-2012 Rico Tzschichholz <ricotz@ubuntu.com>
-           2012 Vincent Cheng <Vincentc1208@gmail.com>
+           2012-2014 Vincent Cheng <vcheng@debian.org>
 License: GPL-2+
 
-License: Arev-Fonts
+License: Arev Fonts
  Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
  .
  Permission is hereby granted, free of charge, to any person obtaining
@@ -77,7 +93,7 @@ License: Arev-Fonts
  from Tavmjong Bah. For further information, contact: tavmjong @ free
  . fr.
 
-License: Bitstream-Vera-Fonts
+License: Bitstream Vera Fonts
  Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
  a trademark of Bitstream, Inc.
  .
@@ -532,6 +548,32 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
+License: GPL-3+ with Font exception
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+ .
+ As a special exception, if you create a document which uses this font, and
+ embed this font or unaltered portions of this font into the document, this
+ font does not by itself cause the resulting document to be covered by the GNU
+ General Public License. This exception does not however invalidate any other
+ reasons why the document might be covered by the GNU General Public License.
+ If you modify this font, you may extend this exception to your version of the
+ font, but you are not obligated to do so. If you do not wish to do so, delete
+ this exception statement from your version.
+
 License: Gust-Font
  This is version 1.0, dated 22 June 2009, of the GUST Font License.
  (GUST is the Polish TeX Users Group, http://www.gust.org.pl)
@@ -561,3 +603,99 @@ License: Gust-Font
  The latest version of the LaTeX Project Public License is in
  http://www.latex-project.org/lppl.txt and version 1.3c or later
  is part of all distributions of LaTeX version 2006/05/20 or later.
+
+License: OFL-1.1
+ This Font Software is Copyright (c) 2003-2006, Philipp H. Poll
+ (http://linuxlibertine.sf.net/).  All Rights Reserved.
+ .
+ "Linux Libertine" is a Reserved Font Name for this Font Software.
+ .
+ This Font Software is licensed under the SIL Open Font License, Version
+ 1.0.  No modification of the license is permitted, only verbatim copy is
+ allowed.  This license is copied below, and is also available with a FAQ
+ at: http://scripts.sil.org/OFL
+ .
+ -----------------------------------------------------------
+ SIL OPEN FONT LICENSE Version 1.0 - 22 November 2005
+ -----------------------------------------------------------
+ .
+ PREAMBLE
+ The goals of the Open Font License (OFL) are to stimulate worldwide
+ development of cooperative font projects, to support the font creation
+ efforts of academic and linguistic communities, and to provide an open
+ framework in which fonts may be shared and improved in partnership with
+ others.
+ .
+ The OFL allows the licensed fonts to be used, studied, modified and
+ redistributed freely as long as they are not sold by themselves. The fonts,
+ including any derivative works, can be bundled, embedded, redistributed and
+ sold with any software provided that the font names of derivative works are
+ changed. The fonts and derivatives, however, cannot be released under any
+ other type of license.
+ .
+ DEFINITIONS
+ "Font Software" refers to any and all of the following:
+ 	- font files
+ 	- data files
+ 	- source code
+ 	- build scripts
+ 	- documentation
+ .
+ "Reserved Font Name" refers to the Font Software name as seen by users and
+ any other names as specified after the copyright statement.
+ .
+ "Standard Version" refers to the collection of Font Software components as
+ distributed by the Copyright Holder.
+ .
+ "Modified Version" refers to any derivative font software made by adding
+ to, deleting, or substituting -- in part or in whole -- any of the
+ components of the Standard Version, by changing formats or by porting the
+ Font Software to a new environment.
+ .
+ "Author" refers to any designer, engineer, programmer, technical writer or
+ other person who contributed to the Font Software.
+ .
+ PERMISSION & CONDITIONS Permission is hereby granted, free of charge, to
+ any person obtaining a copy of the Font Software, to use, study, copy,
+ merge, embed, modify, redistribute, and sell modified and unmodified
+ copies of the Font Software, subject to the following conditions:
+ .
+ 1) Neither the Font Software nor any of its individual components, in
+ Standard or Modified Versions, may be sold by itself.
+ .
+ 2) Standard or Modified Versions of the Font Software may be bundled,
+ redistributed and sold with any software, provided that each copy contains
+ the above copyright notice and this license. These can be included either
+ as stand-alone text files, human-readable headers or in the appropriate
+ machine-readable metadata fields within text or binary files as long as
+ those fields can be easily viewed by the user.
+ .
+ 3) No Modified Version of the Font Software may use the Reserved Font
+ Name(s), in part or in whole, unless explicit written permission is granted
+ by the Copyright Holder. This restriction applies to all references stored
+ in the Font Software, such as the font menu name and other font description
+ fields, which are used to differentiate the font from others.
+ .
+ 4) The name(s) of the Copyright Holder or the Author(s) of the Font
+ Software shall not be used to promote, endorse or advertise any Modified
+ Version, except to acknowledge the contribution(s) of the Copyright Holder
+ and the Author(s) or with their explicit written permission.
+ .
+ 5) The Font Software, modified or unmodified, in part or in whole, must be
+ distributed using this license, and may not be distributed under any other
+ license.
+ .
+ TERMINATION
+ This license becomes null and void if any of the above conditions are not
+ met.
+ .
+ DISCLAIMER
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS
+ IN THE FONT SOFTWARE.
diff --git a/0ad-data/rules b/0ad-data/rules
@@ -8,7 +8,7 @@ override_dh_install:
 
 override_dh_link:
 	# Remove embedded fonts and use system copies instead
-	rm -f $(CURDIR)/debian/0ad-data-common/usr/share/games/0ad/tools/fontbuilder/fonts/*.{ttf,otf}
+	rm -f $(CURDIR)/debian/0ad-data-common/usr/share/games/0ad/tools/fontbuilder/fonts/{DejaVuSansMono,Free*,texgyrepagella*}.{ttf,otf}
 	dh_link
 
 override_dh_builddeb: