[pkg-java] r10361 - trunk/jarjar/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2009-09-14 19:43:26 +0000 (Mon, 14 Sep 2009)
New Revision: 10361

Added:
   trunk/jarjar/debian/fetch.sh
   trunk/jarjar/debian/source.fetch
Modified:
   trunk/jarjar/debian/changelog
   trunk/jarjar/debian/rules
Log:
Changed the version number and made a script to fetch the source that also works arounds the "1.0rc8" = "1.0" problem.

Modified: trunk/jarjar/debian/changelog
===================================================================
--- trunk/jarjar/debian/changelog	2009-09-14 19:35:53 UTC (rev 10360)
+++ trunk/jarjar/debian/changelog	2009-09-14 19:43:26 UTC (rev 10361)
@@ -1,10 +1,17 @@
-jarjar (1.0~rc8+dfsg-2) UNRELEASED; urgency=low
+jarjar (1.0+dfsg-1) unstable; urgency=low
 
+  [ Michael Koch ]
   * debian/watch: updated to track binary jar file instead
     of source release.
 
- -- Michael Koch <konqueror at gmx.de>  Mon, 14 Sep 2009 18:11:16 +0200
+  [ Niels Thykier ]
+  * New upstream release.
+    - Identical content, but version numbers differed.
+  * Create a script to handle fetching of orig source that
+    works around 1.0rc8 and 1.0 being the same release.
 
+ -- Niels Thykier <niels at thykier.net>  Mon, 14 Sep 2009 21:39:52 +0200
+
 jarjar (1.0~rc8+dfsg-1) unstable; urgency=low
 
   * New upstream release.

Added: trunk/jarjar/debian/fetch.sh
===================================================================
--- trunk/jarjar/debian/fetch.sh	                        (rev 0)
+++ trunk/jarjar/debian/fetch.sh	2009-09-14 19:43:26 UTC (rev 10361)
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+set -e
+
+FETCH_VERSION="$1"
+__WORKDIR=`mktemp -d --tmpdir=.`
+
+correctVersion() {
+    ACTION="$1"
+    VERSION=`echo "$2" | sed s/\+dfsg//g`
+
+    if [ "x$ACTION" = "x--release" ] ; then
+	if [ "x$VERSION" = x1.0rc8 ] ; then
+	    VERSION=1.0
+	fi
+    elif [ "x$ACTION" = "x--fetch" -a "x$VERSION" = x1.0 ] ; then 
+	VERSION=1.0~rc8
+    fi   
+    echo "$VERSION"
+}
+
+choke() {
+    rm -fr "$__WORKDIR"
+    exit 1
+}
+
+__VERSION=`correctVersion --fetch "$FETCH_VERSION"` 
+
+uscan --watchfile debian/source.fetch --force-download --destdir="$__WORKDIR" --download-version $__VERSION || choke
+cd "$__WORKDIR"
+__ZIP=`ls`
+__NEW_VERSION=$(correctVersion --release `echo $__ZIP | sed "s/.*-\(.*\)\.zip/\1/g"`) 
+unzip $__ZIP >/dev/null 2>&1 || choke
+rm -f $__ZIP 
+tar --exclude='*.class' --exclude='*.jar' -czf ../jarjar_$__NEW_VERSION+dfsg.orig.tar.gz *  || choke
+cd ..
+rm -fr "$__WORKDIR" && echo "Orig source: jarjar_$__NEW_VERSION+dfsg.orig.tar.gz." 
+exit 0
+
+


Property changes on: trunk/jarjar/debian/fetch.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/jarjar/debian/rules
===================================================================
--- trunk/jarjar/debian/rules	2009-09-14 19:35:53 UTC (rev 10360)
+++ trunk/jarjar/debian/rules	2009-09-14 19:43:26 UTC (rev 10361)
@@ -18,10 +18,4 @@
 get-orig-source:
 	@dh_testdir || (echo "Due to the cdbs magic, this rule should not be run out of the build dir." ; \
 	  exit 1)
-	__WORKDIR=`mktemp -d --tmpdir=.` ; \
-	  (uscan --force-download --destdir="$$__WORKDIR" >/dev/null && cd "$$__WORKDIR" && \
-	    __ZIP=`ls` && __NEW_VERSION=`echo $$__ZIP | sed "s/.*-\(.*\)\.zip/\1/g"` && unzip $$__ZIP >/dev/null 2>&1 && \
-	    rm -f $$__ZIP && find . \( -name '*.jar' -o -name '*.class' \) -exec rm -f {} \; &&\
-	    tar czf ../jarjar_$$__NEW_VERSION+dfsg.orig.tar.gz * && cd .. && rm -fr "$$__WORKDIR" && \
-	    echo "Orig source: jarjar_$$__NEW_VERSION+dfsg.orig.tar.gz." && exit 0 \
-	  ) || (rm -fr "$$__WORKDIR" ; exit 1)
+	debian/fetch.sh $(DEB_UPSTREAM_VERSION)

Added: trunk/jarjar/debian/source.fetch
===================================================================
--- trunk/jarjar/debian/source.fetch	                        (rev 0)
+++ trunk/jarjar/debian/source.fetch	2009-09-14 19:43:26 UTC (rev 10361)
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/[+.]dfsg//,uversionmangle=s/(rc\d+)/~$1/ \
+  http://code.google.com/p/jarjar/downloads/list http://jarjar.googlecode.com/files/jarjar-src-(.*)\.zip