r8935 - in packages/trunk/freecol/debian: . wrapper
Vincent Fourmond
fourmond at alioth.debian.org
Mon Feb 23 23:53:14 UTC 2009
Author: fourmond
Date: 2009-02-23 23:53:13 +0000 (Mon, 23 Feb 2009)
New Revision: 8935
Modified:
packages/trunk/freecol/debian/changelog
packages/trunk/freecol/debian/control
packages/trunk/freecol/debian/copyright
packages/trunk/freecol/debian/wrapper/freecol
Log:
[freecol] Various packaging updates before testing and uploading a new version
Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog 2009-02-23 23:18:17 UTC (rev 8934)
+++ packages/trunk/freecol/debian/changelog 2009-02-23 23:53:13 UTC (rev 8935)
@@ -1,8 +1,17 @@
-freecol (0.7.4.dfsg+1-2) UNRELEASED; urgency=low
+freecol (0.8.1.dfsg-1) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * New upstream release
+ * Adding alternate dependency on the virtual package java6-runtime, since
+ all variants seem to be able to run freecol. (closes: #503810)
+ * Switched to a machine-readable debian/copyright file
+ * Updated to small newer features of java-wrappers (and bumped the
+ version dependency accordingly)
+ * Added a debian/README.source to mention the use of a patch system,
+ which makes it now comply to standards 3.8.0
+ * Adding ${misc:Depends} for potential debhelper-induced dependencies
- -- Vincent Fourmond <fourmond at debian.org> Sun, 10 Aug 2008 18:08:37 +0200
+ -- Vincent Fourmond <fourmond at debian.org> Tue, 24 Feb 2009 00:52:17 +0100
freecol (0.7.4.dfsg+1-1) unstable; urgency=low
Modified: packages/trunk/freecol/debian/control
===================================================================
--- packages/trunk/freecol/debian/control 2009-02-23 23:18:17 UTC (rev 8934)
+++ packages/trunk/freecol/debian/control 2009-02-23 23:53:13 UTC (rev 8935)
@@ -4,19 +4,18 @@
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Vincent Fourmond <fourmond at debian.org>
Build-Depends: debhelper (>= 5), dpatch,
- ant, openjdk-6-jdk | icedtea-java7-jdk | sun-java6-jdk
+ ant, openjdk-6-jdk
Build-Depends-Indep: libhiglayout-java, libwoodstox-java,
tex4ht, texlive-base-bin, ant-optional, texlive-latex-recommended
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://www.freecol.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freecol
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/freecol
-
Package: freecol
Architecture: all
-Depends: openjdk-6-jre | icedtea-java7-jre | sun-java6-jre | j2re1.6 ,
- libhiglayout-java, libwoodstox-java, , java-wrappers (>= 0.1.6)
+Depends: openjdk-6-jre | java6-runtime, libhiglayout-java,
+ libwoodstox-java, java-wrappers (>= 0.1.13), ${misc:Depends}
Description: an open version of Colonization
freecol is a game in the spirit of Civilization but taking place in a
colonial background. Colonize a new world, build towns, trade or fight
Modified: packages/trunk/freecol/debian/copyright
===================================================================
--- packages/trunk/freecol/debian/copyright 2009-02-23 23:18:17 UTC (rev 8934)
+++ packages/trunk/freecol/debian/copyright 2009-02-23 23:53:13 UTC (rev 8935)
@@ -1,72 +1,73 @@
-This package was debianized by Vincent Fourmond <fourmond at debian.org> on
-Mon, 01 Oct 2007 23:58:51 +0200.
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=437
+Upstream-Source: http://www.freecol.org
+Upstream-Name: freecol
+Upstream-Maintainer: The FreeCol Team <freecol-developers at lists.sourceforge.net>
-The original tarball was made downloading the freecol-0.7.2-src.tar.gz
-tarball on http://www.freecol.org/download.html, applying the patch
-debian/freecol-dist-targz.diff and then using the ant target
-tarDistBundle. Hopefully, this will get included upstream so I won't
-have to bother later on.
+ This package was debianized by Vincent Fourmond <fourmond at debian.org> on
+ Mon, 01 Oct 2007 23:58:51 +0200.
-Upstream Authors:
+ The original tarball was made downloading the freecol-*-src.tar.gz
+ tarball on http://www.freecol.org/download.html, applying the patch
+ debian/freecol-dist-targz.diff and then using the ant target
+ tarDistBundle.
- The FreeCol Team <freecol-developers at lists.sourceforge.net>
+ For more details, see the debian/new-upstream script that does precisely
+ this.
-Copyright:
+Files: *
+Copyright: Copyright (C) 2003-2009 The FreeCol Team
+License: GPL-2+
+ 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 2 of the License, or
+ (at your option) any later version.
- Copyright (C) 2003-2007 The FreeCol Team
-
- A number of images are fidel copies of objects in the public
- domain and are thus not copyrightable (see for instance
- http://en.wikipedia.org/wiki/Bridgeman_Art_Library_v._Corel_Corp
- for more information). See the list below.
-
- The font data/fonts/ShadowedBlack.ttf is
- Copyright Paul Lloyd <Paul.Lloyd at uwa.edu.au>
-
- packaging/gentoo/freecol-0.3.0.ebuild is
- Copyright 1999-2004 Gentoo Foundation
-
-License:
-
- All files except those not copyrightable are provided under the
- following conditions:
-
- 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 2 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.
- 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 package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-Here is a list of files that are coming from David Rumsey's Map
-Collection, but are not copyrightable, being fidel copies of original
-artwork long gone into the public domain:
-data/images/ui/bg_map1.jpg
-data/images/ui/military.png
-data/images/ui/political.png
-data/images/ui/religious.png
-data/images/ui/trade.png
-data/images/ui/exploration.png
-data/images/ui/landing.png
+Files: debian/*
+Copyright: Copyright (C) 2007-2009 Vincent Fourmond <fourmond at debian.org>
+License: GPL-2+
+ (see above)
-The following files were downloaded from Wikimedia and are in the public
-domain:
+Files: data/fonts/ShadowedBlack.ttf is
+Copyright: Copyright Paul Lloyd <Paul.Lloyd at uwa.edu.au>
+License: GPL-2+
+ (see above)
-data/images/monarch/*
-data/images/ui/bg_europe.jpg
-data/images/ui/doi.png
+Files: packaging/gentoo/freecol-0.3.0.ebuild is
+Copyright: Copyright 1999-2004 Gentoo Foundation
+License: GPL-2+
+ (see above)
+Files: data/images/ui/bg_map1.jpg
+Files: data/images/ui/military.png
+Files: data/images/ui/political.png
+Files: data/images/ui/religious.png
+Files: data/images/ui/trade.png
+Files: data/images/ui/exploration.png
+Files: data/images/ui/landing.png
+Copyright: not copyrightable
+License: PD
+ The aforementioned images are fidel copies of objects in the public
+ domain and are thus not copyrightable (see for instance
+ http://en.wikipedia.org/wiki/Bridgeman_Art_Library_v._Corel_Corp for
+ more information).
-The Debian packaging is (C) 2007, Vincent Fourmond <fourmond at debian.org> and
-is licensed under the GPL, see above.
+Files: data/images/monarch/*
+Files: data/images/ui/bg_europe.jpg
+Files: data/images/ui/doi.png
+Copyright: no copyright
+License: PD
+ The aforementioned files were downloaded from Wikimedia and are in
+ the public domain.
Modified: packages/trunk/freecol/debian/wrapper/freecol
===================================================================
--- packages/trunk/freecol/debian/wrapper/freecol 2009-02-23 23:18:17 UTC (rev 8934)
+++ packages/trunk/freecol/debian/wrapper/freecol 2009-02-23 23:53:13 UTC (rev 8935)
@@ -4,7 +4,7 @@
. /usr/lib/java-wrappers/java-wrappers.sh
# We need openjdk, icedtea or Sun 6
-find_java_runtime openjdk || find_java_runtime icedtea || find_java_runtime sun6
+find_java_runtime openjdk java6
find_jars higlayout wstx-lgpl freecol
More information about the Pkg-games-commits
mailing list