Author: fourmond Date: 2011-09-29 19:56:11 +0000 (Thu, 29 Sep 2011) New Revision: 12690
Added: packages/tags/freecol/0.10.0+dfsg-3/ packages/tags/freecol/0.10.0+dfsg-3/debian/changelog packages/tags/freecol/0.10.0+dfsg-3/debian/control packages/tags/freecol/0.10.0+dfsg-3/debian/freecol.classpath packages/tags/freecol/0.10.0+dfsg-3/debian/freecol.install packages/tags/freecol/0.10.0+dfsg-3/debian/freecol.jlibs packages/tags/freecol/0.10.0+dfsg-3/debian/new-upstream packages/tags/freecol/0.10.0+dfsg-3/debian/patches/10-fix-jar-path.diff packages/tags/freecol/0.10.0+dfsg-3/debian/patches/40-manpage.diff packages/tags/freecol/0.10.0+dfsg-3/debian/patches/series packages/tags/freecol/0.10.0+dfsg-3/debian/rules packages/tags/freecol/0.10.0+dfsg-3/debian/watch packages/tags/freecol/0.10.0+dfsg-3/debian/wrapper/freecol Removed: packages/tags/freecol/0.10.0+dfsg-3/debian/changelog packages/tags/freecol/0.10.0+dfsg-3/debian/control packages/tags/freecol/0.10.0+dfsg-3/debian/install packages/tags/freecol/0.10.0+dfsg-3/debian/new-upstream packages/tags/freecol/0.10.0+dfsg-3/debian/patches/10-fix-jar-path.diff packages/tags/freecol/0.10.0+dfsg-3/debian/patches/40-manpage.diff packages/tags/freecol/0.10.0+dfsg-3/debian/patches/series packages/tags/freecol/0.10.0+dfsg-3/debian/rules packages/tags/freecol/0.10.0+dfsg-3/debian/watch packages/tags/freecol/0.10.0+dfsg-3/debian/wrapper/freecol Log: [svn-buildpackage] Tagging freecol 0.10.0+dfsg-3 Deleted: packages/tags/freecol/0.10.0+dfsg-3/debian/changelog =================================================================== --- packages/trunk/freecol/debian/changelog 2011-02-17 16:01:42 UTC (rev 11775) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/changelog 2011-09-29 19:56:11 UTC (rev 12690) @@ -1,188 +0,0 @@ -freecol (0.9.2+dfsg-2) unstable; urgency=low - - * Now pass -Xincgc as java argument, as GC crashes apparently do not - occur using this GC engine. Closes: #583692 (BTW, it seems to - significantly speed up AI turn) - * Already conforms to 3.9.0 - - -- Vincent Fourmond <[email protected]> Wed, 21 Jul 2010 00:44:19 +0200 - -freecol (0.9.2+dfsg-1) unstable; urgency=low - - * New upstream release (closes: #567803) - * Switch to 3.0 (quilt) format + bzip2 repackaged archive - * Droping dependency on libhiglayout-java, apparently not needed anymore - * New dependencies: - - libcommons-cli-java - - libmiglayout-java - - libcortado-java - * Dropped dependency on dpatch now that we use format 3.0 (quilt) - * disable-listener.diff to disabled what seems to be a custom feature - from cortado - - -- Vincent Fourmond <[email protected]> Sun, 07 Mar 2010 18:00:39 +0100 - -freecol (0.8.4+dfsg-2) unstable; urgency=low - - * Disable IPV6 networking stack by default to work around Java bug - (see #560056) (closes: #562133) - * Already conforms to standards 3.8.3 - * Update build-deps to reflect changes in TeXLive - - -- Vincent Fourmond <[email protected]> Thu, 07 Jan 2010 22:53:26 +0100 - -freecol (0.8.4+dfsg-1) unstable; urgency=low - - * New upstream release - * Minor modifications to the debian/new-upstream script - - -- Vincent Fourmond <[email protected]> Sat, 08 Aug 2009 21:27:55 +0200 - -freecol (0.8.3+dfsg-1) unstable; urgency=low - - * New upstream release - * Use viewsvn rather than wsvn for the Vcs-Browser field - * Now use a +dfsg instead of .dfsg (thanks lintian) - * Already conforms to standards 3.8.2 - - -- Vincent Fourmond <[email protected]> Sat, 27 Jun 2009 18:01:03 +0200 - -freecol (0.8.1.dfsg-1) unstable; urgency=low - - * New upstream release (closes: #514363) - - saves the log in ~/.freecol (closes: #488330) - - does not mess up language settings (closes: #497076) - * 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 - * Refreshed debian/patches/10-fix-jar-path.dpatch - * Dropped debian/patches/25-change-save-dir.dpatch, superseded by - upstream modifications - * Remove unapplied patches - * Switch to using cdbs for building - * Update debian/NEWS to mention that save games from earlier - versions are not compatible. - - -- Vincent Fourmond <[email protected]> Tue, 24 Feb 2009 18:55:19 +0100 - -freecol (0.7.4.dfsg+1-1) unstable; urgency=low - - * Pseudo new upstream release to work around dak's - move-from-contrib-to-main bug. - - -- Vincent Fourmond <[email protected]> Sun, 10 Aug 2008 16:59:02 +0200 - -freecol (0.7.4.dfsg-2) unstable; urgency=low - - * Fix watchfile to ignore the alpha releases (users and developers - seem to complain about their stability). - * Add openjdk in the wrapper script, and tighten up dependency on - java-wrappers accordingly. - * freecol can now move to main ! (closes: #491260) - * Adapted wrapper/freecol to work around a java-wrappers bug - * Document undocumented patches, and drop 15-fix-jar-manifest which - really isn't necessary now that we are using java-wrappers. - - -- Vincent Fourmond <[email protected]> Sun, 10 Aug 2008 14:42:28 +0200 - -freecol (0.7.4.dfsg-1) unstable; urgency=low - - * 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 - had forgotten that ;-)...). - * Update debian/new-upstream and debian/watch accordingly - - -- Vincent Fourmond <[email protected]> Sun, 22 Jun 2008 09:21:57 +0200 - -freecol (0.7.3-4) unstable; urgency=low - - * Mmmm, also add openjdk-6 as JAVA_HOME in debian/rules (closes: #480107) - - -- Vincent Fourmond <[email protected]> Fri, 16 May 2008 19:21:43 +0200 - -freecol (0.7.3-3) unstable; urgency=low - - * Adding openjdk-6-* as alternative (Build-)?Deps, thanks to - Matvey Kozhev <[email protected]> for pointing out (closes: #480107) - - -- Vincent Fourmond <[email protected]> Thu, 08 May 2008 08:32:20 +0200 - -freecol (0.7.3-2) unstable; urgency=low - - * Pushing memory limit to 180M, as it does not work anymore on AMD64 with - only 128M... - - -- Vincent Fourmond <[email protected]> Sat, 03 May 2008 21:18:05 +0200 - -freecol (0.7.3-1) unstable; urgency=low - - [ Ansgar Burchardt ] - * Remove deprecated Encoding key from .desktop file - - [ Vincent Fourmond ] - * New upstream release (Closes: #465490) - - dropped 30-language-option, included upstream - - updated 10-fix-jar-path and 15-fix-jar-manifest - * Now providing a debian/new-upstream to repackage upstream tarball - * Added a NEWS file - * Switched to java-wrappers for the wrapper script - - 40-manpage to point the user to java-wrappers(7) - - -- Vincent Fourmond <[email protected]> Fri, 29 Feb 2008 23:09:02 +0100 - -freecol (0.7.2-5) unstable; urgency=low - - * Bumped standards-version to 3.7.3 (no changes required) - * Added many changes by Matvey Kozhev <[email protected]> for - Ubuntu (closes: #453836) - - added a desktop file - - fix wrapper file position and pathes - - added icedtea dependencies - * Added an icon for the menu - - -- Vincent Fourmond <[email protected]> Fri, 14 Dec 2007 01:18:14 +0100 - -freecol (0.7.2-4) unstable; urgency=low - - * Pull upstream revision 3270 to add a --default-locale option - * Used this option to detect when LC_MESSAGES is different from - LC_CTYPE (Closes: #450944) - - -- Vincent Fourmond <[email protected]> Mon, 26 Nov 2007 20:25:41 +0100 - -freecol (0.7.2-3) unstable; urgency=low - - * Add a dependency on j2re1.6 for java-package made packages - (Closes: #452407) - * Added various meta-information field to debian/control - - -- Vincent Fourmond <[email protected]> Thu, 22 Nov 2007 19:21:34 +0100 - -freecol (0.7.2-2) unstable; urgency=high - - [ Barry deFreese ] - * Fix watch file - - [ Vincent Fourmond ] - * 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 - - -- Vincent Fourmond <[email protected]> Fri, 26 Oct 2007 21:27:20 +0200 - -freecol (0.7.2-1) unstable; urgency=low - - * Initial release (Closes: #444199) - * {10,15}-fix-jar*: switch to external libraries for binary only jars. - * 20-freecol-executable: the freecol executable. - * 25-change-save-dir: switch saves directory to ~/.freecol - * Menu entry - - -- Vincent Fourmond <[email protected]> Mon, 08 Oct 2007 15:56:18 +0200 Copied: packages/tags/freecol/0.10.0+dfsg-3/debian/changelog (from rev 12689, packages/trunk/freecol/debian/changelog) =================================================================== --- packages/tags/freecol/0.10.0+dfsg-3/debian/changelog (rev 0) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/changelog 2011-09-29 19:56:11 UTC (rev 12690) @@ -0,0 +1,217 @@ +freecol (0.10.0+dfsg-3) unstable; urgency=low + + * Fix FTBS with recent openjdk-6 (closes: #642788) + + -- Vincent Fourmond <[email protected]> Thu, 29 Sep 2011 21:40:24 +0200 + +freecol (0.10.0+dfsg-2) unstable; urgency=low + + * Refrain from installing the Liberation fonts, and symlink from those + in ttf-liberation + * Use javahelper for dependencies + + -- Vincent Fourmond <[email protected]> Sat, 25 Jun 2011 21:44:41 +0200 + +freecol (0.10.0+dfsg-1) unstable; urgency=low + + * New upstream release (closes: #631611) + * Disable disable-listener.diff, now incorporated upstream (thanks !) + * Refreshed other patches + * Now using javahelper to handle installation and classpath tweaks (I + can't decently ignore lintian warnings I wrote ;-)...) + * Pass -Dbuild.sysclasspath=only to ant to fully ignore classpath in + the build file. + * Conforms to newer standards (3.9.2) + * Small improvements in the package description + * Increase a bit the memory allocated to freecol + + -- Vincent Fourmond <[email protected]> Sat, 25 Jun 2011 18:18:38 +0200 + +freecol (0.9.2+dfsg-2) unstable; urgency=low + + * Now pass -Xincgc as java argument, as GC crashes apparently do not + occur using this GC engine. Closes: #583692 (BTW, it seems to + significantly speed up AI turn) + * Already conforms to 3.9.0 + + -- Vincent Fourmond <[email protected]> Wed, 21 Jul 2010 00:44:19 +0200 + +freecol (0.9.2+dfsg-1) unstable; urgency=low + + * New upstream release (closes: #567803) + * Switch to 3.0 (quilt) format + bzip2 repackaged archive + * Droping dependency on libhiglayout-java, apparently not needed anymore + * New dependencies: + - libcommons-cli-java + - libmiglayout-java + - libcortado-java + * Dropped dependency on dpatch now that we use format 3.0 (quilt) + * disable-listener.diff to disable what seems to be a custom feature + from cortado + + -- Vincent Fourmond <[email protected]> Sun, 07 Mar 2010 18:00:39 +0100 + +freecol (0.8.4+dfsg-2) unstable; urgency=low + + * Disable IPV6 networking stack by default to work around Java bug + (see #560056) (closes: #562133) + * Already conforms to standards 3.8.3 + * Update build-deps to reflect changes in TeXLive + + -- Vincent Fourmond <[email protected]> Thu, 07 Jan 2010 22:53:26 +0100 + +freecol (0.8.4+dfsg-1) unstable; urgency=low + + * New upstream release + * Minor modifications to the debian/new-upstream script + + -- Vincent Fourmond <[email protected]> Sat, 08 Aug 2009 21:27:55 +0200 + +freecol (0.8.3+dfsg-1) unstable; urgency=low + + * New upstream release + * Use viewsvn rather than wsvn for the Vcs-Browser field + * Now use a +dfsg instead of .dfsg (thanks lintian) + * Already conforms to standards 3.8.2 + + -- Vincent Fourmond <[email protected]> Sat, 27 Jun 2009 18:01:03 +0200 + +freecol (0.8.1.dfsg-1) unstable; urgency=low + + * New upstream release (closes: #514363) + - saves the log in ~/.freecol (closes: #488330) + - does not mess up language settings (closes: #497076) + * 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 + * Refreshed debian/patches/10-fix-jar-path.dpatch + * Dropped debian/patches/25-change-save-dir.dpatch, superseded by + upstream modifications + * Remove unapplied patches + * Switch to using cdbs for building + * Update debian/NEWS to mention that save games from earlier + versions are not compatible. + + -- Vincent Fourmond <[email protected]> Tue, 24 Feb 2009 18:55:19 +0100 + +freecol (0.7.4.dfsg+1-1) unstable; urgency=low + + * Pseudo new upstream release to work around dak's + move-from-contrib-to-main bug. + + -- Vincent Fourmond <[email protected]> Sun, 10 Aug 2008 16:59:02 +0200 + +freecol (0.7.4.dfsg-2) unstable; urgency=low + + * Fix watchfile to ignore the alpha releases (users and developers + seem to complain about their stability). + * Add openjdk in the wrapper script, and tighten up dependency on + java-wrappers accordingly. + * freecol can now move to main ! (closes: #491260) + * Adapted wrapper/freecol to work around a java-wrappers bug + * Document undocumented patches, and drop 15-fix-jar-manifest which + really isn't necessary now that we are using java-wrappers. + + -- Vincent Fourmond <[email protected]> Sun, 10 Aug 2008 14:42:28 +0200 + +freecol (0.7.4.dfsg-1) unstable; urgency=low + + * 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 + had forgotten that ;-)...). + * Update debian/new-upstream and debian/watch accordingly + + -- Vincent Fourmond <[email protected]> Sun, 22 Jun 2008 09:21:57 +0200 + +freecol (0.7.3-4) unstable; urgency=low + + * Mmmm, also add openjdk-6 as JAVA_HOME in debian/rules (closes: #480107) + + -- Vincent Fourmond <[email protected]> Fri, 16 May 2008 19:21:43 +0200 + +freecol (0.7.3-3) unstable; urgency=low + + * Adding openjdk-6-* as alternative (Build-)?Deps, thanks to + Matvey Kozhev <[email protected]> for pointing out (closes: #480107) + + -- Vincent Fourmond <[email protected]> Thu, 08 May 2008 08:32:20 +0200 + +freecol (0.7.3-2) unstable; urgency=low + + * Pushing memory limit to 180M, as it does not work anymore on AMD64 with + only 128M... + + -- Vincent Fourmond <[email protected]> Sat, 03 May 2008 21:18:05 +0200 + +freecol (0.7.3-1) unstable; urgency=low + + [ Ansgar Burchardt ] + * Remove deprecated Encoding key from .desktop file + + [ Vincent Fourmond ] + * New upstream release (Closes: #465490) + - dropped 30-language-option, included upstream + - updated 10-fix-jar-path and 15-fix-jar-manifest + * Now providing a debian/new-upstream to repackage upstream tarball + * Added a NEWS file + * Switched to java-wrappers for the wrapper script + - 40-manpage to point the user to java-wrappers(7) + + -- Vincent Fourmond <[email protected]> Fri, 29 Feb 2008 23:09:02 +0100 + +freecol (0.7.2-5) unstable; urgency=low + + * Bumped standards-version to 3.7.3 (no changes required) + * Added many changes by Matvey Kozhev <[email protected]> for + Ubuntu (closes: #453836) + - added a desktop file + - fix wrapper file position and pathes + - added icedtea dependencies + * Added an icon for the menu + + -- Vincent Fourmond <[email protected]> Fri, 14 Dec 2007 01:18:14 +0100 + +freecol (0.7.2-4) unstable; urgency=low + + * Pull upstream revision 3270 to add a --default-locale option + * Used this option to detect when LC_MESSAGES is different from + LC_CTYPE (Closes: #450944) + + -- Vincent Fourmond <[email protected]> Mon, 26 Nov 2007 20:25:41 +0100 + +freecol (0.7.2-3) unstable; urgency=low + + * Add a dependency on j2re1.6 for java-package made packages + (Closes: #452407) + * Added various meta-information field to debian/control + + -- Vincent Fourmond <[email protected]> Thu, 22 Nov 2007 19:21:34 +0100 + +freecol (0.7.2-2) unstable; urgency=high + + [ Barry deFreese ] + * Fix watch file + + [ Vincent Fourmond ] + * 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 + + -- Vincent Fourmond <[email protected]> Fri, 26 Oct 2007 21:27:20 +0200 + +freecol (0.7.2-1) unstable; urgency=low + + * Initial release (Closes: #444199) + * {10,15}-fix-jar*: switch to external libraries for binary only jars. + * 20-freecol-executable: the freecol executable. + * 25-change-save-dir: switch saves directory to ~/.freecol + * Menu entry + + -- Vincent Fourmond <[email protected]> Mon, 08 Oct 2007 15:56:18 +0200 Deleted: packages/tags/freecol/0.10.0+dfsg-3/debian/control =================================================================== --- packages/trunk/freecol/debian/control 2011-02-17 16:01:42 UTC (rev 11775) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/control 2011-09-29 19:56:11 UTC (rev 12690) @@ -1,25 +0,0 @@ -Source: freecol -Section: games -Priority: optional -Maintainer: Debian Games Team <[email protected]> -Uploaders: Vincent Fourmond <[email protected]> -Build-Depends: debhelper (>= 5), ant, openjdk-6-jdk, cdbs -Build-Depends-Indep: libwoodstox-java, - tex4ht, texlive-binaries | texlive-base-bin, ant-optional, - texlive-latex-recommended, libcommons-cli-java, libmiglayout-java, - libcortado-java -Standards-Version: 3.9.0 -Homepage: http://www.freecol.org -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freecol -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/freecol - -Package: freecol -Architecture: all -Depends: openjdk-6-jre | java6-runtime, - libwoodstox-java, java-wrappers (>= 0.1.13), ${misc:Depends}, - libcommons-cli-java, libmiglayout-java, libcortado-java -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 - with natives and other European civilizations, trade with your - homeland until you're ready to fight for your independance ! Copied: packages/tags/freecol/0.10.0+dfsg-3/debian/control (from rev 12482, packages/trunk/freecol/debian/control) =================================================================== --- packages/tags/freecol/0.10.0+dfsg-3/debian/control (rev 0) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/control 2011-09-29 19:56:11 UTC (rev 12690) @@ -0,0 +1,24 @@ +Source: freecol +Section: games +Priority: optional +Maintainer: Debian Games Team <[email protected]> +Uploaders: Vincent Fourmond <[email protected]> +Build-Depends: debhelper (>= 5), ant, openjdk-6-jdk, cdbs +Build-Depends-Indep: libwoodstox-java, + tex4ht, texlive-binaries | texlive-base-bin, ant-optional, + texlive-latex-recommended, libcommons-cli-java, libmiglayout-java, + libcortado-java, javahelper, ttf-liberation +Standards-Version: 3.9.2 +Homepage: http://www.freecol.org +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/freecol +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-games/packages/trunk/freecol + +Package: freecol +Architecture: all +Depends: openjdk-6-jre | java6-runtime, + java-wrappers (>= 0.1.13), ${misc:Depends}, ${java: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 + fight with natives and other European civilizations, trade with your + homeland until you're ready to fight for your independance ! Copied: packages/tags/freecol/0.10.0+dfsg-3/debian/freecol.classpath (from rev 12480, packages/trunk/freecol/debian/freecol.classpath) =================================================================== --- packages/tags/freecol/0.10.0+dfsg-3/debian/freecol.classpath (rev 0) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/freecol.classpath 2011-09-29 19:56:11 UTC (rev 12690) @@ -0,0 +1 @@ +usr/share/java/freecol.jar miglayout.jar wstx-lgpl.jar cortado.jar commons-cli.jar Copied: packages/tags/freecol/0.10.0+dfsg-3/debian/freecol.install (from rev 12482, packages/trunk/freecol/debian/freecol.install) =================================================================== --- packages/tags/freecol/0.10.0+dfsg-3/debian/freecol.install (rev 0) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/freecol.install 2011-09-29 19:56:11 UTC (rev 12690) @@ -0,0 +1,6 @@ +data/* usr/share/games/freecol +debian/wrapper/freecol usr/games +debian/freecol.desktop usr/share/applications +freecol.xpm usr/share/pixmaps + + Copied: packages/tags/freecol/0.10.0+dfsg-3/debian/freecol.jlibs (from rev 12480, packages/trunk/freecol/debian/freecol.jlibs) =================================================================== --- packages/tags/freecol/0.10.0+dfsg-3/debian/freecol.jlibs (rev 0) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/freecol.jlibs 2011-09-29 19:56:11 UTC (rev 12690) @@ -0,0 +1 @@ +freecol.jar Deleted: packages/tags/freecol/0.10.0+dfsg-3/debian/install =================================================================== --- packages/trunk/freecol/debian/install 2011-02-17 16:01:42 UTC (rev 11775) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/install 2011-09-29 19:56:11 UTC (rev 12690) @@ -1,7 +0,0 @@ -data/* usr/share/games/freecol -freecol*.jar usr/share/java -debian/wrapper/freecol usr/games -debian/freecol.desktop usr/share/applications -freecol.xpm usr/share/pixmaps - - Deleted: packages/tags/freecol/0.10.0+dfsg-3/debian/new-upstream =================================================================== --- packages/trunk/freecol/debian/new-upstream 2011-02-17 16:01:42 UTC (rev 11775) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/new-upstream 2011-09-29 19:56:11 UTC (rev 12690) @@ -1,48 +0,0 @@ -#!/bin/sh -# -# new-upstream: copyright 2007 by Vincent Fourmond. -# See debian/copyright file for details. -# -# Called by uscan; from uscan(1): -# -# Finally, if a third parameter (an action) is given in the watchfile -# line, this is taken as the name of a command, and the command -# command --upstream-version version filename -# -# is executed, using either the original file or the symlink name. -# -# Thanks to Sam Morris <[email protected]> for giving me the idea -# - -# If called manually, this file must be called from within the freecol/ -# directory. - -version=$2 -filename=`readlink -f $3` - -dir=`mktemp -d` - -curdir=`pwd` - -origname=freecol_$version"+dfsg".orig.tar.bz2 - -echo "Repackaging freecol version $version from $filename" -echo $filename -echo $version - -# Abort on errors: -set -e - -# We repackage the upstream source file, according to the method -# written in debian/copyrigh -cd $dir -tar xvzf $filename -cd $dir/freecol* -patch -p0 < $curdir/debian/freecol-dist-targz.diff -echo $version | ant tarDistBundle -# Do not remove the original file !!! -# rm $curdir/$filename -echo "Moving back dist/freecol-$version-dist-src.tar.bz2 to $curdir/../$origname" -mv dist/freecol-$version-dist-src.tar.bz2 $curdir/../$origname -cd - -rm -rf $dir Copied: packages/tags/freecol/0.10.0+dfsg-3/debian/new-upstream (from rev 12480, packages/trunk/freecol/debian/new-upstream) =================================================================== --- packages/tags/freecol/0.10.0+dfsg-3/debian/new-upstream (rev 0) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/new-upstream 2011-09-29 19:56:11 UTC (rev 12690) @@ -0,0 +1,50 @@ +#!/bin/sh +# +# new-upstream: copyright 2007 by Vincent Fourmond. +# See debian/copyright file for details. +# +# Called by uscan; from uscan(1): +# +# Finally, if a third parameter (an action) is given in the watchfile +# line, this is taken as the name of a command, and the command +# command --upstream-version version filename +# +# is executed, using either the original file or the symlink name. +# +# Thanks to Sam Morris <[email protected]> for giving me the idea +# + +# If called manually, this file must be called from within the freecol/ +# directory. + +version=$2 +filename=`readlink -f $3` + +dir=`mktemp -d` + +curdir=`pwd` + +origname=freecol_$version"+dfsg".orig.tar.bz2 + +echo "Repackaging freecol version $version from $filename" +echo $filename +echo $version + +# Abort on errors: +set -e + +# We repackage the upstream source file, according to the method +# written in debian/copyrigh +cd $dir +# tar xvzf $filename +# Now using unzip: +unzip $filename +cd $dir/freecol* +patch --no-backup-if-mismatch -p0 < $curdir/debian/freecol-dist-targz.diff +echo $version | ant tarDistBundle +# Do not remove the original file !!! +# rm $curdir/$filename +echo "Moving back dist/freecol-$version-dist-src.tar.bz2 to $curdir/../$origname" +mv dist/freecol-$version-dist-src.tar.bz2 $curdir/../$origname +cd - +rm -rf $dir Deleted: packages/tags/freecol/0.10.0+dfsg-3/debian/patches/10-fix-jar-path.diff =================================================================== --- packages/trunk/freecol/debian/patches/10-fix-jar-path.diff 2011-02-17 16:01:42 UTC (rev 11775) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/patches/10-fix-jar-path.diff 2011-09-29 19:56:11 UTC (rev 12690) @@ -1,33 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 10-fix-jar-path.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Fix the path of the library jars to match those of the debian -## DP: packages - -@DPATCH@ -Index: freecol-0.9.2+dfsg/build.xml -=================================================================== ---- freecol-0.9.2+dfsg.orig/build.xml 2010-03-07 16:44:05.000000000 +0100 -+++ freecol-0.9.2+dfsg/build.xml 2010-03-07 17:01:00.251526957 +0100 -@@ -87,9 +87,10 @@ - <!-- Compiles the java source files. --> - <target name="compile" depends="init"> - <mkdir dir="${freecol.build.dir}"/> -+ <!-- Classpath is provided by debian/rules, so commenting this --> -+ <!-- classpathref="freecol.build.classpath" --> - <javac srcdir="${freecol.src.dir}" - destdir="${freecol.build.dir}" -- classpathref="freecol.build.classpath" - debug="on" - optimize="on" - deprecation="off" -@@ -148,7 +149,7 @@ - - <!-- Compiles the source files and creates a JAR-file. --> - <target name="package" depends="init,build,manifest" description="Compiles the source files and creates a JAR-file."> -- <jar jarfile="${freecol.jar.file}" -+ <jar jarfile="freecol.jar" - basedir="${freecol.build.dir}" - manifest="${basedir}/src/MANIFEST.MF" - includes="net/**, org/**" Copied: packages/tags/freecol/0.10.0+dfsg-3/debian/patches/10-fix-jar-path.diff (from rev 12480, packages/trunk/freecol/debian/patches/10-fix-jar-path.diff) =================================================================== --- packages/tags/freecol/0.10.0+dfsg-3/debian/patches/10-fix-jar-path.diff (rev 0) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/patches/10-fix-jar-path.diff 2011-09-29 19:56:11 UTC (rev 12690) @@ -0,0 +1,33 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-fix-jar-path.dpatch by <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix the path of the library jars to match those of the debian +## DP: packages + +@DPATCH@ +Index: freecol-0.10.0+dfsg/build.xml +=================================================================== +--- freecol-0.10.0+dfsg.orig/build.xml 2011-06-25 17:12:29.000000000 +0200 ++++ freecol-0.10.0+dfsg/build.xml 2011-06-25 17:17:57.346240904 +0200 +@@ -105,9 +105,10 @@ + <!-- Compiles the java source files. --> + <target name="compile" depends="init"> + <mkdir dir="${freecol.build.dir}"/> ++ <!-- Classpath is provided by debian/rules, so commenting this --> ++ <!-- classpathref="freecol.build.classpath" --> + <javac srcdir="${freecol.src.dir}" + destdir="${freecol.build.dir}" +- classpathref="freecol.build.classpath" + debug="on" + optimize="on" + deprecation="off" +@@ -158,7 +159,7 @@ + + <!-- Compiles the source files and creates a JAR-file. --> + <target name="package" depends="init,build,manifest" description="Compiles the source files and creates a JAR-file."> +- <jar jarfile="${freecol.jar.file}" ++ <jar jarfile="freecol.jar" + basedir="${freecol.build.dir}" + manifest="${basedir}/src/MANIFEST.MF" + includes="net/**, org/**" Deleted: packages/tags/freecol/0.10.0+dfsg-3/debian/patches/40-manpage.diff =================================================================== --- packages/trunk/freecol/debian/patches/40-manpage.diff 2011-02-17 16:01:42 UTC (rev 11775) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/patches/40-manpage.diff 2011-09-29 19:56:11 UTC (rev 12690) @@ -1,37 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 40-manpage.dpatch by <[email protected]> -## -## DP: Small java-wrappers addition in the manual page - -@DPATCH@ -Index: freecol-0.9.2+dfsg/packaging/debian/freecol.6 -=================================================================== ---- freecol-0.9.2+dfsg.orig/packaging/debian/freecol.6 2010-03-07 16:44:05.000000000 +0100 -+++ freecol-0.9.2+dfsg/packaging/debian/freecol.6 2010-03-07 17:01:03.371521135 +0100 -@@ -59,8 +59,25 @@ - Starts a stand-alone server on the specifed port. - .SH LICENSE - FreeCol is available under GPL license terms. -+ -+.SH JAVA-WRAPPERS NOTE -+ -+This program is a shell script wrapper based on -+.BR java-wrappers (7). -+You therefore benefit from several features; please see the -+.BR java-wrappers (7) -+manual page. -+ -+ - .SH SEE ALSO -+ - Homepage: http://freecol.sourceforge.net/ -+ -+.BR java-wrappers (7) -+ - .SH AUTHOR --This manual page was written by Jean Lepropre <[email protected]>, -+This manual page was written by Jean Lepropre -+<[email protected]>, - for the Debian project (but may be used by others). -+ -+It was updated by Vincent Fourmond <[email protected]> Copied: packages/tags/freecol/0.10.0+dfsg-3/debian/patches/40-manpage.diff (from rev 12480, packages/trunk/freecol/debian/patches/40-manpage.diff) =================================================================== --- packages/tags/freecol/0.10.0+dfsg-3/debian/patches/40-manpage.diff (rev 0) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/patches/40-manpage.diff 2011-09-29 19:56:11 UTC (rev 12690) @@ -0,0 +1,37 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 40-manpage.dpatch by <[email protected]> +## +## DP: Small java-wrappers addition in the manual page + +@DPATCH@ +Index: freecol-0.10.0+dfsg/packaging/debian/freecol.6 +=================================================================== +--- freecol-0.10.0+dfsg.orig/packaging/debian/freecol.6 2011-06-25 17:12:29.000000000 +0200 ++++ freecol-0.10.0+dfsg/packaging/debian/freecol.6 2011-06-25 17:17:58.846240905 +0200 +@@ -59,8 +59,25 @@ + Starts a stand-alone server on the specifed port. + .SH LICENSE + FreeCol is available under GPL license terms. ++ ++.SH JAVA-WRAPPERS NOTE ++ ++This program is a shell script wrapper based on ++.BR java-wrappers (7). ++You therefore benefit from several features; please see the ++.BR java-wrappers (7) ++manual page. ++ ++ + .SH SEE ALSO ++ + Homepage: http://freecol.sourceforge.net/ ++ ++.BR java-wrappers (7) ++ + .SH AUTHOR +-This manual page was written by Jean Lepropre <[email protected]>, ++This manual page was written by Jean Lepropre ++<[email protected]>, + for the Debian project (but may be used by others). ++ ++It was updated by Vincent Fourmond <[email protected]> Deleted: packages/tags/freecol/0.10.0+dfsg-3/debian/patches/series =================================================================== --- packages/trunk/freecol/debian/patches/series 2011-02-17 16:01:42 UTC (rev 11775) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/patches/series 2011-09-29 19:56:11 UTC (rev 12690) @@ -1,3 +0,0 @@ -disable-listener.diff -10-fix-jar-path.diff -40-manpage.diff Copied: packages/tags/freecol/0.10.0+dfsg-3/debian/patches/series (from rev 12480, packages/trunk/freecol/debian/patches/series) =================================================================== --- packages/tags/freecol/0.10.0+dfsg-3/debian/patches/series (rev 0) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/patches/series 2011-09-29 19:56:11 UTC (rev 12690) @@ -0,0 +1,3 @@ +# disable-listener.diff +10-fix-jar-path.diff +40-manpage.diff Deleted: packages/tags/freecol/0.10.0+dfsg-3/debian/rules =================================================================== --- packages/trunk/freecol/debian/rules 2011-02-17 16:01:42 UTC (rev 11775) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/rules 2011-09-29 19:56:11 UTC (rev 12690) @@ -1,35 +0,0 @@ -#!/usr/bin/make -f - -# debian/rules file for building freecol - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | \ - sed -r 's/Version:\s*//' | sed -r 's/^[0-9]+://' | \ - sed -r 's/(\.dfsg)?-[0-9.]+//') - -# export JITC_PROCESSOR_TYPE=6 - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk -# include /usr/share/cdbs/1/rules/dpatch.mk - -JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk -ANT_HOME := /usr/share/ant -DEB_JARS := ant-launcher ant-nodeps \ - miglayout wstx-lgpl commons-cli cortado -DEB_ANT_COMPILER := modern -DEB_ANT_BUILD_TARGET := package online-manual print-manual -DEB_BUILDDIR := . -DEB_ANT_BUILDFILE := build.xml -DEB_ANT_CLEAN_TARGET := clean - -target_jar_dir= debian/freecol/usr/share/java - -print-version: - echo $(VERSION) - -install/freecol:: - install -m 644 freecol.jar $(target_jar_dir)/freecol-$(VERSION).jar - ln -s freecol-$(VERSION).jar $(target_jar_dir)/freecol.jar Copied: packages/tags/freecol/0.10.0+dfsg-3/debian/rules (from rev 12689, packages/trunk/freecol/debian/rules) =================================================================== --- packages/tags/freecol/0.10.0+dfsg-3/debian/rules (rev 0) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/rules 2011-09-29 19:56:11 UTC (rev 12690) @@ -0,0 +1,38 @@ +#!/usr/bin/make -f + +# debian/rules file for building freecol + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | \ + sed -r 's/Version:\s*//' | sed -r 's/^[0-9]+://' | \ + sed -r 's/(\.dfsg)?-[0-9.]+//') + +# export JITC_PROCESSOR_TYPE=6 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/javahelper.mk +include /usr/share/cdbs/1/class/ant.mk + +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 +ANT_HOME := /usr/share/ant +DEB_JARS := ant-launcher ant-nodeps \ + miglayout wstx-lgpl commons-cli cortado +DEB_ANT_COMPILER := modern +DEB_ANT_BUILD_TARGET := package online-manual print-manual +DEB_BUILDDIR := . +DEB_ANT_BUILDFILE := build.xml +DEB_ANT_CLEAN_TARGET := clean +# Override build classpath +ANT_OPTS := -Dbuild.sysclasspath=only + +LIBERATION_FONTS := LiberationSerif-Bold.ttf LiberationSerif-BoldItalic.ttf LiberationSerif-Italic.ttf LiberationSerif-Regular.ttf + +# Refrain from installing those files +DEB_DH_INSTALL_ARGS = $(patsubst %,-X%, $(LIBERATION_FONTS)) + +DEB_DH_LINK_freecol = $(foreach file, $(LIBERATION_FONTS), usr/share/fonts/truetype/ttf-liberation/$(file) usr/share/games/freecol/base/resources/fonts/$(file)) Deleted: packages/tags/freecol/0.10.0+dfsg-3/debian/watch =================================================================== --- packages/trunk/freecol/debian/watch 2011-02-17 16:01:42 UTC (rev 11775) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/watch 2011-09-29 19:56:11 UTC (rev 12690) @@ -1,8 +0,0 @@ -# Compulsory line, this is a version 3 file -version=3 - -# Don't forget to look into debian/copyright first before packaging -# a new upstream version !!! The watchfile works, but the downloaded -# archive should not go to debian - you need to repackage it. -opts=dversionmangle=s/\+dfsg// \ -http://sf.net/freecol/freecol-(?!.*alpha)(.*)-src\.tar\.gz debian debian/new-upstream Copied: packages/tags/freecol/0.10.0+dfsg-3/debian/watch (from rev 12480, packages/trunk/freecol/debian/watch) =================================================================== --- packages/tags/freecol/0.10.0+dfsg-3/debian/watch (rev 0) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/watch 2011-09-29 19:56:11 UTC (rev 12690) @@ -0,0 +1,8 @@ +# Compulsory line, this is a version 3 file +version=3 + +# Don't forget to look into debian/copyright first before packaging +# a new upstream version !!! The watchfile works, but the downloaded +# archive should not go to debian - you need to repackage it. +opts=dversionmangle=s/\+dfsg// \ +http://sf.net/freecol/freecol-(?!.*alpha)(.*)-src\.zip debian debian/new-upstream Deleted: packages/tags/freecol/0.10.0+dfsg-3/debian/wrapper/freecol =================================================================== --- packages/trunk/freecol/debian/wrapper/freecol 2011-02-17 16:01:42 UTC (rev 11775) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/wrapper/freecol 2011-09-29 19:56:11 UTC (rev 12690) @@ -1,28 +0,0 @@ -#!/bin/bash - -# Including wrapper script: -. /usr/lib/java-wrappers/java-wrappers.sh - -# We need openjdk, icedtea or Sun 6 -find_java_runtime openjdk java6 - -find_jars miglayout wstx-lgpl freecol cortado commons-cli - -# We test if LC_MESSAGES is different from LC_CTYPE, if that is the case, -# we pass to freecol the --default-locale argument -if [ "$LC_CTYPE" != "$LC_MESSAGES" -a "$LC_MESSAGES" ]; then - lang_argument="--default-locale=$LC_MESSAGES" -fi - -if [ "$1" = "--enable-ipv6" ]; then - shift; -else - echo "Disabling IPV6 network stack to work around bug #560056 on openjdk" - echo "If you experience problems with connecting to remote servers, " - echo "you can put it back by running Freecol this way:" - echo " freecol --enable-ipv6" "$@" - disablenet="-Djava.net.preferIPv4Stack=true" -fi - -run_java $disablenet -Xincgc -Xmx180M net.sf.freecol.FreeCol --freecol-data \ - /usr/share/games/freecol $lang_argument "$@" Copied: packages/tags/freecol/0.10.0+dfsg-3/debian/wrapper/freecol (from rev 12480, packages/trunk/freecol/debian/wrapper/freecol) =================================================================== --- packages/tags/freecol/0.10.0+dfsg-3/debian/wrapper/freecol (rev 0) +++ packages/tags/freecol/0.10.0+dfsg-3/debian/wrapper/freecol 2011-09-29 19:56:11 UTC (rev 12690) @@ -0,0 +1,28 @@ +#!/bin/bash + +# Including wrapper script: +. /usr/lib/java-wrappers/java-wrappers.sh + +# We need openjdk, icedtea or Sun 6 +find_java_runtime openjdk java6 + +find_jars miglayout wstx-lgpl freecol cortado commons-cli + +# We test if LC_MESSAGES is different from LC_CTYPE, if that is the case, +# we pass to freecol the --default-locale argument +if [ "$LC_CTYPE" != "$LC_MESSAGES" -a "$LC_MESSAGES" ]; then + lang_argument="--default-locale=$LC_MESSAGES" +fi + +if [ "$1" = "--enable-ipv6" ]; then + shift; +else + echo "Disabling IPV6 network stack to work around bug #560056 on openjdk" + echo "If you experience problems with connecting to remote servers, " + echo "you can put it back by running Freecol this way:" + echo " freecol --enable-ipv6" "$@" + disablenet="-Djava.net.preferIPv4Stack=true" +fi + +run_java $disablenet -Xincgc -Xmx512M net.sf.freecol.FreeCol --freecol-data \ + /usr/share/games/freecol $lang_argument "$@" _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
