[freecol] 19/125: [freecol] Adding a new-upstream repackager script - nearly working !

[Markus Koschany]

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

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

commit 99a5a6737487902e039f11b57a406e94191a6854
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Mon Feb 11 21:37:55 2008 +0000

    [freecol] Adding a new-upstream repackager script - nearly working !
---
 debian/control         |  2 +-
 debian/new-upstream    | 39 +++++++++++++++++++++++++++++++++++++++
 debian/watch           |  2 +-
 debian/wrapper/freecol |  5 ++++-
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 95371e7..7361035 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/freecol
 Package: freecol
 Architecture: all
 Depends: icedtea-java7-jre | sun-java6-jre | j2re1.6 , libhiglayout-java, 
- libwoodstox-java
+ libwoodstox-java, java-wrappers
 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/new-upstream b/debian/new-upstream
new file mode 100755
index 0000000..966c6a8
--- /dev/null
+++ b/debian/new-upstream
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# new-upstream: copyright 2007 by Vincent Fourmond.
+# See debian/copyright file for details.
+#
+# Called by uscan; from uscan(1):
+#
+# Finally,  if a third parameter (an action) is given in the watchfile
+# line, this is taken as the name of a command, and the command
+#  command --upstream-version version filename
+# 
+# is executed, using either the original file or the symlink name.
+#
+# Thanks to Sam Morris <sam at robots.org.uk> for giving me the idea
+#
+
+version=$2
+filename=$3
+
+dir=`mktemp -d`
+
+curdir=`pwd`
+
+origname=freecol_$version.orig.tar.gz
+echo $filename
+echo $version
+
+# We repackage the upstream source file, according to the method
+# written in debian/copyrigh
+cd $dir
+echo tar xvzf $curdir/$filename
+tar xvzf $curdir/$filename
+cd $dir/freecol*
+patch -p0 < $curdir/debian/freecol-dist-targz.diff
+echo $version | ant tarDistBundle
+rm $curdir/$filename
+cd -
+mv $dir/freecol*/dist/freecol-$version-dist-src.tar.gz $filename
+rm -rf $dir
diff --git a/debian/watch b/debian/watch
index 3072016..b280783 100644
--- a/debian/watch
+++ b/debian/watch
@@ -4,4 +4,4 @@ version=3
 # Don't forget to look into debian/copyright first before packaging
 # a new upstream version !!! The watchfile works, but the downloaded
 # archive should not go to debian - you need to repackage it.
-http://sf.net/freecol/freecol-(.*)-src\.tar\.gz
+http://sf.net/freecol/freecol-(.*)-src\.tar\.gz debian debian/new-upstream 
diff --git a/debian/wrapper/freecol b/debian/wrapper/freecol
index 945bc5c..a9686cd 100755
--- a/debian/wrapper/freecol
+++ b/debian/wrapper/freecol
@@ -1,4 +1,7 @@
-#!/bin/sh
+#!/bin/bash
+
+# Including wrapper script:
+. /usr/lib/java-wrappers/java-wrappers.sh
 
 # Script 'greatly inspired' from the one of jabref
 

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