[pkg-java] r3440 - in trunk/jarjar/debian: . patches
Arnaud Vandyck
avdyk at alioth.debian.org
Fri May 11 14:54:25 UTC 2007
Author: avdyk
Date: 2007-05-11 14:54:24 +0000 (Fri, 11 May 2007)
New Revision: 3440
Added:
trunk/jarjar/debian/patches/02_dont_build_JarJarMojo.patch
trunk/jarjar/debian/patches/03_embed_libs_from_debian.patch
trunk/jarjar/debian/patches/10_AbstractDepHandler_warning.patch
trunk/jarjar/debian/patches/10_DepFindVisitor.patch
trunk/jarjar/debian/patches/11_DepFind.patch
trunk/jarjar/debian/patches/12_JarJarTask.patch
trunk/jarjar/debian/patches/13_ManifestProcessor.patch
trunk/jarjar/debian/patches/14_PackageRemapper.patch
trunk/jarjar/debian/patches/15_util_JarTransformerChain.patch
trunk/jarjar/debian/patches/17_ResourceProcessor.patch
trunk/jarjar/debian/patches/18_StringReader.patch
trunk/jarjar/debian/patches/19_TextDepHandler.patch
trunk/jarjar/debian/patches/20_util_ClassHeaderReader.patch
trunk/jarjar/debian/patches/21_util_RemappingClassTransformer.patch
trunk/jarjar/debian/patches/22_util_StandaloneJarProcessor.patch
trunk/jarjar/debian/patches/23_KeepProcessor.patch
trunk/jarjar/debian/patches/24_util_GetNameClassWriter.patch
Modified:
trunk/jarjar/debian/ant.properties
trunk/jarjar/debian/changelog
trunk/jarjar/debian/rules
Log:
it builds...
Modified: trunk/jarjar/debian/ant.properties
===================================================================
--- trunk/jarjar/debian/ant.properties 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/ant.properties 2007-05-11 14:54:24 UTC (rev 3440)
@@ -1,6 +1,8 @@
-asm-commons.jar /usr/share/java/asm2-commons-2.2.3.jar
-asm.jar /usr/share/java/asm2.jar
+asm-commons.jar /usr/share/java/asm3-commons.jar
+asm.jar /usr/share/java/asm3.jar
gnu-regexp.jar /usr/share/java/gnu-regexp.jar
-#maven-plugin-api.jar /usr/share/java/maven-plugin-api.jar
+# WARNING: maven-plugin-api
+# does not exists in debian at the moment
+maven-plugin-api.jar /usr/share/java/gnu-regexp.jar
compile.source 1.4
compile.target 1.4
Modified: trunk/jarjar/debian/changelog
===================================================================
--- trunk/jarjar/debian/changelog 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/changelog 2007-05-11 14:54:24 UTC (rev 3440)
@@ -2,4 +2,4 @@
* Initial Release (closes: #417591).
- -- Arnaud Vandyck <avdyk at debian.org> Wed, 11 Apr 2007 10:15:34 +0200
+ -- Arnaud Vandyck <avdyk at debian.org> Fri, 11 May 2007 16:44:49 +0200
Added: trunk/jarjar/debian/patches/02_dont_build_JarJarMojo.patch
===================================================================
--- trunk/jarjar/debian/patches/02_dont_build_JarJarMojo.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/02_dont_build_JarJarMojo.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,10 @@
+--- build.xml~ 2007-04-11 08:32:34.000000000 +0000
++++ build.xml 2007-05-11 12:34:10.000000000 +0000
+@@ -49,6 +49,7 @@
+ <javac srcdir="src/@{module}" destdir="build/@{module}"
+ source="${compile.source}"
+ target="${compile.target}" bootclasspath="@{bootclasspath}" extdirs="${compile.extdirs}"
++ excludes="com/tonicsystems/jarjar/JarJarMojo.java"
+ debug="${compile.debug}" optimize="${compile.optimize}" deprecation="${compile.deprecation}">
+ <classpath refid="@{refid}"/>
+ </javac>
Added: trunk/jarjar/debian/patches/03_embed_libs_from_debian.patch
===================================================================
--- trunk/jarjar/debian/patches/03_embed_libs_from_debian.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/03_embed_libs_from_debian.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,19 @@
+--- build.xml~ 2007-05-11 14:30:07.000000000 +0000
++++ build.xml 2007-05-11 14:35:06.000000000 +0000
+@@ -83,13 +83,13 @@
+ <mkdir dir="dist"/>
+ <jarjar jarfile="${jarfile}">
+ <fileset dir="build/main"/>
+- <zipfileset src="lib/asm.jar"/>
+- <zipfileset src="lib/asm-commons.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"/>
+ </zipfileset>
+- <zipfileset src="lib/gnu-regexp.jar"/>
++ <zipfileset src="${gnu-regexp.jar}"/>
+ <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"/>
Added: trunk/jarjar/debian/patches/10_AbstractDepHandler_warning.patch
===================================================================
--- trunk/jarjar/debian/patches/10_AbstractDepHandler_warning.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/10_AbstractDepHandler_warning.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,10 @@
+--- src/main/com/tonicsystems/jarjar/AbstractDepHandler.java~ 2007-02-18 12:48:24.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/AbstractDepHandler.java 2007-05-11 12:44:56.000000000 +0000
+@@ -20,7 +20,6 @@
+
+ package com.tonicsystems.jarjar;
+
+-import com.tonicsystems.jarjar.util.*;
+ import java.io.*;
+ import java.util.*;
+
Added: trunk/jarjar/debian/patches/10_DepFindVisitor.patch
===================================================================
--- trunk/jarjar/debian/patches/10_DepFindVisitor.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/10_DepFindVisitor.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,13 @@
+--- src/main/com/tonicsystems/jarjar/DepFindVisitor.java~ 2007-02-19 10:59:44.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/DepFindVisitor.java 2007-05-11 12:47:00.000000000 +0000
+@@ -23,10 +23,7 @@
+ import com.tonicsystems.jarjar.util.*;
+ import java.io.*;
+ import java.util.*;
+-import java.util.zip.ZipEntry;
+ import java.util.zip.ZipFile;
+-import org.objectweb.asm.*;
+-import org.objectweb.asm.Type;
+ import org.objectweb.asm.commons.*;
+
+ class DepFindVisitor extends RemappingClassAdapter
Added: trunk/jarjar/debian/patches/11_DepFind.patch
===================================================================
--- trunk/jarjar/debian/patches/11_DepFind.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/11_DepFind.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,12 @@
+--- src/main/com/tonicsystems/jarjar/DepFind.java~ 2007-02-18 12:32:56.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/DepFind.java 2007-05-11 14:39:04.000000000 +0000
+@@ -23,9 +23,7 @@
+ import com.tonicsystems.jarjar.util.*;
+ import java.io.*;
+ import java.util.*;
+-import java.util.zip.ZipEntry;
+ import org.objectweb.asm.ClassReader;
+-import org.objectweb.asm.ClassVisitor;
+
+ public class DepFind
+ {
Added: trunk/jarjar/debian/patches/12_JarJarTask.patch
===================================================================
--- trunk/jarjar/debian/patches/12_JarJarTask.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/12_JarJarTask.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,18 @@
+--- src/main/com/tonicsystems/jarjar/JarJarTask.java~ 2007-03-21 19:36:24.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/JarJarTask.java 2007-05-11 12:49:06.000000000 +0000
+@@ -21,7 +21,6 @@
+ package com.tonicsystems.jarjar;
+
+ import com.tonicsystems.jarjar.util.*;
+-import java.io.File;
+ import java.io.IOException;
+ import java.util.*;
+ import org.apache.tools.ant.BuildException;
+@@ -29,7 +28,6 @@
+ public class JarJarTask extends AntJarProcessor
+ {
+ private List patterns = new ArrayList();
+- private List keeplist = new ArrayList();
+
+ public void addConfiguredRule(Rule rule) {
+ if (rule.getPattern() == null || rule.getResult() == null)
Added: trunk/jarjar/debian/patches/13_ManifestProcessor.patch
===================================================================
--- trunk/jarjar/debian/patches/13_ManifestProcessor.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/13_ManifestProcessor.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,10 @@
+--- src/main/com/tonicsystems/jarjar/ManifestProcessor.java~ 2007-02-28 19:20:50.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/ManifestProcessor.java 2007-05-11 12:50:13.000000000 +0000
+@@ -22,7 +22,6 @@
+
+ import com.tonicsystems.jarjar.util.*;
+ import java.io.IOException;
+-import java.util.*;
+
+ class ManifestProcessor implements JarProcessor
+ {
Added: trunk/jarjar/debian/patches/14_PackageRemapper.patch
===================================================================
--- trunk/jarjar/debian/patches/14_PackageRemapper.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/14_PackageRemapper.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,21 @@
+--- src/main/com/tonicsystems/jarjar/PackageRemapper.java~ 2007-03-21 21:20:00.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/PackageRemapper.java 2007-05-11 12:52:35.000000000 +0000
+@@ -20,10 +20,7 @@
+
+ package com.tonicsystems.jarjar;
+
+-import com.tonicsystems.jarjar.regex.*;
+-import com.tonicsystems.jarjar.util.*;
+ import org.objectweb.asm.*;
+-import org.objectweb.asm.signature.*;
+ import org.objectweb.asm.commons.*;
+ import java.util.*;
+
+@@ -35,7 +32,6 @@
+ private final HashMap typeCache = new HashMap();
+ private final HashMap pathCache = new HashMap();
+ private final HashMap valueCache = new HashMap();
+- private final HashMap cache = new HashMap();
+ private final boolean verbose;
+
+ public PackageRemapper(List ruleList, boolean verbose) {
Added: trunk/jarjar/debian/patches/15_util_JarTransformerChain.patch
===================================================================
--- trunk/jarjar/debian/patches/15_util_JarTransformerChain.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/15_util_JarTransformerChain.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,11 @@
+--- src/main/com/tonicsystems/jarjar/util/JarTransformerChain.java~ 2007-02-18 12:46:58.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/util/JarTransformerChain.java 2007-05-11 12:54:12.000000000 +0000
+@@ -20,8 +20,6 @@
+
+ package com.tonicsystems.jarjar.util;
+
+-import java.util.*;
+-import java.io.IOException;
+ import org.objectweb.asm.ClassVisitor;
+
+ public class JarTransformerChain extends JarTransformer
Added: trunk/jarjar/debian/patches/17_ResourceProcessor.patch
===================================================================
--- trunk/jarjar/debian/patches/17_ResourceProcessor.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/17_ResourceProcessor.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,10 @@
+--- src/main/com/tonicsystems/jarjar/ResourceProcessor.java~ 2007-02-17 21:39:00.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/ResourceProcessor.java 2007-05-11 13:12:18.000000000 +0000
+@@ -22,7 +22,6 @@
+
+ import com.tonicsystems.jarjar.util.*;
+ import java.io.IOException;
+-import java.util.*;
+
+ class ResourceProcessor implements JarProcessor
+ {
Added: trunk/jarjar/debian/patches/18_StringReader.patch
===================================================================
--- trunk/jarjar/debian/patches/18_StringReader.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/18_StringReader.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,10 @@
+--- src/main/com/tonicsystems/jarjar/StringReader.java~ 2006-03-06 13:51:28.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/StringReader.java 2007-05-11 13:15:40.000000000 +0000
+@@ -20,7 +20,6 @@
+
+ package com.tonicsystems.jarjar;
+
+-import com.tonicsystems.jarjar.util.*;
+ import org.objectweb.asm.*;
+ import org.objectweb.asm.commons.EmptyVisitor;
+
Added: trunk/jarjar/debian/patches/19_TextDepHandler.patch
===================================================================
--- trunk/jarjar/debian/patches/19_TextDepHandler.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/19_TextDepHandler.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,10 @@
+--- src/main/com/tonicsystems/jarjar/TextDepHandler.java~ 2006-03-06 13:51:28.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/TextDepHandler.java 2007-05-11 13:17:30.000000000 +0000
+@@ -21,7 +21,6 @@
+ package com.tonicsystems.jarjar;
+
+ import java.io.*;
+-import java.util.*;
+
+ public class TextDepHandler extends AbstractDepHandler
+ {
Added: trunk/jarjar/debian/patches/20_util_ClassHeaderReader.patch
===================================================================
--- trunk/jarjar/debian/patches/20_util_ClassHeaderReader.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/20_util_ClassHeaderReader.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,10 @@
+--- src/main/com/tonicsystems/jarjar/util/ClassHeaderReader.java~ 2007-02-18 12:45:00.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/util/ClassHeaderReader.java 2007-05-11 13:18:57.000000000 +0000
+@@ -22,7 +22,6 @@
+
+ import java.io.*;
+ import java.lang.reflect.Array;
+-import java.util.*;
+
+ public class ClassHeaderReader
+ {
Added: trunk/jarjar/debian/patches/21_util_RemappingClassTransformer.patch
===================================================================
--- trunk/jarjar/debian/patches/21_util_RemappingClassTransformer.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/21_util_RemappingClassTransformer.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,13 @@
+--- src/main/com/tonicsystems/jarjar/util/RemappingClassTransformer.java~ 2007-03-04 10:24:56.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/util/RemappingClassTransformer.java 2007-05-11 13:20:01.000000000 +0000
+@@ -24,10 +24,6 @@
+ import org.objectweb.asm.commons.Remapper;
+ import org.objectweb.asm.commons.RemappingClassAdapter;
+
+-import org.objectweb.asm.MethodVisitor;
+-import org.objectweb.asm.Type;
+-import org.objectweb.asm.commons.RemappingMethodAdapter;
+-
+ public class RemappingClassTransformer extends RemappingClassAdapter implements ClassTransformer
+ {
+ public RemappingClassTransformer(Remapper pr) {
Added: trunk/jarjar/debian/patches/22_util_StandaloneJarProcessor.patch
===================================================================
--- trunk/jarjar/debian/patches/22_util_StandaloneJarProcessor.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/22_util_StandaloneJarProcessor.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,10 @@
+--- src/main/com/tonicsystems/jarjar/util/StandaloneJarProcessor.java~ 2007-03-21 20:06:46.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/util/StandaloneJarProcessor.java 2007-05-11 13:20:43.000000000 +0000
+@@ -24,7 +24,6 @@
+ import java.util.jar.JarFile;
+ import java.util.jar.JarOutputStream;
+ import java.util.Enumeration;
+-import java.util.zip.ZipOutputStream;
+ import java.io.*;
+
+ public class StandaloneJarProcessor
Added: trunk/jarjar/debian/patches/23_KeepProcessor.patch
===================================================================
--- trunk/jarjar/debian/patches/23_KeepProcessor.patch 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/patches/23_KeepProcessor.patch 2007-05-11 14:54:24 UTC (rev 3440)
@@ -0,0 +1,10 @@
+--- src/main/com/tonicsystems/jarjar/KeepProcessor.java~ 2007-03-21 21:42:32.000000000 +0000
++++ src/main/com/tonicsystems/jarjar/KeepProcessor.java 2007-05-11 14:39:34.000000000 +0000
+@@ -24,7 +24,6 @@
+ import java.io.*;
+ import java.util.*;
+ import org.objectweb.asm.*;
+-import org.objectweb.asm.Type;
+ import org.objectweb.asm.commons.*;
+
+ // TODO: this can probably be refactored into JarClassVisitor, etc.
Added: trunk/jarjar/debian/patches/24_util_GetNameClassWriter.patch
===================================================================
Modified: trunk/jarjar/debian/rules
===================================================================
--- trunk/jarjar/debian/rules 2007-05-11 12:24:07 UTC (rev 3439)
+++ trunk/jarjar/debian/rules 2007-05-11 14:54:24 UTC (rev 3440)
@@ -5,13 +5,13 @@
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
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
JAVA_HOME := /usr/lib/jvm/java-gcj/
ANT_HOME := /usr/share/ant
-DEB_JARS := asm3 asm3-commons gnu-regexp
-DEB_ANT_BUILD_TARGET := jar javadocs
+DEB_JARS := asm3 asm3-commons asm3-util gnu-regexp
+DEB_ANT_BUILD_TARGET := jar javadoc
#clean::
# -rm -rf build
More information about the pkg-java-commits
mailing list