[pkg-java] r11761 - in trunk/jarjar/debian: . patches source
Torsten Werner
twerner at alioth.debian.org
Sun Feb 28 11:52:54 UTC 2010
Author: twerner
Date: 2010-02-28 11:52:52 +0000 (Sun, 28 Feb 2010)
New Revision: 11761
Added:
trunk/jarjar/debian/patches/0001-fix-build.xml.patch
trunk/jarjar/debian/patches/0002-embed-libs-from-debian.patch
trunk/jarjar/debian/patches/0003-fix-path-in-build.xml.patch
trunk/jarjar/debian/patches/0004-support-gnu-regexp.patch
trunk/jarjar/debian/patches/0005-cast-null-to-java.io.File.patch
trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch
trunk/jarjar/debian/patches/series
trunk/jarjar/debian/source/
trunk/jarjar/debian/source/format
Removed:
trunk/jarjar/debian/patches/02_fix_build_xml.patch
trunk/jarjar/debian/patches/03_embed_libs_from_debian.patch
trunk/jarjar/debian/patches/04_path_build.patch
trunk/jarjar/debian/patches/05_gnu_regexp.patch
Modified:
trunk/jarjar/debian/changelog
trunk/jarjar/debian/rules
Log:
* 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.
Modified: trunk/jarjar/debian/changelog
===================================================================
--- trunk/jarjar/debian/changelog 2010-02-28 10:59:12 UTC (rev 11760)
+++ trunk/jarjar/debian/changelog 2010-02-28 11:52:52 UTC (rev 11761)
@@ -1,12 +1,18 @@
-jarjar (1.0+dfsg-2) UNRELEASED; urgency=low
+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.
- -- Thierry Carrez <thierry.carrez at ubuntu.com> Tue, 10 Nov 2009 12:01:37 +0100
+ -- Torsten Werner <twerner at debian.org> Sun, 28 Feb 2010 12:47:45 +0100
jarjar (1.0+dfsg-1) unstable; urgency=low
Added: trunk/jarjar/debian/patches/0001-fix-build.xml.patch
===================================================================
--- trunk/jarjar/debian/patches/0001-fix-build.xml.patch (rev 0)
+++ trunk/jarjar/debian/patches/0001-fix-build.xml.patch 2010-02-28 11:52:52 UTC (rev 11761)
@@ -0,0 +1,25 @@
+From: Arnaud Vandyck <avdyk at debian.org>
+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"/>
+--
Added: trunk/jarjar/debian/patches/0002-embed-libs-from-debian.patch
===================================================================
--- trunk/jarjar/debian/patches/0002-embed-libs-from-debian.patch (rev 0)
+++ trunk/jarjar/debian/patches/0002-embed-libs-from-debian.patch 2010-02-28 11:52:52 UTC (rev 11761)
@@ -0,0 +1,24 @@
+From: Arnaud Vandyck <avdyk at debian.org>
+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"/>
+--
Added: trunk/jarjar/debian/patches/0003-fix-path-in-build.xml.patch
===================================================================
--- trunk/jarjar/debian/patches/0003-fix-path-in-build.xml.patch (rev 0)
+++ trunk/jarjar/debian/patches/0003-fix-path-in-build.xml.patch 2010-02-28 11:52:52 UTC (rev 11761)
@@ -0,0 +1,24 @@
+From: Arnaud Vandyck <avdyk at debian.org>
+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"/>
+--
Added: trunk/jarjar/debian/patches/0004-support-gnu-regexp.patch
===================================================================
--- trunk/jarjar/debian/patches/0004-support-gnu-regexp.patch (rev 0)
+++ trunk/jarjar/debian/patches/0004-support-gnu-regexp.patch 2010-02-28 11:52:52 UTC (rev 11761)
@@ -0,0 +1,22 @@
+From: Arnaud Vandyck <avdyk at debian.org>
+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>();
+--
Added: trunk/jarjar/debian/patches/0005-cast-null-to-java.io.File.patch
===================================================================
--- trunk/jarjar/debian/patches/0005-cast-null-to-java.io.File.patch (rev 0)
+++ trunk/jarjar/debian/patches/0005-cast-null-to-java.io.File.patch 2010-02-28 11:52:52 UTC (rev 11761)
@@ -0,0 +1,22 @@
+From: Torsten Werner <twerner at debian.org>
+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);
+ }
+ }
+ }
+--
Added: trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch
===================================================================
--- trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch (rev 0)
+++ trunk/jarjar/debian/patches/0006-remove-asm-commons-from-final-jar.patch 2010-02-28 11:52:52 UTC (rev 11761)
@@ -0,0 +1,25 @@
+From: Torsten Werner <twerner at debian.org>
+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. at 1"/>
+--
Deleted: trunk/jarjar/debian/patches/02_fix_build_xml.patch
===================================================================
--- trunk/jarjar/debian/patches/02_fix_build_xml.patch 2010-02-28 10:59:12 UTC (rev 11760)
+++ trunk/jarjar/debian/patches/02_fix_build_xml.patch 2010-02-28 11:52:52 UTC (rev 11761)
@@ -1,14 +0,0 @@
---- build.xml.orig 2009-09-12 18:05:14.053030997 +0200
-+++ build.xml 2009-09-12 18:06:01.346009724 +0200
-@@ -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: trunk/jarjar/debian/patches/03_embed_libs_from_debian.patch
===================================================================
--- trunk/jarjar/debian/patches/03_embed_libs_from_debian.patch 2010-02-28 10:59:12 UTC (rev 11760)
+++ trunk/jarjar/debian/patches/03_embed_libs_from_debian.patch 2010-02-28 11:52:52 UTC (rev 11761)
@@ -1,13 +0,0 @@
---- build.xml~ 2008-01-19 18:25:48.000000000 +0100
-+++ build.xml 2008-01-19 18:27:18.000000000 +0100
-@@ -75,8 +75,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"/>
Deleted: trunk/jarjar/debian/patches/04_path_build.patch
===================================================================
--- trunk/jarjar/debian/patches/04_path_build.patch 2010-02-28 10:59:12 UTC (rev 11760)
+++ trunk/jarjar/debian/patches/04_path_build.patch 2010-02-28 11:52:52 UTC (rev 11761)
@@ -1,13 +0,0 @@
---- build.xml~ 2008-01-19 16:51:39.000000000 +0100
-+++ build.xml 2008-01-19 16:52:15.000000000 +0100
-@@ -22,7 +22,9 @@
- <target name="init">
- <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: trunk/jarjar/debian/patches/05_gnu_regexp.patch
===================================================================
--- trunk/jarjar/debian/patches/05_gnu_regexp.patch 2010-02-28 10:59:12 UTC (rev 11760)
+++ trunk/jarjar/debian/patches/05_gnu_regexp.patch 2010-02-28 11:52:52 UTC (rev 11761)
@@ -1,11 +0,0 @@
---- jarjar-1.0~rc6.dfsg.orig/src/main/com/tonicsystems/jarjar/PackageRemapper.java
-+++ jarjar-1.0~rc6.dfsg/src/main/com/tonicsystems/jarjar/PackageRemapper.java
-@@ -28,7 +28,7 @@
- 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 Wildcard[] wildcards;
- private final HashMap typeCache = new HashMap();
Added: trunk/jarjar/debian/patches/series
===================================================================
--- trunk/jarjar/debian/patches/series (rev 0)
+++ trunk/jarjar/debian/patches/series 2010-02-28 11:52:52 UTC (rev 11761)
@@ -0,0 +1,6 @@
+0001-fix-build.xml.patch
+0002-embed-libs-from-debian.patch
+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
Modified: trunk/jarjar/debian/rules
===================================================================
--- trunk/jarjar/debian/rules 2010-02-28 10:59:12 UTC (rev 11760)
+++ trunk/jarjar/debian/rules 2010-02-28 11:52:52 UTC (rev 11761)
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
VERSION=`echo $(DEB_UPSTREAM_VERSION) | sed -e s/~// | sed -e s/\.dfsg//`
Added: trunk/jarjar/debian/source/format
===================================================================
--- trunk/jarjar/debian/source/format (rev 0)
+++ trunk/jarjar/debian/source/format 2010-02-28 11:52:52 UTC (rev 11761)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list