Bug#646600: jarjar: Jarjar jar file must include contents from asm3-commons.jar

[James Page]

Package: jarjar
Version: 1.1-1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256


In Ubuntu, the attached patch was applied to achieve the following:

  * 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.

libasm3-java now ships correctly separated jar files; jarjar needs
artifacts from asm3 and asm3-commons (this was originally satisfied
through asm3.jar which was asm3-all) - dropping this patch restores
this file for remapping in the final jarjar jar file.

Note that libjarjar-java in Debian is OK as it was built with an earlier 
version of libasm3-java.

Thanks for considering the patch.


- -- System Information:
Debian Release: wheezy/sid
  APT prefers oneiric-updates
  APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric-proposed'), (500, 'oneiric')
Architecture: amd64 (x86_64)

Kernel: Linux 3.0.0-12-generic (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJOpsvdAAoJEL/srsug59jD4J4QAKUsrChVjoQCPpJYKByLYIJO
GudYFN7uQR3mF7hrwk9FGgfI3PTCcTH5N+Zcl9LRXh3uch4zxRYdPMSQWrGPZ5Kp
64FzQwM/tKDAShB1QBEtmuwqt+3uBCi6drKOw89y6vmd4/pwJkR6fNxuxU0MF+uB
673+BpDvzcuWUIRbAucrWoduS+rZEUlkfPYtfRmoa8skKXKwj8vjhwBmJ68wDXlW
CGaICRtyP7a9STAg3iPaYLOqgWk3RDGkCpHE583pNb3M0pA/mRB2fes0uoMYpA8m
0UNn/kMCjzux4wG/1C+HzKw7/5vQB9/NoXe2jSHFMEPI/kwKdB0xzN25VVi0s8Qp
ND2BOsOkHoFFGigJBESIwy+Hkiyf1bccQ0aBTDFAPCWCT4BC7le6TMb5dsexbvF8
pxTXA3CMA+uFzrlpp0YwfSWC/HzdtICd+R4uTXTg0onCazkpe+v/eFDFt21704GY
ww8IxSN2rYXQvQOANlFOlIHJoMRdpTXqdQzqEgW4DUw11y36hGx22y0Bk+1cs14s
sUD9MD1/vZwPeweNh0vfRm3vGMIpIBnnje7F3JpFIJWRl0eMUmF+vfDsFpZQXm7N
gQY5/Bq1HuW916z4cbm3a5EzTVceywjvt3DHDDO782MdxsLAY6rQn8znxvTGwJ02
9pYIi+nxpK1epqnY02Md
=rWl+
-----END PGP SIGNATURE-----
-------------- next part --------------
=== removed file 'debian/patches/0006-remove-asm-commons-from-final-jar.patch'
--- debian/patches/0006-remove-asm-commons-from-final-jar.patch	2011-09-08 22:30:41 +0000
+++ debian/patches/0006-remove-asm-commons-from-final-jar.patch	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-From: Torsten Werner <twerner at 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. at 1"/>
--- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-02-28 12:47:45 +0000
+++ debian/patches/series	2011-10-25 14:29:30 +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