r10825 - in packages/trunk/freecol/debian: . patches source
Vincent Fourmond
fourmond at alioth.debian.org
Sun Mar 7 16:14:43 UTC 2010
Author: fourmond
Date: 2010-03-07 16:14:38 +0000 (Sun, 07 Mar 2010)
New Revision: 10825
Added:
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/source/
packages/trunk/freecol/debian/source/format
Removed:
packages/trunk/freecol/debian/patches/00list
packages/trunk/freecol/debian/patches/10-fix-jar-path.dpatch
packages/trunk/freecol/debian/patches/40-manpage.dpatch
Modified:
packages/trunk/freecol/debian/changelog
packages/trunk/freecol/debian/control
packages/trunk/freecol/debian/freecol-dist-targz.diff
packages/trunk/freecol/debian/new-upstream
packages/trunk/freecol/debian/rules
Log:
[freecol] Preparation for the new upstream release, but it seems one of the new jars (cortado-fc) has extra used symbols compared to the publicly availabkle version...
Modified: packages/trunk/freecol/debian/changelog
===================================================================
--- packages/trunk/freecol/debian/changelog 2010-03-06 22:16:23 UTC (rev 10824)
+++ packages/trunk/freecol/debian/changelog 2010-03-07 16:14:38 UTC (rev 10825)
@@ -1,3 +1,16 @@
+freecol (0.9.2+dfsg-1) UNREADYYET; urgency=low
+
+ * New upstream release
+ * 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)
+
+ -- Vincent Fourmond <fourmond at debian.org> Sun, 07 Mar 2010 17:01:49 +0100
+
freecol (0.8.4+dfsg-2) unstable; urgency=low
* Disable IPV6 networking stack by default to work around Java bug
Modified: packages/trunk/freecol/debian/control
===================================================================
--- packages/trunk/freecol/debian/control 2010-03-06 22:16:23 UTC (rev 10824)
+++ packages/trunk/freecol/debian/control 2010-03-07 16:14:38 UTC (rev 10825)
@@ -3,20 +3,21 @@
Priority: optional
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, cdbs
-Build-Depends-Indep: libhiglayout-java, libwoodstox-java,
+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
-Standards-Version: 3.8.3
+ texlive-latex-recommended, libcommons-cli-java, libmiglayout-java,
+ libcortado-java
+Standards-Version: 3.8.4
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, libhiglayout-java,
- libwoodstox-java, java-wrappers (>= 0.1.13), ${misc:Depends}
+Depends: openjdk-6-jre | java6-runtime,
+ libwoodstox-java, java-wrappers (>= 0.1.13), ${misc:Depends},
+ libcommons-cli-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
Modified: packages/trunk/freecol/debian/freecol-dist-targz.diff
===================================================================
--- packages/trunk/freecol/debian/freecol-dist-targz.diff 2010-03-06 22:16:23 UTC (rev 10824)
+++ packages/trunk/freecol/debian/freecol-dist-targz.diff 2010-03-07 16:14:38 UTC (rev 10825)
@@ -7,12 +7,12 @@
</target>
+ <!-- A target that builds a 'source' package in the Debian
-+ of the term,, stripped of all potential legal/building
++ of the term, stripped of all potential legal/building
+ problems, such as jars without sources and already built jars,
+ as those cause problems and are unnecessary for a distribution.
+ -->
+ <target name="tarDistBundle" unless="skip.dist.source" depends="initDist,prepareSourceFiles">
-+ <tar destfile="${freecol.release.dir}/${freecol.release.name}-dist-src.tar.gz" compression="gzip">
++ <tar destfile="${freecol.release.dir}/${freecol.release.name}-dist-src.tar.bz2" compression="bzip2">
+ <tarfileset dir="${freecol.release.dir}/source/${freecol.name}"
+ prefix="${freecol.release.name}"
+ includes="**"
Modified: packages/trunk/freecol/debian/new-upstream
===================================================================
--- packages/trunk/freecol/debian/new-upstream 2010-03-06 22:16:23 UTC (rev 10824)
+++ packages/trunk/freecol/debian/new-upstream 2010-03-07 16:14:38 UTC (rev 10825)
@@ -24,7 +24,7 @@
curdir=`pwd`
-origname=freecol_$version"+dfsg".orig.tar.gz
+origname=freecol_$version"+dfsg".orig.tar.bz2
echo "Repackaging freecol version $version from $filename"
echo $filename
@@ -42,7 +42,7 @@
echo $version | ant tarDistBundle
# Do not remove the original file !!!
# rm $curdir/$filename
-echo "Moving back dist/freecol-$version-dist-src.tar.gz to $curdir/../$origname"
-mv dist/freecol-$version-dist-src.tar.gz $curdir/../$origname
+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/trunk/freecol/debian/patches/00list
===================================================================
--- packages/trunk/freecol/debian/patches/00list 2010-03-06 22:16:23 UTC (rev 10824)
+++ packages/trunk/freecol/debian/patches/00list 2010-03-07 16:14:38 UTC (rev 10825)
@@ -1,2 +0,0 @@
-10-fix-jar-path
-40-manpage
\ No newline at end of file
Copied: packages/trunk/freecol/debian/patches/10-fix-jar-path.diff (from rev 10803, packages/trunk/freecol/debian/patches/10-fix-jar-path.dpatch)
===================================================================
--- packages/trunk/freecol/debian/patches/10-fix-jar-path.diff (rev 0)
+++ packages/trunk/freecol/debian/patches/10-fix-jar-path.diff 2010-03-07 16:14:38 UTC (rev 10825)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10-fix-jar-path.dpatch by <fourmond at debian.org>
+##
+## 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
+
+ at 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/**"
Deleted: packages/trunk/freecol/debian/patches/10-fix-jar-path.dpatch
===================================================================
--- packages/trunk/freecol/debian/patches/10-fix-jar-path.dpatch 2010-03-06 22:16:23 UTC (rev 10824)
+++ packages/trunk/freecol/debian/patches/10-fix-jar-path.dpatch 2010-03-07 16:14:38 UTC (rev 10825)
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-fix-jar-path.dpatch by <fourmond at debian.org>
-##
-## 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
-
- at DPATCH@
-diff -urNad freecol-0.8.1.dfsg~/build.xml freecol-0.8.1.dfsg/build.xml
---- freecol-0.8.1.dfsg~/build.xml 2009-02-24 00:33:22.000000000 +0100
-+++ freecol-0.8.1.dfsg/build.xml 2009-02-24 17:15:53.000000000 +0100
-@@ -83,9 +83,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"
-@@ -144,7 +145,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/trunk/freecol/debian/patches/40-manpage.diff (from rev 10803, packages/trunk/freecol/debian/patches/40-manpage.dpatch)
===================================================================
--- packages/trunk/freecol/debian/patches/40-manpage.diff (rev 0)
+++ packages/trunk/freecol/debian/patches/40-manpage.diff 2010-03-07 16:14:38 UTC (rev 10825)
@@ -0,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40-manpage.dpatch by <fourmond at debian.org>
+##
+## DP: Small java-wrappers addition in the manual page
+
+ at 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 <jean_lepropre at users.sourceforge.net>,
++This manual page was written by Jean Lepropre
++<jean_lepropre at users.sourceforge.net>,
+ for the Debian project (but may be used by others).
++
++It was updated by Vincent Fourmond <fourmond at debian.org>
Deleted: packages/trunk/freecol/debian/patches/40-manpage.dpatch
===================================================================
--- packages/trunk/freecol/debian/patches/40-manpage.dpatch 2010-03-06 22:16:23 UTC (rev 10824)
+++ packages/trunk/freecol/debian/patches/40-manpage.dpatch 2010-03-07 16:14:38 UTC (rev 10825)
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 40-manpage.dpatch by <fourmond at debian.org>
-##
-## DP: Small java-wrappers addition in the manual page
-
- at DPATCH@
-diff -urNad freecol-0.7.3~/packaging/debian/freecol.6 freecol-0.7.3/packaging/debian/freecol.6
---- freecol-0.7.3~/packaging/debian/freecol.6 2008-02-29 20:50:14.000000000 +0100
-+++ freecol-0.7.3/packaging/debian/freecol.6 2008-02-29 23:08:34.000000000 +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 <jean_lepropre at users.sourceforge.net>,
-+This manual page was written by Jean Lepropre
-+<jean_lepropre at users.sourceforge.net>,
- for the Debian project (but may be used by others).
-+
-+It was updated by Vincent Fourmond <fourmond at debian.org>
Copied: packages/trunk/freecol/debian/patches/series (from rev 10803, packages/trunk/freecol/debian/patches/00list)
===================================================================
--- packages/trunk/freecol/debian/patches/series (rev 0)
+++ packages/trunk/freecol/debian/patches/series 2010-03-07 16:14:38 UTC (rev 10825)
@@ -0,0 +1,2 @@
+10-fix-jar-path.diff
+40-manpage.diff
Modified: packages/trunk/freecol/debian/rules
===================================================================
--- packages/trunk/freecol/debian/rules 2010-03-06 22:16:23 UTC (rev 10824)
+++ packages/trunk/freecol/debian/rules 2010-03-07 16:14:38 UTC (rev 10825)
@@ -13,12 +13,12 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/dpatch.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 \
- higlayout wstx-lgpl
+ miglayout wstx-lgpl commons-cli cortado
DEB_ANT_COMPILER := modern
DEB_ANT_BUILD_TARGET := package online-manual print-manual
DEB_BUILDDIR := .
Added: packages/trunk/freecol/debian/source/format
===================================================================
--- packages/trunk/freecol/debian/source/format (rev 0)
+++ packages/trunk/freecol/debian/source/format 2010-03-07 16:14:38 UTC (rev 10825)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Pkg-games-commits
mailing list