[freecol] 52/125: [freecol] new upstream release + various packaging cleanups

Markus Koschany apo-guest at moszumanska.debian.org
Sun Dec 20 19:39:06 UTC 2015 

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository freecol.

commit b59ed09e77c765960867616de81b6b6ff1fe5ea0
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Sat Jun 25 17:08:09 2011 +0000

    [freecol] new upstream release + various packaging cleanups
---
 debian/changelog                    | 17 ++++++++++++++++-
 debian/control                      | 10 +++++-----
 debian/freecol.classpath            |  1 +
 debian/freecol.jlibs                |  1 +
 debian/new-upstream                 |  6 ++++--
 debian/patches/10-fix-jar-path.diff | 10 +++++-----
 debian/patches/40-manpage.diff      |  6 +++---
 debian/patches/series               |  2 +-
 debian/rules                        | 13 +++----------
 debian/watch                        |  2 +-
 debian/wrapper/freecol              |  2 +-
 11 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 168ae83..65e89bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <fourmond at debian.org>  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 @@ freecol (0.9.2+dfsg-1) unstable; urgency=low
     - 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 <fourmond at debian.org>  Sun, 07 Mar 2010 18:00:39 +0100
diff --git a/debian/control b/debian/control
index 8310faf..4f6d976 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,8 @@ 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
+ 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 @@ 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
+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 !
diff --git a/debian/freecol.classpath b/debian/freecol.classpath
new file mode 100644
index 0000000..62bec31
--- /dev/null
+++ b/debian/freecol.classpath
@@ -0,0 +1 @@
+usr/share/java/freecol.jar miglayout.jar wstx-lgpl.jar cortado.jar commons-cli.jar
diff --git a/debian/freecol.jlibs b/debian/freecol.jlibs
new file mode 100644
index 0000000..e8d5ace
--- /dev/null
+++ b/debian/freecol.jlibs
@@ -0,0 +1 @@
+freecol.jar
diff --git a/debian/new-upstream b/debian/new-upstream
index dd90147..7918f3b 100755
--- a/debian/new-upstream
+++ b/debian/new-upstream
@@ -36,9 +36,11 @@ set -e
 # 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
diff --git a/debian/patches/10-fix-jar-path.diff b/debian/patches/10-fix-jar-path.diff
index 3a609e9..501fe1f 100755
--- a/debian/patches/10-fix-jar-path.diff
+++ b/debian/patches/10-fix-jar-path.diff
@@ -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 @@ Index: freecol-0.9.2+dfsg/build.xml
              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.">
diff --git a/debian/patches/40-manpage.diff b/debian/patches/40-manpage.diff
index 3c4b896..14db197 100755
--- a/debian/patches/40-manpage.diff
+++ b/debian/patches/40-manpage.diff
@@ -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
diff --git a/debian/patches/series b/debian/patches/series
index 1e5174d..ca75487 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-disable-listener.diff
+# disable-listener.diff
 10-fix-jar-path.diff
 40-manpage.diff
diff --git a/debian/rules b/debian/rules
index 584f65a..c9d1636 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,8 @@ VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | \
 # 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_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
+# Override build classpath
+ANT_OPTS             := -Dbuild.sysclasspath=only
diff --git a/debian/watch b/debian/watch
index e4a56c4..ed0c729 100644
--- a/debian/watch
+++ b/debian/watch
@@ -5,4 +5,4 @@ version=3
 # 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 
diff --git a/debian/wrapper/freecol b/debian/wrapper/freecol
index 365c26a..8f3b469 100755
--- a/debian/wrapper/freecol
+++ b/debian/wrapper/freecol
@@ -24,5 +24,5 @@ else
     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 "$@"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/freecol.git

More information about the Pkg-games-commits mailing list