[freecol] 48/125: [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...

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 ca38507e06d1decfee0849aefed94010722ce5db
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Sun Mar 7 16:14:38 2010 +0000

    [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...
---
 debian/changelog                                          | 13 +++++++++++++
 debian/control                                            | 15 ++++++++-------
 debian/freecol-dist-targz.diff                            |  4 ++--
 debian/new-upstream                                       |  6 +++---
 debian/patches/00list                                     |  2 --
 .../{10-fix-jar-path.dpatch => 10-fix-jar-path.diff}      | 11 ++++++-----
 debian/patches/{40-manpage.dpatch => 40-manpage.diff}     |  7 ++++---
 debian/patches/series                                     |  2 ++
 debian/rules                                              |  4 ++--
 debian/source/format                                      |  1 +
 10 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8468450..f4a400b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index f46481e..00222de 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,21 @@ Section: games
 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
diff --git a/debian/freecol-dist-targz.diff b/debian/freecol-dist-targz.diff
index a53fd6f..1381a06 100644
--- a/debian/freecol-dist-targz.diff
+++ b/debian/freecol-dist-targz.diff
@@ -7,12 +7,12 @@ Index: build.xml
      </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="**"
diff --git a/debian/new-upstream b/debian/new-upstream
index 32075c0..dd90147 100755
--- a/debian/new-upstream
+++ b/debian/new-upstream
@@ -24,7 +24,7 @@ dir=`mktemp -d`
 
 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 @@ 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.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
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index fbf8133..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-10-fix-jar-path
-40-manpage
\ No newline at end of file
diff --git a/debian/patches/10-fix-jar-path.dpatch b/debian/patches/10-fix-jar-path.diff
similarity index 80%
rename from debian/patches/10-fix-jar-path.dpatch
rename to debian/patches/10-fix-jar-path.diff
index 8572c47..3a609e9 100755
--- a/debian/patches/10-fix-jar-path.dpatch
+++ b/debian/patches/10-fix-jar-path.diff
@@ -6,10 +6,11 @@
 ## DP: packages 
 
 @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 @@
+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}"/>
@@ -21,7 +22,7 @@ diff -urNad freecol-0.8.1.dfsg~/build.xml freecol-0.8.1.dfsg/build.xml
              debug="on"
              optimize="on"
              deprecation="off"
-@@ -144,7 +145,7 @@
+@@ -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.">
diff --git a/debian/patches/40-manpage.dpatch b/debian/patches/40-manpage.diff
similarity index 74%
rename from debian/patches/40-manpage.dpatch
rename to debian/patches/40-manpage.diff
index fde5d42..3c4b896 100755
--- a/debian/patches/40-manpage.dpatch
+++ b/debian/patches/40-manpage.diff
@@ -4,9 +4,10 @@
 ## DP: Small java-wrappers addition in the manual page
 
 @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
+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
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..14a85c2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+10-fix-jar-path.diff
+40-manpage.diff
diff --git a/debian/rules b/debian/rules
index fe9d432..584f65a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,12 +13,12 @@ VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | \
 
 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         := .
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
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