Author: apo-guest Date: 2013-08-25 11:14:05 +0000 (Sun, 25 Aug 2013) New Revision: 14521
Added: packages/trunk/freecol/debian/freecol.doc-base Removed: packages/trunk/freecol/debian/README.source packages/trunk/freecol/debian/patches/disable-listener.diff Modified: packages/trunk/freecol/debian/changelog packages/trunk/freecol/debian/compat packages/trunk/freecol/debian/control packages/trunk/freecol/debian/copyright packages/trunk/freecol/debian/freecol.desktop packages/trunk/freecol/debian/freecol.install packages/trunk/freecol/debian/patches/series packages/trunk/freecol/debian/rules Log: New upstream release 0.10.7+dfsg-1 Switch to default-jdk. Close #683450 Bump compat level to 9, require debhelper 9. Add doc-base file Update copyright to format 1.0 Remove versioned dependencies Bump Standards-Version to 3.9.4 See also changelog Deleted: packages/trunk/freecol/debian/README.source =================================================================== --- packages/trunk/freecol/debian/README.source 2013-08-24 19:01:45 UTC (rev 14520) +++ packages/trunk/freecol/debian/README.source 2013-08-25 11:14:05 UTC (rev 14521) @@ -1,9 +0,0 @@ -Note about the source package of freecol. - -This package uses dpatch to manage all modifications to the upstream -source. See /usr/share/doc/dpatch/README.source.gz to get more information -on how to use it. - - -- Vincent Fourmond <fourm...@debian.org>, Tue, 24 Feb 2009 00:50:16 +0100 - - Modified: packages/trunk/freecol/debian/changelog =================================================================== --- packages/trunk/freecol/debian/changelog 2013-08-24 19:01:45 UTC (rev 14520) +++ packages/trunk/freecol/debian/changelog 2013-08-25 11:14:05 UTC (rev 14521) @@ -1,8 +1,26 @@ -freecol (0.10.5+dfsg-2) UNRELEASED; urgency=low +freecol (0.10.7+dfsg-1) unstable; urgency=low + * Team upload. + * New upstream release. + * Bump Standards-Version to 3.9.4, no changes. + * Bump compat level to 9, require debhelper >= 9. + * debian/control: + - Remove versioned dependencies. They are trivially satisfied in Debian. + - Switch to default-jdk. (Closes: #683450) + * Drop README.source. Dpatch is not in use anymore. + * debian/rules: Set JAVA_HOME_DIRS to default-jdk. + * freecol.desktop: Add keywords and a comment in German. + * Remove disable-listener.diff. The patch was disabled and incorporated + upstream. + * Install data/freecol.png to /usr/share/pixmaps. Use a higher resolution + desktop icon. + * Update debian/copyright to copyright format 1.0. + * Register freecol documentation with doc-base. Add freecol.doc-base. + + [Evgeni Golov] * Correct Vcs-* URLs to point to anonscm.debian.org - -- Evgeni Golov <evg...@debian.org> Mon, 15 Jul 2013 22:21:25 +0200 + -- Markus Koschany <a...@gambaru.de> Sun, 25 Aug 2013 13:11:53 +0200 freecol (0.10.5+dfsg-1) unstable; urgency=low @@ -13,9 +31,9 @@ -- Vincent Fourmond <fourm...@debian.org> Tue, 06 Mar 2012 00:10:22 +0100 freecol (0.10.0+dfsg-5) unstable; urgency=low - + [ Giovanni Mascellani ] - * Remove the libwoodstox-java dependency, which isn't necessary. + * Remove the libwoodstox-java dependency, which isn't necessary. (closes: #650745) [ Vincent Fourmond ] @@ -117,9 +135,9 @@ * 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 + * 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, + * 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 * Refreshed debian/patches/10-fix-jar-path.dpatch @@ -134,9 +152,9 @@ freecol (0.7.4.dfsg+1-1) unstable; urgency=low - * Pseudo new upstream release to work around dak's + * Pseudo new upstream release to work around dak's move-from-contrib-to-main bug. - + -- Vincent Fourmond <fourm...@debian.org> Sun, 10 Aug 2008 16:59:02 +0200 freecol (0.7.4.dfsg-2) unstable; urgency=low @@ -156,7 +174,7 @@ * New upstream release. * Finally add a .dfsg suffix to the version number, to reflect the - fact that the upstream tarball is repackaged (since this time I + fact that the upstream tarball is repackaged (since this time I had forgotten that ;-)...). * Update debian/new-upstream and debian/watch accordingly @@ -170,7 +188,7 @@ freecol (0.7.3-3) unstable; urgency=low - * Adding openjdk-6-* as alternative (Build-)?Deps, thanks to + * Adding openjdk-6-* as alternative (Build-)?Deps, thanks to Matvey Kozhev <inetper...@gmail.com> for pointing out (closes: #480107) -- Vincent Fourmond <fourm...@debian.org> Thu, 08 May 2008 08:32:20 +0200 @@ -205,8 +223,8 @@ Ubuntu (closes: #453836) - added a desktop file - fix wrapper file position and pathes - - added icedtea dependencies - * Added an icon for the menu + - added icedtea dependencies + * Added an icon for the menu -- Vincent Fourmond <fourm...@debian.org> Fri, 14 Dec 2007 01:18:14 +0100 @@ -220,7 +238,7 @@ freecol (0.7.2-3) unstable; urgency=low - * Add a dependency on j2re1.6 for java-package made packages + * Add a dependency on j2re1.6 for java-package made packages (Closes: #452407) * Added various meta-information field to debian/control @@ -235,7 +253,7 @@ * Apparently, I cannot build freecol for java5, as libraries are missing. Switching to java6 (Closes: #448082, #448083) * Urgency high to fix two RC bugs in testing - * Fixing table of contents and links in PDF manual + * Fixing table of contents and links in PDF manual -- Vincent Fourmond <fourm...@debian.org> Fri, 26 Oct 2007 21:27:20 +0200 Modified: packages/trunk/freecol/debian/compat =================================================================== --- packages/trunk/freecol/debian/compat 2013-08-24 19:01:45 UTC (rev 14520) +++ packages/trunk/freecol/debian/compat 2013-08-25 11:14:05 UTC (rev 14521) @@ -1 +1 @@ -5 +9 Modified: packages/trunk/freecol/debian/control =================================================================== --- packages/trunk/freecol/debian/control 2013-08-24 19:01:45 UTC (rev 14520) +++ packages/trunk/freecol/debian/control 2013-08-25 11:14:05 UTC (rev 14521) @@ -2,22 +2,35 @@ Section: games Priority: optional Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> -Uploaders: Vincent Fourmond <fourm...@debian.org> -Build-Depends: debhelper (>= 5), ant, openjdk-6-jdk, cdbs +Uploaders: + Vincent Fourmond <fourm...@debian.org> +Build-Depends: + ant, + cdbs, + debhelper (>= 9), + default-jdk Build-Depends-Indep: - tex4ht, texlive-binaries | texlive-base-bin, ant-optional, - texlive-latex-recommended, libcommons-cli-java, libmiglayout-java, - libcortado-java, javahelper -Standards-Version: 3.9.3 + ant-optional, + javahelper, + libcommons-cli-java, + libcortado-java, + libmiglayout-java, + tex4ht, + texlive-binaries | texlive-base-bin, + texlive-latex-recommended +Standards-Version: 3.9.4 Homepage: http://www.freecol.org Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/freecol Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/freecol Package: freecol Architecture: all -Depends: openjdk-6-jre | java6-runtime, - java-wrappers (>= 0.1.13), ${misc:Depends}, ${java:Depends}, - fonts-liberation (>= 1.07.0-2~) +Depends: + default-jre | java7-runtime, + fonts-liberation, + java-wrappers, + ${java:Depends}, + ${misc:Depends} Description: open source remake of the old Colonization freecol is a game in the spirit of Civilization but taking place in a colonial background. Colonize the new world, build towns, trade or Modified: packages/trunk/freecol/debian/copyright =================================================================== --- packages/trunk/freecol/debian/copyright 2013-08-24 19:01:45 UTC (rev 14520) +++ packages/trunk/freecol/debian/copyright 2013-08-25 11:14:05 UTC (rev 14521) @@ -1,73 +1,73 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=437 +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Source: http://www.freecol.org Upstream-Name: freecol -Upstream-Maintainer: The FreeCol Team <freecol-develop...@lists.sourceforge.net> - +Upstream-Contact: The FreeCol Team <freecol-develop...@lists.sourceforge.net> +Comment: This package was debianized by Vincent Fourmond <fourm...@debian.org> on Mon, 01 Oct 2007 23:58:51 +0200. - + . 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. - + . For more details, see the debian/new-upstream script that does precisely this. 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. + 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. + . + 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 version 2 can be found in `/usr/share/common-licenses/GPL-2'. - 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 - On Debian systems, the complete text of the GNU General Public - License version 2 can be found in `/usr/share/common-licenses/GPL-2'. - - Files: debian/* Copyright: Copyright (C) 2007-2009 Vincent Fourmond <fourm...@debian.org> License: GPL-2+ (see above) -Files: data/fonts/ShadowedBlack.ttf is +Files: data/fonts/ShadowedBlack.ttf is Copyright: Copyright Paul Lloyd <paul.ll...@uwa.edu.au> License: GPL-2+ (see above) -Files: packaging/gentoo/freecol-0.3.0.ebuild is -Copyright: Copyright 1999-2004 Gentoo Foundation +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 + 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 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 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). Files: data/images/monarch/* -Files: data/images/ui/bg_europe.jpg -Files: data/images/ui/doi.png + data/images/ui/bg_europe.jpg + data/images/ui/doi.png Copyright: no copyright License: PD - The aforementioned files were downloaded from Wikimedia and are in - the public domain. + The aforementioned files were downloaded from Wikimedia and are in + the public domain. Modified: packages/trunk/freecol/debian/freecol.desktop =================================================================== --- packages/trunk/freecol/debian/freecol.desktop 2013-08-24 19:01:45 UTC (rev 14520) +++ packages/trunk/freecol/debian/freecol.desktop 2013-08-25 11:14:05 UTC (rev 14521) @@ -1,8 +1,10 @@ [Desktop Entry] Name=FreeCol Comment=Turn-based strategy game +Comment[de]=Rundenbasierendes Strategiespiel Exec=freecol Icon=freecol Terminal=false Type=Application Categories=Java;Game;StrategyGame; +Keywords=strategy;colonization;civilization;turn-based;isometric; Added: packages/trunk/freecol/debian/freecol.doc-base =================================================================== --- packages/trunk/freecol/debian/freecol.doc-base (rev 0) +++ packages/trunk/freecol/debian/freecol.doc-base 2013-08-25 11:14:05 UTC (rev 14521) @@ -0,0 +1,12 @@ +Document: freecol +Title: freecol manual +Author: The freecol project +Abstract: This manual describes the gameplay of freecol. +Section: Games/Simulation + +Format: PDF +Files: /usr/share/doc/freecol/FreeCol.pdf.gz + +Format: HTML +Index: /usr/share/doc/freecol/FreeCol.html +Files: /usr/share/doc/freecol/FreeCol.html Modified: packages/trunk/freecol/debian/freecol.install =================================================================== --- packages/trunk/freecol/debian/freecol.install 2013-08-24 19:01:45 UTC (rev 14520) +++ packages/trunk/freecol/debian/freecol.install 2013-08-25 11:14:05 UTC (rev 14521) @@ -1,6 +1,5 @@ data/* usr/share/games/freecol -debian/wrapper/freecol usr/games debian/freecol.desktop usr/share/applications +debian/wrapper/freecol usr/games freecol.xpm usr/share/pixmaps - - +data/freecol.png usr/share/pixmaps Deleted: packages/trunk/freecol/debian/patches/disable-listener.diff =================================================================== --- packages/trunk/freecol/debian/patches/disable-listener.diff 2013-08-24 19:01:45 UTC (rev 14520) +++ packages/trunk/freecol/debian/patches/disable-listener.diff 2013-08-25 11:14:05 UTC (rev 14521) @@ -1,43 +0,0 @@ -Index: freecol-0.9.2+dfsg/src/net/sf/freecol/client/gui/video/VideoComponent.java -=================================================================== ---- freecol-0.9.2+dfsg.orig/src/net/sf/freecol/client/gui/video/VideoComponent.java 2010-03-07 17:50:13.011526706 +0100 -+++ freecol-0.9.2+dfsg/src/net/sf/freecol/client/gui/video/VideoComponent.java 2010-03-07 17:50:54.619521752 +0100 -@@ -34,7 +34,8 @@ - import net.sf.freecol.common.resources.ResourceManager; - - import com.fluendo.player.Cortado; --import com.fluendo.player.StopListener; -+// Disable the feature that seems to be missing from the stock Cortado -+// import com.fluendo.player.StopListener; - - /** - * A component for playing video. -@@ -74,17 +75,17 @@ - applet.setParam ("showStatus", "hide"); - applet.init(); - -- applet.setStopListener(new StopListener() { -- public void stopped() { -- SwingUtilities.invokeLater(new Runnable() { -- public void run() { -- for (VideoListener sl : videoListeners) { -- sl.stopped(); -- } -- } -- }); -- } -- }); -+ // applet.setStopListener(new StopListener() { -+ // public void stopped() { -+ // SwingUtilities.invokeLater(new Runnable() { -+ // public void run() { -+ // for (VideoListener sl : videoListeners) { -+ // sl.stopped(); -+ // } -+ // } -+ // }); -+ // } -+ // }); - - setLayout(null); - add(applet); Modified: packages/trunk/freecol/debian/patches/series =================================================================== --- packages/trunk/freecol/debian/patches/series 2013-08-24 19:01:45 UTC (rev 14520) +++ packages/trunk/freecol/debian/patches/series 2013-08-25 11:14:05 UTC (rev 14521) @@ -1,3 +1,2 @@ -# disable-listener.diff 10-fix-jar-path.diff 40-manpage.diff Modified: packages/trunk/freecol/debian/rules =================================================================== --- packages/trunk/freecol/debian/rules 2013-08-24 19:01:45 UTC (rev 14520) +++ packages/trunk/freecol/debian/rules 2013-08-25 11:14:05 UTC (rev 14521) @@ -17,8 +17,7 @@ arch = $(shell dpkg-architecture -qDEB_HOST_ARCH) -JAVA_HOME_DIRS := /usr/lib/jvm/java-7-openjdk-$(arch) \ - /usr/lib/jvm/java-6-openjdk-$(arch) /usr/lib/jvm/java-6-openjdk +JAVA_HOME_DIRS := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant DEB_JARS := ant-launcher ant-nodeps \ miglayout commons-cli cortado _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits