[pkg-java] r16607 - in trunk/jarjar/debian: . patches

[Damien Raude-Morvan]

Author: drazzib
Date: 2013-05-08 11:11:18 +0000 (Wed, 08 May 2013)
New Revision: 16607

Added:
   trunk/jarjar/debian/patches/add_ClassReader_EXPAND_FRAMES.diff
Modified:
   trunk/jarjar/debian/changelog
   trunk/jarjar/debian/control
   trunk/jarjar/debian/patches/series
Log:
* Upload to unstable.
* d/control: Use canonical URL for Vcs-* fields.
* d/patches/add_ClassReader_EXPAND_FRAMES.diff: Add missing
  ClassReader.EXPAND_FRAMES for ASM call (Closes: #644469).

Modified: trunk/jarjar/debian/changelog
===================================================================
--- trunk/jarjar/debian/changelog	2013-05-08 04:49:47 UTC (rev 16606)
+++ trunk/jarjar/debian/changelog	2013-05-08 11:11:18 UTC (rev 16607)
@@ -1,3 +1,12 @@
+jarjar (1.4+svn142-2) unstable; urgency=low
+
+  * Upload to unstable.
+  * d/control: Use canonical URL for Vcs-* fields.
+  * d/patches/add_ClassReader_EXPAND_FRAMES.diff: Add missing
+    ClassReader.EXPAND_FRAMES for ASM call (Closes: #644469).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 07 May 2013 23:29:00 +0200
+
 jarjar (1.4+svn142-1) experimental; urgency=low
 
   * New upstream release.

Modified: trunk/jarjar/debian/control
===================================================================
--- trunk/jarjar/debian/control	2013-05-08 04:49:47 UTC (rev 16606)
+++ trunk/jarjar/debian/control	2013-05-08 11:11:18 UTC (rev 16607)
@@ -6,8 +6,8 @@
            Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, libasm4-java (>= 4.1-2)
 Standards-Version: 3.9.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jarjar
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jarjar
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jarjar
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jarjar
 Homepage: http://code.google.com/p/jarjar/
 
 Package: libjarjar-java

Added: trunk/jarjar/debian/patches/add_ClassReader_EXPAND_FRAMES.diff
===================================================================
--- trunk/jarjar/debian/patches/add_ClassReader_EXPAND_FRAMES.diff	                        (rev 0)
+++ trunk/jarjar/debian/patches/add_ClassReader_EXPAND_FRAMES.diff	2013-05-08 11:11:18 UTC (rev 16607)
@@ -0,0 +1,16 @@
+Description: Resolving dependencies with find, and possibly other tasks, report errors
+ caused by the above missing flag.
+Author: Panayiotis Karabassis <panayk at gmail.com>
+Last-Update: 2011-10-06
+Forwarded: https://code.google.com/p/jarjar/issues/detail?id=6
+--- a/src/main/com/tonicsystems/jarjar/DepFind.java
++++ b/src/main/com/tonicsystems/jarjar/DepFind.java
+@@ -62,7 +62,7 @@
+                 try {
+                   new ClassReader(in).accept(
+                       new DepFindVisitor(classes, entry.getSource(), handler),
+-                      ClassReader.SKIP_DEBUG);
++                      ClassReader.SKIP_DEBUG | ClassReader.EXPAND_FRAMES);
+                 } catch (Exception e) {
+                   System.err.println("Error reading " + entry.getName() + ": " + e.getMessage());
+                 } finally {

Modified: trunk/jarjar/debian/patches/series
===================================================================
--- trunk/jarjar/debian/patches/series	2013-05-08 04:49:47 UTC (rev 16606)
+++ trunk/jarjar/debian/patches/series	2013-05-08 11:11:18 UTC (rev 16607)
@@ -1,3 +1,4 @@
 0001-fix-build.xml.patch
 0002-embed-libs-from-debian.patch
 szzepiq_jar_resources.diff
+add_ClassReader_EXPAND_FRAMES.diff