[redeclipse-data] 02/07: Use Files-Excluded for uscan
Martin Werner
arand-guest at moszumanska.debian.org
Sun Jun 21 20:46:14 UTC 2015
This is an automated email from the git hooks/post-receive script.
arand-guest pushed a commit to branch master
in repository redeclipse-data.
commit eafef23cea57416cf9e1fbbdaeac430dcdf92fd2
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date: Fri Jun 19 12:46:04 2015 +0200
Use Files-Excluded for uscan
devscripts 2.14.2 allows uscan to parse Files-Excluded from
debian/copyright to automatically repack the tarball with exclusions,
use this instead of manual removals in the rules file. See
https://wiki.debian.org/UscanEnhancements for details.
* Rewrite debian/generate-copyright to add Files-Excluded to
debian/copyright and run it to generate the new file
* Remove manual deletions from debian/rules and adapt to new uscan
method
* Keep Akashi font in source, since not in any Debian package, and it
is was used in some of the artwork
---
debian/copyright | 179 +++++++++++++++++++++++++++++++++++++++++++++-
debian/generate-copyright | 15 ++--
debian/rules | 13 +---
3 files changed, 189 insertions(+), 18 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 8888dbe..0fea7d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,10 @@ Upstream-Name: Red Eclipse
Upstream-Contact: Quinton "Quin" Reeves <qreeves at gmail.com>
Lee "Eihrul" Salzman <lsalzman at gmail.com>
Source: https://github.com/red-eclipse/data
+ The Play font files sources are removed since they are shipped in the
+ fonts-play package in Debian, and the generated png files are removed to
+ simplify the build process.
+Files-Excluded: fonts/Play* fonts/play*
License: Red-Eclipse-Data
Content included in the game (maps, textures, sounds, models etc.) may have
individual copyrights and distribution restrictions (see individual readmes),
@@ -180,7 +184,7 @@ License: RaZgRiZ-simple-attribution
Files: particles/blood.png
particles/fire.png
Copyright: FischKopF
-License: public-domain
+License: FischKopF-public-domain
Created by FischKopF, source: http://www.quadropolis.us/node/2693
Uploaded explicitly as "Public Domain", with the additional comment:
"Feel free to edit, claim it's yours, use it in own projects"
@@ -222,6 +226,91 @@ Files: nobiax/*
Copyright: Nobiax
License: CC0-1.0
+Files: fonts/akashi*.ttf
+Copyright: 2007-2013 Ten by Twenty
+License: OFL-1.1
+Comment:
+ I, Martin Erik Werner ("arand") have had a longer email discussion with Ed
+ Merrit (the Author of Akashi) regarding the license of the Akashi font
+ available from Ten By Twenty, and the conclusion is that the Akashi font is
+ distibuted under the SIL Open Font License (OFL) 1.1
+ Copyright © 2007 - 2013 Ten by Twenty.
+ .
+ The concluding bits from the email conversation are reproduced below:
+ .
+ Message-ID: <517F948C.8040909 at edmerritt.com>
+ Date: Tue, 30 Apr 2013 10:53:16 +0100
+ From: Ed Merritt <ed at edmerritt.com>
+ To: Martin Erik Werner <martinerikwerner at gmail.com>
+ Subject: Re: Fwd: akashi license
+ References: <4EB54D50.30708 at gmail.com> <4EB54DF3.30105 at edmerritt.com>
+ <1364335792.6577.62.camel at mas> <1367096373.20993.29.camel at mas>
+ In-Reply-To: <1367096373.20993.29.camel at mas>
+ .
+ Hi Martin,
+ I've updated the footer of the site to state that all fonts are
+ distributed under the SIL Open Font License.
+ .
+ Ed
+ .
+ .
+ .
+ On 27/04/2013 21:59, Martin Erik Werner wrote:
+ > Hi,
+ >
+ > I know I'm nagging a bit :) But could you have a look at the questions
+ > in my last email below?
+ >
+ > We'd like to know where to go with our usage of Akashi and things kind
+ > of depend on whether or not we can get a clarification of the license.
+ >
+ > Pretty please? :)
+ .
+ Message-ID: <1364335792.6577.62.camel at mas>
+ Subject: Re: Fwd: akashi license
+ From: Martin Erik Werner <martinerikwerner at gmail.com>
+ To: Ed Merritt <ed at edmerritt.com>
+ Date: Tue, 26 Mar 2013 23:09:52 +0100
+ In-Reply-To: <4EB54DF3.30105 at edmerritt.com>
+ References: <4EB54D50.30708 at gmail.com> <4EB54DF3.30105 at edmerritt.com>
+ .
+ Hi Ed,
+ .
+ (I was using the alias "Arand Nash" with the ienorand at gmail.com email
+ previously. I've since switched over to using the birth name)
+ .
+ We are currently using your typeface "Akashi" for several pieces of
+ "word art" and in the logo of the Free and Open Source FPS game Red
+ Eclipse <http://redeclipse.net>.
+ .
+ It's an awesome font which we really like! :)
+ .
+ I previously contacted you regarding a clarification of the font
+ license, since we tend to be a bit picky with our licenses in order to
+ remain fully open source, the clarification I got at that point we
+ deemed fine.
+ .
+ However, it seems that some distributions, into which we would very much
+ like Red Eclipse to be accepted, wants a more formal license for things
+ (explicitly allowing use, modification, and redistribution with or
+ without modification).
+ .
+ (The discussion in question is on a bug report for the game package in
+ the linux distribution Fedora:
+ https://bugzilla.redhat.com/show_bug.cgi?id=895947)
+ .
+ Would it be possible to get a more formal clarification of the license
+ for the Akashi font covering those bits, or more preferably, would it be
+ possible to use the Akashi font under a well-known license like the
+ OFL-1.1, since this would make sure to avoid all the misinterpretation
+ pitfalls of a custom-written license.
+ .
+ Thanks!
+ --
+ Martin Erik Werner "arand" <martinerikwerner at gmail.com>
+ .
+ <removed previous quoted email conversation>
+
Files: textures/logo.png luckystrike/pub2* luckystrike/pub1*
Copyright: Ed Merrit, Ten by Twenty, <http://www.tenbytwenty.com/>
2011, Red Eclipse Team
@@ -413,6 +502,94 @@ License: Expat
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+License: OFL-1.1
+ -----------------------------------------------------------
+ SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+ -----------------------------------------------------------
+ .
+ PREAMBLE
+ The goals of the Open Font License (OFL) are to stimulate worldwide
+ development of collaborative font projects, to support the font creation
+ efforts of academic and linguistic communities, and to provide a free and
+ 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/or sold with any software provided that any reserved
+ names are not used by derivative works. The fonts and derivatives,
+ however, cannot be released under any other type of license. The
+ requirement for fonts to remain under this license does not apply
+ to any document created using the fonts or their derivatives.
+ .
+ DEFINITIONS
+ "Font Software" refers to the set of files released by the Copyright
+ Holder(s) under this license and clearly marked as such. This may
+ include source files, build scripts and documentation.
+ .
+ "Reserved Font Name" refers to any names specified as such after the
+ copyright statement(s).
+ .
+ "Original Version" refers to the collection of Font Software components as
+ distributed by the Copyright Holder(s).
+ .
+ "Modified Version" refers to any derivative made by adding to, deleting,
+ or substituting -- in part or in whole -- any of the components of the
+ Original 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 Original or Modified Versions, may be sold by itself.
+ .
+ 2) Original or Modified Versions of the Font Software may be bundled,
+ redistributed and/or 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) unless explicit written permission is granted by the corresponding
+ Copyright Holder. This restriction only applies to the primary font name as
+ presented to the users.
+ .
+ 4) The name(s) of the Copyright Holder(s) 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(s) 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 entirely under this license, and must not be
+ distributed under any other license. The requirement for fonts to
+ remain under this license does not apply to any document created
+ using the Font Software.
+ .
+ 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.
+
License: CC-BY-3.0
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
diff --git a/debian/generate-copyright b/debian/generate-copyright
index 9564a32..1fac4b7 100755
--- a/debian/generate-copyright
+++ b/debian/generate-copyright
@@ -23,6 +23,10 @@ Upstream-Name: Red Eclipse
Upstream-Contact: Quinton "Quin" Reeves <qreeves at gmail.com>
Lee "Eihrul" Salzman <lsalzman at gmail.com>
Source: https://github.com/red-eclipse/data
+ The Play font files sources are removed since they are shipped in the
+ fonts-play package in Debian, and the generated png files are removed to
+ simplify the build process.
+Files-Excluded: fonts/Play* fonts/play*
License: Red-Eclipse-Data
EOF
@@ -33,15 +37,16 @@ sed -e 's/^/\ /' -e 's/^\ $/\ \./' readme.txt >> debian/copyright-new
sed '/Format:.*/d' "$all_licenses" >> debian/copyright-new
# Remove all records related to bin/*, config/*, doc/*, data/fonts/* and src/*
-awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^Files: (bin|config|doc|data\/fonts|src)\// ' debian/copyright-new > debian/copyright-temp
+# (not present in the source)
+awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^Files: (bin|config|doc|src)\// ' debian/copyright-new > debian/copyright-temp
mv debian/copyright-temp debian/copyright-new
-# Remove data/ prefix
-sed 's/ data\// /g' debian/copyright-new > debian/copyright-temp
+# Remove records for Play font files (deleted from source package)
+awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^Files: data\/fonts\/[Pp]lay/' debian/copyright-new > debian/copyright-temp
mv debian/copyright-temp debian/copyright-new
-# Remove record for "OFL-1.1" license
-awk 'BEGIN{ ORS="\n\n"; RS="" ; FS="\n"} $1 !~ /^License: OFL-1.1$/' debian/copyright-new > debian/copyright-temp
+# Remove data/ prefix
+sed 's/ data\// /g' debian/copyright-new > debian/copyright-temp
mv debian/copyright-temp debian/copyright-new
# Add marker for inserting Debian chunk
diff --git a/debian/rules b/debian/rules
index 07d56f2..7ed4972 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,16 +21,5 @@ override_dh_auto_install:
override_dh_builddeb:
dh_builddeb -- -Zxz
-DIR=redeclipse-data-$(DEB_VERSION_UPSTREAM).orig
get-orig-source:
- uscan --noconf --rename --force-download --download-current-version \
- --destdir=.
- rm -rf $(DIR)
- tar -xf redeclipse-data_$(DEB_VERSION_UPSTREAM).orig.tar.gz
- rm -f redeclipse-data_$(DEB_VERSION_UPSTREAM).orig.tar.gz
- mv data-$(DEB_VERSION_UPSTREAM)/ $(DIR)
- rm -rf $(DIR)/fonts
- find $(DIR) -type f -name '.git*' -delete
- XZ_OPT="-6" tar --create --xz --owner root --group root --mode a+rX \
- -f redeclipse-data_$(DEB_VERSION_UPSTREAM).orig.tar.xz $(DIR)
- rm -rf $(DIR)
+ uscan --noconf --rename --repack --compression xz --force-download --download-current-version --destdir=.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse-data.git
More information about the Pkg-games-commits
mailing list