Author: twerner Date: 2011-09-08 20:26:25 +0000 (Thu, 08 Sep 2011) New Revision: 14773
Added: trunk/jarjar/debian/orig-tar.sh Removed: trunk/jarjar/debian/fetch.sh Modified: trunk/jarjar/debian/changelog trunk/jarjar/debian/patches/0001-fix-build.xml.patch trunk/jarjar/debian/patches/0002-embed-libs-from-debian.patch trunk/jarjar/debian/patches/0003-fix-path-in-build.xml.patch trunk/jarjar/debian/patches/0004-support-gnu-regexp.patch trunk/jarjar/debian/patches/0005-cast-null-to-java.io.File.patch trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch trunk/jarjar/debian/rules trunk/jarjar/debian/watch Log: * Team upload * New upstream release. * Change debian/watch to point to upstream's svn repo. * Refresh patches. Modified: trunk/jarjar/debian/changelog =================================================================== --- trunk/jarjar/debian/changelog 2011-09-08 19:49:55 UTC (rev 14772) +++ trunk/jarjar/debian/changelog 2011-09-08 20:26:25 UTC (rev 14773) @@ -1,3 +1,12 @@ +jarjar (1.1-1) unstable; urgency=low + + * Team upload + * New upstream release. + * Change debian/watch to point to upstream's svn repo. + * Refresh patches. + + -- Torsten Werner <[email protected]> Thu, 08 Sep 2011 22:25:14 +0200 + jarjar (1.0+dfsg-2) unstable; urgency=low [ Torsten Werner ] Deleted: trunk/jarjar/debian/fetch.sh =================================================================== --- trunk/jarjar/debian/fetch.sh 2011-09-08 19:49:55 UTC (rev 14772) +++ trunk/jarjar/debian/fetch.sh 2011-09-08 20:26:25 UTC (rev 14773) @@ -1,40 +0,0 @@ -#!/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 - - Added: trunk/jarjar/debian/orig-tar.sh =================================================================== --- trunk/jarjar/debian/orig-tar.sh (rev 0) +++ trunk/jarjar/debian/orig-tar.sh 2011-09-08 20:26:25 UTC (rev 14773) @@ -0,0 +1,16 @@ +#!/bin/sh -e + +VERSION=$2 +TAR=../jarjar_$VERSION.orig.tar.gz +DIR=jarjar-$VERSION +TAG="release-$VERSION" + +svn export http://jarjar.googlecode.com/svn/tags/${TAG}/jarjar $DIR +tar -c -z -f $TAR --exclude '*.jar' $DIR +rm -rf $DIR ../$TAG + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir && echo "moved $TAR to $origDir" +fi Property changes on: trunk/jarjar/debian/orig-tar.sh ___________________________________________________________________ Added: svn:executable + * Modified: trunk/jarjar/debian/patches/0001-fix-build.xml.patch =================================================================== --- trunk/jarjar/debian/patches/0001-fix-build.xml.patch 2011-09-08 19:49:55 UTC (rev 14772) +++ trunk/jarjar/debian/patches/0001-fix-build.xml.patch 2011-09-08 20:26:25 UTC (rev 14773) @@ -1,13 +1,13 @@ From: Arnaud Vandyck <[email protected]> Date: Sun, 28 Feb 2010 12:42:05 +0100 -Subject: [PATCH] fix build.xml +Subject: fix build.xml --- build.xml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml -index 06db28d..0fcf8b6 100644 +index dbe5b1f..d0fca14 100644 --- a/build.xml +++ b/build.xml @@ -47,8 +47,9 @@ Modified: trunk/jarjar/debian/patches/0002-embed-libs-from-debian.patch =================================================================== --- trunk/jarjar/debian/patches/0002-embed-libs-from-debian.patch 2011-09-08 19:49:55 UTC (rev 14772) +++ trunk/jarjar/debian/patches/0002-embed-libs-from-debian.patch 2011-09-08 20:26:25 UTC (rev 14773) @@ -1,21 +1,21 @@ From: Arnaud Vandyck <[email protected]> Date: Sun, 28 Feb 2010 12:42:06 +0100 -Subject: [PATCH] embed libs from debian +Subject: embed libs from debian --- build.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml -index 0fcf8b6..b2b73d1 100644 +index d0fca14..ea5707e 100644 --- a/build.xml +++ b/build.xml @@ -76,8 +76,8 @@ <mkdir dir="dist"/> <jarjar jarfile="${jarfile}"> <fileset dir="build/main"/> -- <zipfileset src="lib/asm-3.1.jar"/> -- <zipfileset src="lib/asm-commons-3.1.jar"> +- <zipfileset src="lib/asm-3.3.1.jar"/> +- <zipfileset src="lib/asm-commons-3.3.1.jar"> + <zipfileset src="${asm.jar}"/> + <zipfileset src="${asm-commons.jar}"> <include name="org/objectweb/asm/commons/EmptyVisitor.class"/> Modified: trunk/jarjar/debian/patches/0003-fix-path-in-build.xml.patch =================================================================== --- trunk/jarjar/debian/patches/0003-fix-path-in-build.xml.patch 2011-09-08 19:49:55 UTC (rev 14772) +++ trunk/jarjar/debian/patches/0003-fix-path-in-build.xml.patch 2011-09-08 20:26:25 UTC (rev 14773) @@ -1,13 +1,13 @@ From: Arnaud Vandyck <[email protected]> Date: Sun, 28 Feb 2010 12:42:07 +0100 -Subject: [PATCH] fix path in build.xml +Subject: fix path in build.xml --- build.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/build.xml b/build.xml -index b2b73d1..b7aa2d6 100644 +index ea5707e..bbae4da 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,9 @@ Modified: trunk/jarjar/debian/patches/0004-support-gnu-regexp.patch =================================================================== --- trunk/jarjar/debian/patches/0004-support-gnu-regexp.patch 2011-09-08 19:49:55 UTC (rev 14772) +++ trunk/jarjar/debian/patches/0004-support-gnu-regexp.patch 2011-09-08 20:26:25 UTC (rev 14773) @@ -1,6 +1,6 @@ From: Arnaud Vandyck <[email protected]> Date: Sun, 28 Feb 2010 12:42:08 +0100 -Subject: [PATCH] support gnu-regexp +Subject: support gnu-regexp --- .../com/tonicsystems/jarjar/PackageRemapper.java | 2 +- Modified: trunk/jarjar/debian/patches/0005-cast-null-to-java.io.File.patch =================================================================== --- trunk/jarjar/debian/patches/0005-cast-null-to-java.io.File.patch 2011-09-08 19:49:55 UTC (rev 14772) +++ trunk/jarjar/debian/patches/0005-cast-null-to-java.io.File.patch 2011-09-08 20:26:25 UTC (rev 14773) @@ -1,6 +1,6 @@ From: Torsten Werner <[email protected]> Date: Sun, 28 Feb 2010 12:45:07 +0100 -Subject: [PATCH] cast null to java.io.File +Subject: cast null to java.io.File --- .../tonicsystems/jarjar/util/AntJarProcessor.java | 2 +- Modified: trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch =================================================================== --- trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch 2011-09-08 19:49:55 UTC (rev 14772) +++ trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch 2011-09-08 20:26:25 UTC (rev 14773) @@ -1,13 +1,13 @@ From: Torsten Werner <[email protected]> Date: Sun, 28 Feb 2010 12:45:45 +0100 -Subject: [PATCH] remove asm-commons from final jar +Subject: remove asm-commons from final jar --- build.xml | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/build.xml b/build.xml -index b7aa2d6..5d91842 100644 +index bbae4da..160e9ee 100644 --- a/build.xml +++ b/build.xml @@ -79,11 +79,6 @@ Modified: trunk/jarjar/debian/rules =================================================================== --- trunk/jarjar/debian/rules 2011-09-08 19:49:55 UTC (rev 14772) +++ trunk/jarjar/debian/rules 2011-09-08 20:26:25 UTC (rev 14773) @@ -15,6 +15,4 @@ dh_link -plibjarjar-java /usr/share/java/jarjar-$(VERSION).jar /usr/share/java/jarjar.jar get-orig-source: - @dh_testdir || (echo "Due to the cdbs magic, this rule should not be run out of the build dir." ; \ - exit 1) - debian/fetch.sh $(DEB_UPSTREAM_VERSION) + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download Modified: trunk/jarjar/debian/watch =================================================================== --- trunk/jarjar/debian/watch 2011-09-08 19:49:55 UTC (rev 14772) +++ trunk/jarjar/debian/watch 2011-09-08 20:26:25 UTC (rev 14773) @@ -1,3 +1,4 @@ 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-([\d\.]*)\.jar + http://jarjar.googlecode.com/svn/tags/ release-(.*)/ debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
