Author: fourmond Date: 2011-06-25 17:08:09 +0000 (Sat, 25 Jun 2011) New Revision: 12480
Added: packages/trunk/freecol/debian/freecol.classpath packages/trunk/freecol/debian/freecol.jlibs Modified: packages/trunk/freecol/debian/changelog packages/trunk/freecol/debian/control packages/trunk/freecol/debian/new-upstream packages/trunk/freecol/debian/patches/10-fix-jar-path.diff packages/trunk/freecol/debian/patches/40-manpage.diff packages/trunk/freecol/debian/patches/series packages/trunk/freecol/debian/rules packages/trunk/freecol/debian/watch packages/trunk/freecol/debian/wrapper/freecol Log: [freecol] new upstream release + various packaging cleanups Modified: packages/trunk/freecol/debian/changelog =================================================================== --- packages/trunk/freecol/debian/changelog 2011-06-25 16:24:22 UTC (rev 12479) +++ packages/trunk/freecol/debian/changelog 2011-06-25 17:08:09 UTC (rev 12480) @@ -1,3 +1,18 @@ +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 @@ -17,7 +32,7 @@ - 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 + * 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 Modified: packages/trunk/freecol/debian/control =================================================================== --- packages/trunk/freecol/debian/control 2011-06-25 16:24:22 UTC (rev 12479) +++ packages/trunk/freecol/debian/control 2011-06-25 17:08:09 UTC (rev 12480) @@ -7,8 +7,8 @@ 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 + libcortado-java, javahelper +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 @@ -18,8 +18,8 @@ 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 +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 a new world, build towns, trade or fight - with natives and other European civilizations, trade with your + 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 ! Added: packages/trunk/freecol/debian/freecol.classpath =================================================================== --- packages/trunk/freecol/debian/freecol.classpath (rev 0) +++ packages/trunk/freecol/debian/freecol.classpath 2011-06-25 17:08:09 UTC (rev 12480) @@ -0,0 +1 @@ +usr/share/java/freecol.jar miglayout.jar wstx-lgpl.jar cortado.jar commons-cli.jar Added: packages/trunk/freecol/debian/freecol.jlibs =================================================================== --- packages/trunk/freecol/debian/freecol.jlibs (rev 0) +++ packages/trunk/freecol/debian/freecol.jlibs 2011-06-25 17:08:09 UTC (rev 12480) @@ -0,0 +1 @@ +freecol.jar Modified: packages/trunk/freecol/debian/new-upstream =================================================================== --- packages/trunk/freecol/debian/new-upstream 2011-06-25 16:24:22 UTC (rev 12479) +++ packages/trunk/freecol/debian/new-upstream 2011-06-25 17:08:09 UTC (rev 12480) @@ -36,9 +36,11 @@ # We repackage the upstream source file, according to the method # written in debian/copyrigh cd $dir -tar xvzf $filename +# tar xvzf $filename +# Now using unzip: +unzip $filename cd $dir/freecol* -patch -p0 < $curdir/debian/freecol-dist-targz.diff +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 Modified: packages/trunk/freecol/debian/patches/10-fix-jar-path.diff =================================================================== --- packages/trunk/freecol/debian/patches/10-fix-jar-path.diff 2011-06-25 16:24:22 UTC (rev 12479) +++ packages/trunk/freecol/debian/patches/10-fix-jar-path.diff 2011-06-25 17:08:09 UTC (rev 12480) @@ -6,11 +6,11 @@ ## DP: packages @DPATCH@ -Index: freecol-0.9.2+dfsg/build.xml +Index: freecol-0.10.0+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 @@ +--- 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}"/> @@ -22,7 +22,7 @@ debug="on" optimize="on" deprecation="off" -@@ -148,7 +149,7 @@ +@@ -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."> Modified: packages/trunk/freecol/debian/patches/40-manpage.diff =================================================================== --- packages/trunk/freecol/debian/patches/40-manpage.diff 2011-06-25 16:24:22 UTC (rev 12479) +++ packages/trunk/freecol/debian/patches/40-manpage.diff 2011-06-25 17:08:09 UTC (rev 12480) @@ -4,10 +4,10 @@ ## DP: Small java-wrappers addition in the manual page @DPATCH@ -Index: freecol-0.9.2+dfsg/packaging/debian/freecol.6 +Index: freecol-0.10.0+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 +--- 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 Modified: packages/trunk/freecol/debian/patches/series =================================================================== --- packages/trunk/freecol/debian/patches/series 2011-06-25 16:24:22 UTC (rev 12479) +++ packages/trunk/freecol/debian/patches/series 2011-06-25 17:08:09 UTC (rev 12480) @@ -1,3 +1,3 @@ -disable-listener.diff +# disable-listener.diff 10-fix-jar-path.diff 40-manpage.diff Modified: packages/trunk/freecol/debian/rules =================================================================== --- packages/trunk/freecol/debian/rules 2011-06-25 16:24:22 UTC (rev 12479) +++ packages/trunk/freecol/debian/rules 2011-06-25 17:08:09 UTC (rev 12480) @@ -12,8 +12,8 @@ # 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 -# include /usr/share/cdbs/1/rules/dpatch.mk JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk ANT_HOME := /usr/share/ant @@ -24,12 +24,5 @@ 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 +# Override build classpath +ANT_OPTS := -Dbuild.sysclasspath=only Modified: packages/trunk/freecol/debian/watch =================================================================== --- packages/trunk/freecol/debian/watch 2011-06-25 16:24:22 UTC (rev 12479) +++ packages/trunk/freecol/debian/watch 2011-06-25 17:08:09 UTC (rev 12480) @@ -5,4 +5,4 @@ # 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 +http://sf.net/freecol/freecol-(?!.*alpha)(.*)-src\.zip debian debian/new-upstream Modified: packages/trunk/freecol/debian/wrapper/freecol =================================================================== --- packages/trunk/freecol/debian/wrapper/freecol 2011-06-25 16:24:22 UTC (rev 12479) +++ packages/trunk/freecol/debian/wrapper/freecol 2011-06-25 17:08:09 UTC (rev 12480) @@ -24,5 +24,5 @@ disablenet="-Djava.net.preferIPv4Stack=true" fi -run_java $disablenet -Xincgc -Xmx180M net.sf.freecol.FreeCol --freecol-data \ +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
