[freecol] 21/125: [freecol] Put freecol back in sync with upstream. Still some outstanding issues, though
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Dec 20 19:39:03 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 42369651b8656249259b79ebea96226d7c2d061f
Author: Vincent Fourmond <fourmond at debian.org>
Date: Fri Feb 29 20:45:39 2008 +0000
[freecol] Put freecol back in sync with upstream. Still some outstanding issues, though
---
debian/changelog | 15 ++++++++++-----
debian/new-upstream | 8 +++++++-
debian/patches/00list | 2 +-
debian/patches/10-fix-jar-path.dpatch | 10 +++++-----
debian/patches/15-fix-jar-manifest.dpatch | 20 +++++++++++---------
debian/patches/25-change-save-dir.dpatch | 8 ++++----
debian/wrapper/freecol | 15 +--------------
7 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4c61ce9..593c082 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,17 @@
-freecol (0.7.2-6) UNRELEASED; urgency=low
-
- [ Vincent Fourmond ]
- * NOT RELEASED YET
+freecol (0.7.3-1) UNRELEASED; urgency=low
[ Ansgar Burchardt ]
* Remove deprecated Encoding key from .desktop file
- -- Ansgar Burchardt <ansgar at 43-1.org> Fri, 29 Feb 2008 01:21:12 +0100
+ [ Vincent Fourmond ]
+ * NOT RELEASED YET
+ * 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
+ * PLEASE DO NOT UPLOAD !!!!!!!!!!!!!!!!!!!!
+
+ -- Vincent Fourmond <fourmond at debian.org> Fri, 29 Feb 2008 21:44:16 +0100
freecol (0.7.2-5) unstable; urgency=low
diff --git a/debian/new-upstream b/debian/new-upstream
index 966c6a8..bf3c4c4 100755
--- a/debian/new-upstream
+++ b/debian/new-upstream
@@ -22,9 +22,14 @@ dir=`mktemp -d`
curdir=`pwd`
origname=freecol_$version.orig.tar.gz
+
+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
@@ -34,6 +39,7 @@ cd $dir/freecol*
patch -p0 < $curdir/debian/freecol-dist-targz.diff
echo $version | ant tarDistBundle
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
cd -
-mv $dir/freecol*/dist/freecol-$version-dist-src.tar.gz $filename
rm -rf $dir
diff --git a/debian/patches/00list b/debian/patches/00list
index 2cfe513..5df31a6 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,4 +2,4 @@
15-fix-jar-manifest
# 20-freecol-executable
25-change-save-dir
-30-language-option
\ No newline at end of file
+# 30-language-option
\ No newline at end of file
diff --git a/debian/patches/10-fix-jar-path.dpatch b/debian/patches/10-fix-jar-path.dpatch
index 239807d..9d2a2bc 100755
--- a/debian/patches/10-fix-jar-path.dpatch
+++ b/debian/patches/10-fix-jar-path.dpatch
@@ -6,9 +6,9 @@
## DP: packages
@DPATCH@
-diff -urNad freecol-0.7.3~svn20071001~/build.xml freecol-0.7.3~svn20071001/build.xml
---- freecol-0.7.3~svn20071001~/build.xml 2007-10-02 17:21:33.000000000 +0200
-+++ freecol-0.7.3~svn20071001/build.xml 2007-10-02 17:24:21.000000000 +0200
+diff -urNad freecol-0.7.3~/build.xml freecol-0.7.3/build.xml
+--- freecol-0.7.3~/build.xml 2008-02-29 20:50:14.000000000 +0100
++++ freecol-0.7.3/build.xml 2008-02-29 21:04:02.000000000 +0100
@@ -65,7 +65,7 @@
<mkdir dir="${freecol.build.dir}"/>
<javac srcdir="${freecol.src.dir}"
@@ -18,10 +18,10 @@ diff -urNad freecol-0.7.3~svn20071001~/build.xml freecol-0.7.3~svn20071001/build
debug="on"
optimize="on"
deprecation="off"
-@@ -116,7 +116,7 @@
+@@ -125,7 +125,7 @@
<!-- Compiles the source files and creates a JAR-file. -->
- <target name="package" depends="init,build" description="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}"
diff --git a/debian/patches/15-fix-jar-manifest.dpatch b/debian/patches/15-fix-jar-manifest.dpatch
index 279e6c4..2d31801 100755
--- a/debian/patches/15-fix-jar-manifest.dpatch
+++ b/debian/patches/15-fix-jar-manifest.dpatch
@@ -5,12 +5,14 @@
## DP: No description.
@DPATCH@
-diff -urNad freecol-0.7.3~svn20071001~/src/MANIFEST.MF freecol-0.7.3~svn20071001/src/MANIFEST.MF
---- freecol-0.7.3~svn20071001~/src/MANIFEST.MF 2007-10-01 21:40:52.000000000 +0200
-+++ freecol-0.7.3~svn20071001/src/MANIFEST.MF 2007-10-02 18:15:37.000000000 +0200
-@@ -1,4 +1,4 @@
- Manifest-Version: 1.0
- Created-By: FreeCol Team
- Main-Class: net.sf.freecol.FreeCol
--Class-Path: jars/higlayout.jar jars/jsr173_1.0_api.jar jars/wstx-lgpl-4.0pr1.jar
-+Class-Path: /usr/share/java/higlayout.jar /usr/share/java/wstx-lgpl.jar
+diff -urNad freecol-0.7.3~/src/MANIFEST.MF freecol-0.7.3/src/MANIFEST.MF
+--- freecol-0.7.3~/src/MANIFEST.MF 2008-02-29 20:50:14.000000000 +0100
++++ freecol-0.7.3/src/MANIFEST.MF 2008-02-29 21:20:10.000000000 +0100
+@@ -3,6 +3,5 @@
+ Created-By: FreeCol Team
+ Main-Class: net.sf.freecol.FreeCol
+ Revision: ${svn.Revision}
+-Class-Path: jars/higlayout.jar jars/jsr173_1.0_api.jar jars/wstx-lgpl-
+- 4.0pr1.jar
++Class-Path: /usr/share/java/higlayout.jar /usr/share/java/wstx-lgpl.jar
+
diff --git a/debian/patches/25-change-save-dir.dpatch b/debian/patches/25-change-save-dir.dpatch
index a807e00..a13f62b 100755
--- a/debian/patches/25-change-save-dir.dpatch
+++ b/debian/patches/25-change-save-dir.dpatch
@@ -5,10 +5,10 @@
## DP: Change the directory for saved games
@DPATCH@
-diff -urNad freecol-0.7.2~/src/net/sf/freecol/FreeCol.java freecol-0.7.2/src/net/sf/freecol/FreeCol.java
---- freecol-0.7.2~/src/net/sf/freecol/FreeCol.java 2007-10-02 19:40:37.000000000 +0200
-+++ freecol-0.7.2/src/net/sf/freecol/FreeCol.java 2007-10-02 21:24:13.000000000 +0200
-@@ -374,14 +374,14 @@
+diff -urNad freecol-0.7.3~/src/net/sf/freecol/FreeCol.java freecol-0.7.3/src/net/sf/freecol/FreeCol.java
+--- freecol-0.7.3~/src/net/sf/freecol/FreeCol.java 2008-02-29 20:50:14.000000000 +0100
++++ freecol-0.7.3/src/net/sf/freecol/FreeCol.java 2008-02-29 21:08:39.000000000 +0100
+@@ -418,14 +418,14 @@
* Creates a freecol dir for the current user.
*
* The directory is created within the current user's
diff --git a/debian/wrapper/freecol b/debian/wrapper/freecol
index a9686cd..c509044 100755
--- a/debian/wrapper/freecol
+++ b/debian/wrapper/freecol
@@ -3,20 +3,7 @@
# Including wrapper script:
. /usr/lib/java-wrappers/java-wrappers.sh
-# Script 'greatly inspired' from the one of jabref
-
-# Unless there already is a JAVA_HOME, we use icedtea or java6
-
-if [ -z "$JAVA_HOME" ]
-then
- if [ -d /usr/lib/jvm/java-7-icedtea/jre ]; then
- JAVA_HOME=/usr/lib/jvm/java-7-icedtea
- JAVA=java
- else # We use java6 from Sun
- JAVA_HOME=/usr/lib/jvm/java-6-sun
- JAVA=${JAVA_HOME}/jre/bin/java
- fi
-fi
+find_java_runtime sun6
# We test if LC_MESSAGES is different from LC_CTYPE, if that is the case,
# we pass to freecol the --default-locale 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