Author: twerner Date: 2011-09-08 20:33:57 +0000 (Thu, 08 Sep 2011) New Revision: 14775
Added: tags/jarjar/1.1-1/ tags/jarjar/1.1-1/debian/changelog tags/jarjar/1.1-1/debian/control tags/jarjar/1.1-1/debian/orig-tar.sh tags/jarjar/1.1-1/debian/patches/0001-fix-build.xml.patch tags/jarjar/1.1-1/debian/patches/0002-embed-libs-from-debian.patch tags/jarjar/1.1-1/debian/patches/0003-fix-path-in-build.xml.patch tags/jarjar/1.1-1/debian/patches/0004-support-gnu-regexp.patch tags/jarjar/1.1-1/debian/patches/0005-cast-null-to-java.io.File.patch tags/jarjar/1.1-1/debian/patches/0006-remove-asm-commons-from-final-jar.patch tags/jarjar/1.1-1/debian/rules tags/jarjar/1.1-1/debian/watch Removed: tags/jarjar/1.1-1/debian/changelog tags/jarjar/1.1-1/debian/control tags/jarjar/1.1-1/debian/fetch.sh tags/jarjar/1.1-1/debian/patches/0001-fix-build.xml.patch tags/jarjar/1.1-1/debian/patches/0002-embed-libs-from-debian.patch tags/jarjar/1.1-1/debian/patches/0003-fix-path-in-build.xml.patch tags/jarjar/1.1-1/debian/patches/0004-support-gnu-regexp.patch tags/jarjar/1.1-1/debian/patches/0005-cast-null-to-java.io.File.patch tags/jarjar/1.1-1/debian/patches/0006-remove-asm-commons-from-final-jar.patch tags/jarjar/1.1-1/debian/rules tags/jarjar/1.1-1/debian/watch Log: [svn-buildpackage] Tagging jarjar 1.1-1 Deleted: tags/jarjar/1.1-1/debian/changelog =================================================================== --- trunk/jarjar/debian/changelog 2011-09-08 19:49:55 UTC (rev 14772) +++ tags/jarjar/1.1-1/debian/changelog 2011-09-08 20:33:57 UTC (rev 14775) @@ -1,117 +0,0 @@ -jarjar (1.0+dfsg-2) unstable; urgency=low - - [ Torsten Werner ] - * Convert patches to dep3 format. - * Add a patch to cast null to java.io.File. (Closes: #571340) - * Add a patch to remove asm-commons from final jar file. - * Convert package to source format 3.0. - - [ Thierry Carrez ] - * debian/control: Minimal runtime dependency set to java2-runtime-headless - - [ Niels Thykier ] - * debian/control: Added java5 and java6 as alternatives. - - -- Torsten Werner <[email protected]> Sun, 28 Feb 2010 12:47:45 +0100 - -jarjar (1.0+dfsg-1) unstable; urgency=low - - [ Michael Koch ] - * debian/watch: updated to track binary jar file instead - of source release. - - [ 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 <[email protected]> Mon, 14 Sep 2009 21:39:52 +0200 - -jarjar (1.0~rc8+dfsg-1) unstable; urgency=low - - * New upstream release. - * Added myself to uploaders. - * Renamed and updated 02_dont_build_JarJarMojo.patch to - 02_fix_build_xml.patch. - * Stopped using Build-Depends-Indep since buildds and the policy - does not agree on when it should used. - * Changed section to java. - * Replaced gcj-compat with the default javas packages. - (Closes: #526279) - * Bumped to Standard-Version 3.8.3. - - Link to Apache-2.0 license rather than quoting it. - * Bumped Debhelper to version 7. - * Added a README.source to briefly explain that files have been - excluded from the orignal upstream source. - * Created an get-orig-source rule to fetch and create the - orig.tar.gz. - - -- Niels Thykier <[email protected]> Sat, 12 Sep 2009 19:26:57 +0200 - -jarjar (1.0~rc7.dfsg-2) unstable; urgency=low - - * Fix lists in long descriptions. Closes: #480324 - - -- Michael Koch <[email protected]> Fri, 09 May 2008 17:13:34 -0100 - -jarjar (1.0~rc7.dfsg-1) unstable; urgency=low - - * New upstream version. - * Updated watch file again to check for source download. - - -- Michael Koch <[email protected]> Sat, 22 Mar 2008 17:23:24 +0100 - -jarjar (1.0~rc6.dfsg-1) unstable; urgency=low - - [ Michael Koch ] - * Rewrote debian/copyright as new version is licensed under - Apache License 2.0. - * Updated watch file to match upstream version correctly. - * Moved debhelper and cdbs from Build-Depends-Indep to Build-Depends. - * Updated debhelper level to 5. - * Added debian/patches/05_gnu_regexp.patch to work around limitation in - gnu.regexp. - * Removed some cruft from debian/rules. - * Added Homepage, Vcs-Svn and Vcs-Browser fields. - * Added myself to Uploaders. - - [ Arnaud Vandyck ] - * New upstream. - * debian/control: - - Standards-Version: updated to 3.7.3, no change. - - Build-Depends-Indep: removed libgnu-regexp-java. - * debian/patches/19_TextDepHandler.patch, - debian/patches/22_util_StandaloneJarProcessor.patch, - debian/patches/23_KeepProcessor.patch, - debian/patches/10_DepFindVisitor.patch, - debian/patches/21_util_RemappingClassTransformer.patch, - debian/patches/14_PackageRemapper.patch, - debian/patches/12_JarJarTask.patch, - debian/patches/17_ResourceProcessor.patch, - debian/patches/20_util_ClassHeaderReader.patch, - debian/patches/01_build_classpath.patch, - debian/patches/18_StringReader.patch, - debian/patches/15_util_JarTransformerChain.patch, - debian/patches/24_util_GetNameClassWriter.patch, - debian/patches/13_ManifestProcessor.patch, - debian/patches/11_DepFind.patch, - debian/patches/10_AbstractDepHandler_warning.patch: removed - * debian/patches/04_path_build.patch: added - * debian/libjarjar-java.install, debian/libjarjar-java.links: updated to - new upstream - * debian/patches/03_embed_libs_from_debian.patch: updated to match - upstream change and removed reference to libgnu-regexp-java - * debian/ant.properties: removed reference to libgnu-regexp-java and - commented maven-plugin-api property - * debian/rules: - - removed reference to libgnu-regexp-java and ams3-util - - removed clean comments - - -- Michael Koch <[email protected]> Wed, 20 Feb 2008 21:11:44 +0100 - -jarjar (1.0~rc3.dfsg.1-1) unstable; urgency=low - - * Initial Release (closes: #417591). - - -- Arnaud Vandyck <[email protected]> Fri, 18 May 2007 13:09:08 +0200 Copied: tags/jarjar/1.1-1/debian/changelog (from rev 14774, trunk/jarjar/debian/changelog) =================================================================== --- tags/jarjar/1.1-1/debian/changelog (rev 0) +++ tags/jarjar/1.1-1/debian/changelog 2011-09-08 20:33:57 UTC (rev 14775) @@ -0,0 +1,129 @@ +jarjar (1.1-1) unstable; urgency=low + + * Team upload + * New upstream release. + * Change debian/watch to point to upstream's svn repo. + * Refresh patches. + * Remove Arnaud from Uploaders list. + * Remove Java runtime from Depends. + * Update Standards-Version: 3.9.2. + + -- Torsten Werner <[email protected]> Thu, 08 Sep 2011 22:30:41 +0200 + +jarjar (1.0+dfsg-2) unstable; urgency=low + + [ Torsten Werner ] + * Convert patches to dep3 format. + * Add a patch to cast null to java.io.File. (Closes: #571340) + * Add a patch to remove asm-commons from final jar file. + * Convert package to source format 3.0. + + [ Thierry Carrez ] + * debian/control: Minimal runtime dependency set to java2-runtime-headless + + [ Niels Thykier ] + * debian/control: Added java5 and java6 as alternatives. + + -- Torsten Werner <[email protected]> Sun, 28 Feb 2010 12:47:45 +0100 + +jarjar (1.0+dfsg-1) unstable; urgency=low + + [ Michael Koch ] + * debian/watch: updated to track binary jar file instead + of source release. + + [ 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 <[email protected]> Mon, 14 Sep 2009 21:39:52 +0200 + +jarjar (1.0~rc8+dfsg-1) unstable; urgency=low + + * New upstream release. + * Added myself to uploaders. + * Renamed and updated 02_dont_build_JarJarMojo.patch to + 02_fix_build_xml.patch. + * Stopped using Build-Depends-Indep since buildds and the policy + does not agree on when it should used. + * Changed section to java. + * Replaced gcj-compat with the default javas packages. + (Closes: #526279) + * Bumped to Standard-Version 3.8.3. + - Link to Apache-2.0 license rather than quoting it. + * Bumped Debhelper to version 7. + * Added a README.source to briefly explain that files have been + excluded from the orignal upstream source. + * Created an get-orig-source rule to fetch and create the + orig.tar.gz. + + -- Niels Thykier <[email protected]> Sat, 12 Sep 2009 19:26:57 +0200 + +jarjar (1.0~rc7.dfsg-2) unstable; urgency=low + + * Fix lists in long descriptions. Closes: #480324 + + -- Michael Koch <[email protected]> Fri, 09 May 2008 17:13:34 -0100 + +jarjar (1.0~rc7.dfsg-1) unstable; urgency=low + + * New upstream version. + * Updated watch file again to check for source download. + + -- Michael Koch <[email protected]> Sat, 22 Mar 2008 17:23:24 +0100 + +jarjar (1.0~rc6.dfsg-1) unstable; urgency=low + + [ Michael Koch ] + * Rewrote debian/copyright as new version is licensed under + Apache License 2.0. + * Updated watch file to match upstream version correctly. + * Moved debhelper and cdbs from Build-Depends-Indep to Build-Depends. + * Updated debhelper level to 5. + * Added debian/patches/05_gnu_regexp.patch to work around limitation in + gnu.regexp. + * Removed some cruft from debian/rules. + * Added Homepage, Vcs-Svn and Vcs-Browser fields. + * Added myself to Uploaders. + + [ Arnaud Vandyck ] + * New upstream. + * debian/control: + - Standards-Version: updated to 3.7.3, no change. + - Build-Depends-Indep: removed libgnu-regexp-java. + * debian/patches/19_TextDepHandler.patch, + debian/patches/22_util_StandaloneJarProcessor.patch, + debian/patches/23_KeepProcessor.patch, + debian/patches/10_DepFindVisitor.patch, + debian/patches/21_util_RemappingClassTransformer.patch, + debian/patches/14_PackageRemapper.patch, + debian/patches/12_JarJarTask.patch, + debian/patches/17_ResourceProcessor.patch, + debian/patches/20_util_ClassHeaderReader.patch, + debian/patches/01_build_classpath.patch, + debian/patches/18_StringReader.patch, + debian/patches/15_util_JarTransformerChain.patch, + debian/patches/24_util_GetNameClassWriter.patch, + debian/patches/13_ManifestProcessor.patch, + debian/patches/11_DepFind.patch, + debian/patches/10_AbstractDepHandler_warning.patch: removed + * debian/patches/04_path_build.patch: added + * debian/libjarjar-java.install, debian/libjarjar-java.links: updated to + new upstream + * debian/patches/03_embed_libs_from_debian.patch: updated to match + upstream change and removed reference to libgnu-regexp-java + * debian/ant.properties: removed reference to libgnu-regexp-java and + commented maven-plugin-api property + * debian/rules: + - removed reference to libgnu-regexp-java and ams3-util + - removed clean comments + + -- Michael Koch <[email protected]> Wed, 20 Feb 2008 21:11:44 +0100 + +jarjar (1.0~rc3.dfsg.1-1) unstable; urgency=low + + * Initial Release (closes: #417591). + + -- Arnaud Vandyck <[email protected]> Fri, 18 May 2007 13:09:08 +0200 Deleted: tags/jarjar/1.1-1/debian/control =================================================================== --- trunk/jarjar/debian/control 2011-09-08 19:49:55 UTC (rev 14772) +++ tags/jarjar/1.1-1/debian/control 2011-09-08 20:33:57 UTC (rev 14775) @@ -1,41 +0,0 @@ -Source: jarjar -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]>, - Niels Thykier <[email protected]> -Build-Depends: debhelper (>= 7), cdbs, ant, libasm3-java, default-jdk -Standards-Version: 3.8.3 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jarjar -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jarjar -Homepage: http://code.google.com/p/jarjar/ - -Package: libjarjar-java -Architecture: all -Depends: default-jre-headless | java2-runtime-headless | - java5-runtime-headless | java6-runtime-headless, - ${misc:Depends} -Description: repackage third-party jars - Utility that makes it easy to repackage Java libraries and embed them - into your own distribution. This is useful for two reasons: - . - - You can easily ship a single jar file with no external dependencies. - - You can avoid problems where your library depends on a specific - version of a library, which may conflict with the dependencies of - another library. - -Package: libjarjar-java-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Suggests: libjarjar-java -Description: repackage third-party jars - documentation - Utility that makes it easy to repackage Java libraries and embed them - into your own distribution. This is useful for two reasons: - . - - You can easily ship a single jar file with no external dependencies. - - You can avoid problems where your library depends on a specific - version of a library, which may conflict with the dependencies of - another library. - . - This package includes the documentation. Copied: tags/jarjar/1.1-1/debian/control (from rev 14774, trunk/jarjar/debian/control) =================================================================== --- tags/jarjar/1.1-1/debian/control (rev 0) +++ tags/jarjar/1.1-1/debian/control 2011-09-08 20:33:57 UTC (rev 14775) @@ -0,0 +1,38 @@ +Source: jarjar +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Michael Koch <[email protected]>, Niels Thykier <[email protected]> +Build-Depends: debhelper (>= 7), cdbs, ant, libasm3-java, default-jdk +Standards-Version: 3.9.2 +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jarjar +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jarjar +Homepage: http://code.google.com/p/jarjar/ + +Package: libjarjar-java +Architecture: all +Depends: ${misc:Depends} +Description: repackage third-party jars + Utility that makes it easy to repackage Java libraries and embed them + into your own distribution. This is useful for two reasons: + . + - You can easily ship a single jar file with no external dependencies. + - You can avoid problems where your library depends on a specific + version of a library, which may conflict with the dependencies of + another library. + +Package: libjarjar-java-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Suggests: libjarjar-java +Description: repackage third-party jars - documentation + Utility that makes it easy to repackage Java libraries and embed them + into your own distribution. This is useful for two reasons: + . + - You can easily ship a single jar file with no external dependencies. + - You can avoid problems where your library depends on a specific + version of a library, which may conflict with the dependencies of + another library. + . + This package includes the documentation. Deleted: tags/jarjar/1.1-1/debian/fetch.sh =================================================================== --- trunk/jarjar/debian/fetch.sh 2011-09-08 19:49:55 UTC (rev 14772) +++ tags/jarjar/1.1-1/debian/fetch.sh 2011-09-08 20:33:57 UTC (rev 14775) @@ -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 - - Copied: tags/jarjar/1.1-1/debian/orig-tar.sh (from rev 14773, trunk/jarjar/debian/orig-tar.sh) =================================================================== --- tags/jarjar/1.1-1/debian/orig-tar.sh (rev 0) +++ tags/jarjar/1.1-1/debian/orig-tar.sh 2011-09-08 20:33:57 UTC (rev 14775) @@ -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 Deleted: tags/jarjar/1.1-1/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) +++ tags/jarjar/1.1-1/debian/patches/0001-fix-build.xml.patch 2011-09-08 20:33:57 UTC (rev 14775) @@ -1,25 +0,0 @@ -From: Arnaud Vandyck <[email protected]> -Date: Sun, 28 Feb 2010 12:42:05 +0100 -Subject: [PATCH] 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 ---- a/build.xml -+++ b/build.xml -@@ -47,8 +47,9 @@ - <fileset dir="src/@{module}" excludes="**/*.java"/> - </copy> - <javac srcdir="src/@{module}" destdir="build/@{module}" -- source="${compile.source}" -- target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}" -+ source="1.5" -+ target="1.5" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}" -+ excludes="com/tonicsystems/jarjar/JarJarMojo.java" - debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}"> - <classpath refid="@{refid}"/> - <compilerarg value="-Xlint"/> --- Copied: tags/jarjar/1.1-1/debian/patches/0001-fix-build.xml.patch (from rev 14773, trunk/jarjar/debian/patches/0001-fix-build.xml.patch) =================================================================== --- tags/jarjar/1.1-1/debian/patches/0001-fix-build.xml.patch (rev 0) +++ tags/jarjar/1.1-1/debian/patches/0001-fix-build.xml.patch 2011-09-08 20:33:57 UTC (rev 14775) @@ -0,0 +1,25 @@ +From: Arnaud Vandyck <[email protected]> +Date: Sun, 28 Feb 2010 12:42:05 +0100 +Subject: fix build.xml + +--- + build.xml | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/build.xml b/build.xml +index dbe5b1f..d0fca14 100644 +--- a/build.xml ++++ b/build.xml +@@ -47,8 +47,9 @@ + <fileset dir="src/@{module}" excludes="**/*.java"/> + </copy> + <javac srcdir="src/@{module}" destdir="build/@{module}" +- source="${compile.source}" +- target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}" ++ source="1.5" ++ target="1.5" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}" ++ excludes="com/tonicsystems/jarjar/JarJarMojo.java" + debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}"> + <classpath refid="@{refid}"/> + <compilerarg value="-Xlint"/> +-- Deleted: tags/jarjar/1.1-1/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) +++ tags/jarjar/1.1-1/debian/patches/0002-embed-libs-from-debian.patch 2011-09-08 20:33:57 UTC (rev 14775) @@ -1,24 +0,0 @@ -From: Arnaud Vandyck <[email protected]> -Date: Sun, 28 Feb 2010 12:42:06 +0100 -Subject: [PATCH] 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 ---- 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="${asm.jar}"/> -+ <zipfileset src="${asm-commons.jar}"> - <include name="org/objectweb/asm/commons/EmptyVisitor.class"/> - <include name="org/objectweb/asm/commons/Remap*.class"/> - <include name="org/objectweb/asm/commons/LocalVariablesSorter.class"/> --- Copied: tags/jarjar/1.1-1/debian/patches/0002-embed-libs-from-debian.patch (from rev 14773, trunk/jarjar/debian/patches/0002-embed-libs-from-debian.patch) =================================================================== --- tags/jarjar/1.1-1/debian/patches/0002-embed-libs-from-debian.patch (rev 0) +++ tags/jarjar/1.1-1/debian/patches/0002-embed-libs-from-debian.patch 2011-09-08 20:33:57 UTC (rev 14775) @@ -0,0 +1,24 @@ +From: Arnaud Vandyck <[email protected]> +Date: Sun, 28 Feb 2010 12:42:06 +0100 +Subject: embed libs from debian + +--- + build.xml | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build.xml b/build.xml +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.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"/> + <include name="org/objectweb/asm/commons/Remap*.class"/> + <include name="org/objectweb/asm/commons/LocalVariablesSorter.class"/> +-- Deleted: tags/jarjar/1.1-1/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) +++ tags/jarjar/1.1-1/debian/patches/0003-fix-path-in-build.xml.patch 2011-09-08 20:33:57 UTC (rev 14775) @@ -1,24 +0,0 @@ -From: Arnaud Vandyck <[email protected]> -Date: Sun, 28 Feb 2010 12:42:07 +0100 -Subject: [PATCH] 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 ---- a/build.xml -+++ b/build.xml -@@ -25,7 +25,9 @@ - <echo>bootclasspath ${compile.bootclasspath}</echo> - <tstamp/> - <path id="path.build"> -- <fileset dir="lib" includes="**/*.jar"/> -+ <pathelement path="${asm.jar}" /> -+ <pathelement path="${asm-commons.jar}" /> -+ <pathelement path="${gnu-regexp.jar}" /> - </path> - <path id="path.run"> - <path refid="path.build"/> --- Copied: tags/jarjar/1.1-1/debian/patches/0003-fix-path-in-build.xml.patch (from rev 14773, trunk/jarjar/debian/patches/0003-fix-path-in-build.xml.patch) =================================================================== --- tags/jarjar/1.1-1/debian/patches/0003-fix-path-in-build.xml.patch (rev 0) +++ tags/jarjar/1.1-1/debian/patches/0003-fix-path-in-build.xml.patch 2011-09-08 20:33:57 UTC (rev 14775) @@ -0,0 +1,24 @@ +From: Arnaud Vandyck <[email protected]> +Date: Sun, 28 Feb 2010 12:42:07 +0100 +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 ea5707e..bbae4da 100644 +--- a/build.xml ++++ b/build.xml +@@ -25,7 +25,9 @@ + <echo>bootclasspath ${compile.bootclasspath}</echo> + <tstamp/> + <path id="path.build"> +- <fileset dir="lib" includes="**/*.jar"/> ++ <pathelement path="${asm.jar}" /> ++ <pathelement path="${asm-commons.jar}" /> ++ <pathelement path="${gnu-regexp.jar}" /> + </path> + <path id="path.run"> + <path refid="path.build"/> +-- Deleted: tags/jarjar/1.1-1/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) +++ tags/jarjar/1.1-1/debian/patches/0004-support-gnu-regexp.patch 2011-09-08 20:33:57 UTC (rev 14775) @@ -1,22 +0,0 @@ -From: Arnaud Vandyck <[email protected]> -Date: Sun, 28 Feb 2010 12:42:08 +0100 -Subject: [PATCH] support gnu-regexp - ---- - .../com/tonicsystems/jarjar/PackageRemapper.java | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/main/com/tonicsystems/jarjar/PackageRemapper.java b/src/main/com/tonicsystems/jarjar/PackageRemapper.java -index 3b7e5da..6b71a7d 100644 ---- a/src/main/com/tonicsystems/jarjar/PackageRemapper.java -+++ b/src/main/com/tonicsystems/jarjar/PackageRemapper.java -@@ -28,7 +28,7 @@ class PackageRemapper extends Remapper - private static final String RESOURCE_SUFFIX = "RESOURCE"; - - private static final Pattern ARRAY_FOR_NAME_PATTERN -- = Pattern.compile("\\[L[\\p{javaJavaIdentifierPart}\\.]+?;"); -+ = Pattern.compile("\\[L\\p{Alpha}[\\p{Alnum}\\.]*?;"); - - private final List<Wildcard> wildcards; - private final Map<String, String> typeCache = new HashMap<String, String>(); --- Copied: tags/jarjar/1.1-1/debian/patches/0004-support-gnu-regexp.patch (from rev 14773, trunk/jarjar/debian/patches/0004-support-gnu-regexp.patch) =================================================================== --- tags/jarjar/1.1-1/debian/patches/0004-support-gnu-regexp.patch (rev 0) +++ tags/jarjar/1.1-1/debian/patches/0004-support-gnu-regexp.patch 2011-09-08 20:33:57 UTC (rev 14775) @@ -0,0 +1,22 @@ +From: Arnaud Vandyck <[email protected]> +Date: Sun, 28 Feb 2010 12:42:08 +0100 +Subject: support gnu-regexp + +--- + .../com/tonicsystems/jarjar/PackageRemapper.java | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/main/com/tonicsystems/jarjar/PackageRemapper.java b/src/main/com/tonicsystems/jarjar/PackageRemapper.java +index 3b7e5da..6b71a7d 100644 +--- a/src/main/com/tonicsystems/jarjar/PackageRemapper.java ++++ b/src/main/com/tonicsystems/jarjar/PackageRemapper.java +@@ -28,7 +28,7 @@ class PackageRemapper extends Remapper + private static final String RESOURCE_SUFFIX = "RESOURCE"; + + private static final Pattern ARRAY_FOR_NAME_PATTERN +- = Pattern.compile("\\[L[\\p{javaJavaIdentifierPart}\\.]+?;"); ++ = Pattern.compile("\\[L\\p{Alpha}[\\p{Alnum}\\.]*?;"); + + private final List<Wildcard> wildcards; + private final Map<String, String> typeCache = new HashMap<String, String>(); +-- Deleted: tags/jarjar/1.1-1/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) +++ tags/jarjar/1.1-1/debian/patches/0005-cast-null-to-java.io.File.patch 2011-09-08 20:33:57 UTC (rev 14775) @@ -1,22 +0,0 @@ -From: Torsten Werner <[email protected]> -Date: Sun, 28 Feb 2010 12:45:07 +0100 -Subject: [PATCH] cast null to java.io.File - ---- - .../tonicsystems/jarjar/util/AntJarProcessor.java | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java b/src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java -index 449fdb6..55d7f5d 100644 ---- a/src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java -+++ b/src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java -@@ -84,7 +84,7 @@ abstract public class AntJarProcessor extends Jar - String dir = file.substring(0, slash); - if (dirs.add(dir)) { - addParentDirs(dir, zOut); -- super.zipDir(null, zOut, dir + "/", ZipFileSet.DEFAULT_DIR_MODE, JAR_MARKER); -+ super.zipDir((java.io.File) null, zOut, dir + "/", ZipFileSet.DEFAULT_DIR_MODE, JAR_MARKER); - } - } - } --- Copied: tags/jarjar/1.1-1/debian/patches/0005-cast-null-to-java.io.File.patch (from rev 14773, trunk/jarjar/debian/patches/0005-cast-null-to-java.io.File.patch) =================================================================== --- tags/jarjar/1.1-1/debian/patches/0005-cast-null-to-java.io.File.patch (rev 0) +++ tags/jarjar/1.1-1/debian/patches/0005-cast-null-to-java.io.File.patch 2011-09-08 20:33:57 UTC (rev 14775) @@ -0,0 +1,22 @@ +From: Torsten Werner <[email protected]> +Date: Sun, 28 Feb 2010 12:45:07 +0100 +Subject: cast null to java.io.File + +--- + .../tonicsystems/jarjar/util/AntJarProcessor.java | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java b/src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java +index 449fdb6..55d7f5d 100644 +--- a/src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java ++++ b/src/main/com/tonicsystems/jarjar/util/AntJarProcessor.java +@@ -84,7 +84,7 @@ abstract public class AntJarProcessor extends Jar + String dir = file.substring(0, slash); + if (dirs.add(dir)) { + addParentDirs(dir, zOut); +- super.zipDir(null, zOut, dir + "/", ZipFileSet.DEFAULT_DIR_MODE, JAR_MARKER); ++ super.zipDir((java.io.File) null, zOut, dir + "/", ZipFileSet.DEFAULT_DIR_MODE, JAR_MARKER); + } + } + } +-- Deleted: tags/jarjar/1.1-1/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) +++ tags/jarjar/1.1-1/debian/patches/0006-remove-asm-commons-from-final-jar.patch 2011-09-08 20:33:57 UTC (rev 14775) @@ -1,25 +0,0 @@ -From: Torsten Werner <[email protected]> -Date: Sun, 28 Feb 2010 12:45:45 +0100 -Subject: [PATCH] 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 ---- a/build.xml -+++ b/build.xml -@@ -79,11 +79,6 @@ - <jarjar jarfile="${jarfile}"> - <fileset dir="build/main"/> - <zipfileset src="${asm.jar}"/> -- <zipfileset src="${asm-commons.jar}"> -- <include name="org/objectweb/asm/commons/EmptyVisitor.class"/> -- <include name="org/objectweb/asm/commons/Remap*.class"/> -- <include name="org/objectweb/asm/commons/LocalVariablesSorter.class"/> -- </zipfileset> - <keep pattern="com.tonicsystems.jarjar.Main"/> - <keep pattern="com.tonicsystems.jarjar.JarJarTask"/> - <rule pattern="com.tonicsystems.jarjar.util.**" result="com.tonicsystems.jarjar.ext_util.@1"/> --- Copied: tags/jarjar/1.1-1/debian/patches/0006-remove-asm-commons-from-final-jar.patch (from rev 14773, trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch) =================================================================== --- tags/jarjar/1.1-1/debian/patches/0006-remove-asm-commons-from-final-jar.patch (rev 0) +++ tags/jarjar/1.1-1/debian/patches/0006-remove-asm-commons-from-final-jar.patch 2011-09-08 20:33:57 UTC (rev 14775) @@ -0,0 +1,25 @@ +From: Torsten Werner <[email protected]> +Date: Sun, 28 Feb 2010 12:45:45 +0100 +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 bbae4da..160e9ee 100644 +--- a/build.xml ++++ b/build.xml +@@ -79,11 +79,6 @@ + <jarjar jarfile="${jarfile}"> + <fileset dir="build/main"/> + <zipfileset src="${asm.jar}"/> +- <zipfileset src="${asm-commons.jar}"> +- <include name="org/objectweb/asm/commons/EmptyVisitor.class"/> +- <include name="org/objectweb/asm/commons/Remap*.class"/> +- <include name="org/objectweb/asm/commons/LocalVariablesSorter.class"/> +- </zipfileset> + <keep pattern="com.tonicsystems.jarjar.Main"/> + <keep pattern="com.tonicsystems.jarjar.JarJarTask"/> + <rule pattern="com.tonicsystems.jarjar.util.**" result="com.tonicsystems.jarjar.ext_util.@1"/> +-- Deleted: tags/jarjar/1.1-1/debian/rules =================================================================== --- trunk/jarjar/debian/rules 2011-09-08 19:49:55 UTC (rev 14772) +++ tags/jarjar/1.1-1/debian/rules 2011-09-08 20:33:57 UTC (rev 14775) @@ -1,20 +0,0 @@ -#!/usr/bin/make -f - -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -VERSION=`echo $(DEB_UPSTREAM_VERSION) | sed -e s/~// | sed -e s/\.dfsg//` - -JAVA_HOME := /usr/lib/jvm/default-java - -DEB_JARS := asm3 asm3-commons -DEB_ANT_BUILD_TARGET := jar javadoc - -install/libjarjar-java:: - install -m 644 -D dist/jarjar-*.jar debian//libjarjar-java/usr/share/java/jarjar-$(VERSION).jar - 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) Copied: tags/jarjar/1.1-1/debian/rules (from rev 14773, trunk/jarjar/debian/rules) =================================================================== --- tags/jarjar/1.1-1/debian/rules (rev 0) +++ tags/jarjar/1.1-1/debian/rules 2011-09-08 20:33:57 UTC (rev 14775) @@ -0,0 +1,18 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/ant.mk + +VERSION=`echo $(DEB_UPSTREAM_VERSION) | sed -e s/~// | sed -e s/\.dfsg//` + +JAVA_HOME := /usr/lib/jvm/default-java + +DEB_JARS := asm3 asm3-commons +DEB_ANT_BUILD_TARGET := jar javadoc + +install/libjarjar-java:: + install -m 644 -D dist/jarjar-*.jar debian//libjarjar-java/usr/share/java/jarjar-$(VERSION).jar + dh_link -plibjarjar-java /usr/share/java/jarjar-$(VERSION).jar /usr/share/java/jarjar.jar + +get-orig-source: + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download Deleted: tags/jarjar/1.1-1/debian/watch =================================================================== --- trunk/jarjar/debian/watch 2011-09-08 19:49:55 UTC (rev 14772) +++ tags/jarjar/1.1-1/debian/watch 2011-09-08 20:33:57 UTC (rev 14775) @@ -1,3 +0,0 @@ -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 Copied: tags/jarjar/1.1-1/debian/watch (from rev 14773, trunk/jarjar/debian/watch) =================================================================== --- tags/jarjar/1.1-1/debian/watch (rev 0) +++ tags/jarjar/1.1-1/debian/watch 2011-09-08 20:33:57 UTC (rev 14775) @@ -0,0 +1,4 @@ +version=3 + +opts=dversionmangle=s/[+.]dfsg//,uversionmangle=s/(rc\d+)/~$1/ \ + 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
