Author: nthykier Date: 2012-07-15 10:36:37 +0000 (Sun, 15 Jul 2012) New Revision: 16237
Removed: trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch Modified: trunk/jarjar/debian/changelog trunk/jarjar/debian/patches/series Log: Prepare -2 upload Modified: trunk/jarjar/debian/changelog =================================================================== --- trunk/jarjar/debian/changelog 2012-07-15 10:30:06 UTC (rev 16236) +++ trunk/jarjar/debian/changelog 2012-07-15 10:36:37 UTC (rev 16237) @@ -1,3 +1,16 @@ +jarjar (1.1-2) UNRELEASED; urgency=low + + [ James Page ] + * Drop debian/patches/0006-remove-asm-commons-from-final-jar.patch: + libasm3-java now ships correctly seperated jar files so asm-commons + must be included. (Closes: #646600) + + [ Niels Thykier ] + * Remove Michael Koch from uploaders. Thanks for your work so far. + (Closes: #654028) + + -- Niels Thykier <[email protected]> Sun, 15 Jul 2012 12:32:58 +0200 + jarjar (1.1-1) unstable; urgency=low * Team upload Deleted: trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch =================================================================== --- trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch 2012-07-15 10:30:06 UTC (rev 16236) +++ trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch 2012-07-15 10:36:37 UTC (rev 16237) @@ -1,25 +0,0 @@ -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"/> --- Modified: trunk/jarjar/debian/patches/series =================================================================== --- trunk/jarjar/debian/patches/series 2012-07-15 10:30:06 UTC (rev 16236) +++ trunk/jarjar/debian/patches/series 2012-07-15 10:36:37 UTC (rev 16237) @@ -3,4 +3,3 @@ 0003-fix-path-in-build.xml.patch 0004-support-gnu-regexp.patch 0005-cast-null-to-java.io.File.patch -0006-remove-asm-commons-from-final-jar.patch _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
