r5723 - in packages/trunk/freecol/debian: . wrapper

[Vincent Fourmond]

Author: fourmond
Date: 2008-02-11 21:37:55 +0000 (Mon, 11 Feb 2008)
New Revision: 5723

Added:
   packages/trunk/freecol/debian/new-upstream
Modified:
   packages/trunk/freecol/debian/control
   packages/trunk/freecol/debian/watch
   packages/trunk/freecol/debian/wrapper/freecol
Log:
[freecol] Adding a new-upstream repackager script - nearly working !

Modified: packages/trunk/freecol/debian/control
===================================================================
--- packages/trunk/freecol/debian/control	2008-02-11 17:46:31 UTC (rev 5722)
+++ packages/trunk/freecol/debian/control	2008-02-11 21:37:55 UTC (rev 5723)
@@ -16,7 +16,7 @@
 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

Added: packages/trunk/freecol/debian/new-upstream
===================================================================
--- packages/trunk/freecol/debian/new-upstream	                        (rev 0)
+++ packages/trunk/freecol/debian/new-upstream	2008-02-11 21:37:55 UTC (rev 5723)
@@ -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


Property changes on: packages/trunk/freecol/debian/new-upstream
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/trunk/freecol/debian/watch
===================================================================
--- packages/trunk/freecol/debian/watch	2008-02-11 17:46:31 UTC (rev 5722)
+++ packages/trunk/freecol/debian/watch	2008-02-11 21:37:55 UTC (rev 5723)
@@ -4,4 +4,4 @@
 # 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 

Modified: packages/trunk/freecol/debian/wrapper/freecol
===================================================================
--- packages/trunk/freecol/debian/wrapper/freecol	2008-02-11 17:46:31 UTC (rev 5722)
+++ packages/trunk/freecol/debian/wrapper/freecol	2008-02-11 21:37:55 UTC (rev 5723)
@@ -1,5 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
+# 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