On 2012-07-19 10:18, Niels Thykier wrote: > Package: release.debian.org > Severity: normal > User: release.debian....@packages.debian.org > Usertags: unblock > > Please unblock package jarjar, which fixes the RC bug #646600. The > bug is that if you rebuild jarjar in SID it will construct an > incomplete Java library. > > This is because it embeds a part of libasm3-java inself during build > (I have filed a bug for that) and some of that moved to another Jar > file breaking. > > I also took the liberity of removing a MIA uploader. > > unblock jarjar/1.1-3 > > ~Niels > >
... and the debdiff. ~Niels
changelog | 19 ++++++++++++++ control | 2 - patches/0006-remove-asm-commons-from-final-jar.patch | 25 ------------------- patches/series | 1 4 files changed, 20 insertions(+), 27 deletions(-) diff -Nru jarjar-1.1/debian/changelog jarjar-1.1/debian/changelog --- jarjar-1.1/debian/changelog 2011-09-08 20:31:33.000000000 +0000 +++ jarjar-1.1/debian/changelog 2012-07-15 11:19:14.000000000 +0000 @@ -1,3 +1,22 @@ +jarjar (1.1-3) unstable; urgency=low + + * Rember to actually remove Michael Koch from uploaders. + + -- Niels Thykier <ni...@thykier.net> Sun, 15 Jul 2012 13:19:13 +0200 + +jarjar (1.1-2) unstable; urgency=low + + [ James Page ] + * Drop debian/patches/0006-remove-asm-commons-from-final-jar.patch: + libasm3-java now ships correctly separated 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 <ni...@thykier.net> Sun, 15 Jul 2012 12:42:56 +0200 + jarjar (1.1-1) unstable; urgency=low * Team upload diff -Nru jarjar-1.1/debian/control jarjar-1.1/debian/control --- jarjar-1.1/debian/control 2011-09-08 20:31:33.000000000 +0000 +++ jarjar-1.1/debian/control 2012-07-15 11:18:46.000000000 +0000 @@ -2,7 +2,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org> -Uploaders: Michael Koch <konque...@gmx.de>, Niels Thykier <ni...@thykier.net> +Uploaders: Niels Thykier <ni...@thykier.net> 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 diff -Nru jarjar-1.1/debian/patches/0006-remove-asm-commons-from-final-jar.patch jarjar-1.1/debian/patches/0006-remove-asm-commons-from-final-jar.patch --- jarjar-1.1/debian/patches/0006-remove-asm-commons-from-final-jar.patch 2011-09-08 20:26:25.000000000 +0000 +++ jarjar-1.1/debian/patches/0006-remove-asm-commons-from-final-jar.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -From: Torsten Werner <twer...@debian.org> -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"/> --- diff -Nru jarjar-1.1/debian/patches/series jarjar-1.1/debian/patches/series --- jarjar-1.1/debian/patches/series 2010-02-28 11:52:52.000000000 +0000 +++ jarjar-1.1/debian/patches/series 2012-07-15 10:36:37.000000000 +0000 @@ -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