[pkg-java] r5496 - in trunk/jarjar/debian: . patches
avdyk at alioth.debian.org
avdyk at alioth.debian.org
Sat Jan 19 18:16:35 UTC 2008
Author: avdyk
Date: 2008-01-19 18:16:35 +0000 (Sat, 19 Jan 2008)
New Revision: 5496
Added:
trunk/jarjar/debian/patches/04_path_build.patch
Removed:
trunk/jarjar/debian/patches/01_build_classpath.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/control
trunk/jarjar/debian/libjarjar-java.install
trunk/jarjar/debian/libjarjar-java.links
trunk/jarjar/debian/patches/03_embed_libs_from_debian.patch
trunk/jarjar/debian/rules
Log:
* New upstream.
* debian/control:
- Standards-Version: updated to 3.7.3, no change.
- Build-Depends-Indep: removed libgnu-regexp-java.
* debian/patches/19_TextDepHandler.patch,
debian/patches/22_util_StandaloneJarProcessor.patch,
debian/patches/23_KeepProcessor.patch,
debian/patches/10_DepFindVisitor.patch,
debian/patches/21_util_RemappingClassTransformer.patch,
debian/patches/14_PackageRemapper.patch,
debian/patches/12_JarJarTask.patch,
debian/patches/17_ResourceProcessor.patch,
debian/patches/20_util_ClassHeaderReader.patch,
debian/patches/01_build_classpath.patch,
debian/patches/18_StringReader.patch,
debian/patches/15_util_JarTransformerChain.patch,
debian/patches/24_util_GetNameClassWriter.patch,
debian/patches/13_ManifestProcessor.patch,
debian/patches/11_DepFind.patch,
debian/patches/10_AbstractDepHandler_warning.patch: removed
* debian/patches/04_path_build.patch: added
* debian/libjarjar-java.install, debian/libjarjar-java.links: updated to
new upstream
* debian/patches/03_embed_libs_from_debian.patch: updated to match
upstream change and removed reference to libgnu-regexp-java
* debian/ant.properties: removed reference to libgnu-regexp-java and
commented maven-plugin-api property
* debian/rules:
- removed reference to libgnu-regexp-java and ams3-util
- removed clean comments
Modified: trunk/jarjar/debian/ant.properties
===================================================================
--- trunk/jarjar/debian/ant.properties 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/ant.properties 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,8 +1,7 @@
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
# WARNING: maven-plugin-api
# does not exists in debian at the moment
-maven-plugin-api.jar /usr/share/java/gnu-regexp.jar
+#maven-plugin-api.jar /usr/share/java/
compile.source 1.4
compile.target 1.4
Modified: trunk/jarjar/debian/changelog
===================================================================
--- trunk/jarjar/debian/changelog 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/changelog 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,9 +1,42 @@
-jarjar (1.0~rc3.dfsg.1-2) UNRELEASED; urgency=low
+jarjar (1.0~rc6.dfsg.1-1) UNRELEASED; urgency=low
+ [Michael Koch]
* Updated watch file to match upstream version correctly.
- -- Michael Koch <konqueror at gmx.de> Sun, 30 Dec 2007 14:25:43 +0100
+ [Arnaud Vandyck]
+ * New upstream.
+ * debian/control:
+ - Standards-Version: updated to 3.7.3, no change.
+ - Build-Depends-Indep: removed libgnu-regexp-java.
+ * debian/patches/19_TextDepHandler.patch,
+ debian/patches/22_util_StandaloneJarProcessor.patch,
+ debian/patches/23_KeepProcessor.patch,
+ debian/patches/10_DepFindVisitor.patch,
+ debian/patches/21_util_RemappingClassTransformer.patch,
+ debian/patches/14_PackageRemapper.patch,
+ debian/patches/12_JarJarTask.patch,
+ debian/patches/17_ResourceProcessor.patch,
+ debian/patches/20_util_ClassHeaderReader.patch,
+ debian/patches/01_build_classpath.patch,
+ debian/patches/18_StringReader.patch,
+ debian/patches/15_util_JarTransformerChain.patch,
+ debian/patches/24_util_GetNameClassWriter.patch,
+ debian/patches/13_ManifestProcessor.patch,
+ debian/patches/11_DepFind.patch,
+ debian/patches/10_AbstractDepHandler_warning.patch: removed
+ * debian/patches/04_path_build.patch: added
+ * debian/libjarjar-java.install, debian/libjarjar-java.links: updated to
+ new upstream
+ * debian/patches/03_embed_libs_from_debian.patch: updated to match
+ upstream change and removed reference to libgnu-regexp-java
+ * debian/ant.properties: removed reference to libgnu-regexp-java and
+ commented maven-plugin-api property
+ * debian/rules:
+ - removed reference to libgnu-regexp-java and ams3-util
+ - removed clean comments
+ -- Arnaud Vandyck <avdyk at debian.org> Sat, 19 Jan 2008 19:15:04 +0100
+
jarjar (1.0~rc3.dfsg.1-1) unstable; urgency=low
* Initial Release (closes: #417591).
Modified: trunk/jarjar/debian/control
===================================================================
--- trunk/jarjar/debian/control 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/control 2008-01-19 18:16:35 UTC (rev 5496)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Arnaud Vandyck <avdyk at debian.org>
-Build-Depends-Indep: debhelper (>= 4.2.30), java-gcj-compat-dev (>= 1.0.69-2), ant, cdbs, libasm3-java, libgnu-regexp-java
-Standards-Version: 3.7.2
+Build-Depends-Indep: debhelper (>= 4.2.30), java-gcj-compat-dev (>= 1.0.69-2), ant, cdbs, libasm3-java
+Standards-Version: 3.7.3
Package: libjarjar-java
Section: libs
Modified: trunk/jarjar/debian/libjarjar-java.install
===================================================================
--- trunk/jarjar/debian/libjarjar-java.install 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/libjarjar-java.install 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1 +1 @@
-dist/jarjar-1.0rc3.jar /usr/share/java/
+dist/jarjar-1.0rc6.jar /usr/share/java/
Modified: trunk/jarjar/debian/libjarjar-java.links
===================================================================
--- trunk/jarjar/debian/libjarjar-java.links 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/libjarjar-java.links 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1 +1 @@
-/usr/share/java/jarjar-1.0rc3.jar /usr/share/java/jarjar.jar
+/usr/share/java/jarjar-1.0rc6.jar /usr/share/java/jarjar.jar
Deleted: trunk/jarjar/debian/patches/01_build_classpath.patch
===================================================================
--- trunk/jarjar/debian/patches/01_build_classpath.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/01_build_classpath.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,23 +0,0 @@
---- build.xml.old 2007-04-11 08:32:34.000000000 +0000
-+++ build.xml 2007-04-11 08:36:43.000000000 +0000
-@@ -21,11 +21,19 @@
-
- <property name="test.jar" value="build/rejar.jar"/>
-
-+ <property name="asm-commons.jar" value="lib/asm-commons.jar"/>
-+ <property name="asm.jar" value="lib/asm.jar"/>
-+ <property name="gnu-regexp.jar" value="lib/gnu-regexp.jar"/>
-+ <property name="maven-plugin-api.jar" value="lib/maven-plugin-api.jar"/>
-+
- <target name="init">
- <echo>bootclasspath ${compile.bootclasspath}</echo>
- <tstamp/>
- <path id="path.build">
-- <fileset dir="lib" includes="**/*.jar"/>
-+ <pathelement path="${asm-commons.jar}"/>
-+ <pathelement path="${asm.jar}"/>
-+ <pathelement path="${gnu-regexp.jar}"/>
-+ <pathelement path="${maven-plugin-api.jar}"/>
- </path>
- <path id="path.run">
- <path refid="path.build"/>
Modified: trunk/jarjar/debian/patches/03_embed_libs_from_debian.patch
===================================================================
--- trunk/jarjar/debian/patches/03_embed_libs_from_debian.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/03_embed_libs_from_debian.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,19 +1,13 @@
---- build.xml~ 2007-05-11 14:30:07.000000000 +0000
-+++ build.xml 2007-05-11 14:35:06.000000000 +0000
-@@ -83,13 +83,13 @@
+--- 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.jar"/>
-- <zipfileset src="lib/asm-commons.jar">
-+ <zipfileset src="${asm.jar}"/>
-+ <zipfileset src="${asm-commons.jar}">
+- <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"/>
- </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/04_path_build.patch
===================================================================
--- trunk/jarjar/debian/patches/04_path_build.patch (rev 0)
+++ trunk/jarjar/debian/patches/04_path_build.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -0,0 +1,13 @@
+--- 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/10_AbstractDepHandler_warning.patch
===================================================================
--- trunk/jarjar/debian/patches/10_AbstractDepHandler_warning.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/10_AbstractDepHandler_warning.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,10 +0,0 @@
---- 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.*;
-
Deleted: trunk/jarjar/debian/patches/10_DepFindVisitor.patch
===================================================================
--- trunk/jarjar/debian/patches/10_DepFindVisitor.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/10_DepFindVisitor.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,13 +0,0 @@
---- 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
Deleted: trunk/jarjar/debian/patches/11_DepFind.patch
===================================================================
--- trunk/jarjar/debian/patches/11_DepFind.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/11_DepFind.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,12 +0,0 @@
---- 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
- {
Deleted: trunk/jarjar/debian/patches/12_JarJarTask.patch
===================================================================
--- trunk/jarjar/debian/patches/12_JarJarTask.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/12_JarJarTask.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,18 +0,0 @@
---- 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)
Deleted: trunk/jarjar/debian/patches/13_ManifestProcessor.patch
===================================================================
--- trunk/jarjar/debian/patches/13_ManifestProcessor.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/13_ManifestProcessor.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,10 +0,0 @@
---- 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
- {
Deleted: trunk/jarjar/debian/patches/14_PackageRemapper.patch
===================================================================
--- trunk/jarjar/debian/patches/14_PackageRemapper.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/14_PackageRemapper.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,21 +0,0 @@
---- 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) {
Deleted: trunk/jarjar/debian/patches/15_util_JarTransformerChain.patch
===================================================================
--- trunk/jarjar/debian/patches/15_util_JarTransformerChain.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/15_util_JarTransformerChain.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,11 +0,0 @@
---- 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
Deleted: trunk/jarjar/debian/patches/17_ResourceProcessor.patch
===================================================================
--- trunk/jarjar/debian/patches/17_ResourceProcessor.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/17_ResourceProcessor.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,10 +0,0 @@
---- 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
- {
Deleted: trunk/jarjar/debian/patches/18_StringReader.patch
===================================================================
--- trunk/jarjar/debian/patches/18_StringReader.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/18_StringReader.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,10 +0,0 @@
---- 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;
-
Deleted: trunk/jarjar/debian/patches/19_TextDepHandler.patch
===================================================================
--- trunk/jarjar/debian/patches/19_TextDepHandler.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/19_TextDepHandler.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,10 +0,0 @@
---- 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
- {
Deleted: trunk/jarjar/debian/patches/20_util_ClassHeaderReader.patch
===================================================================
--- trunk/jarjar/debian/patches/20_util_ClassHeaderReader.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/20_util_ClassHeaderReader.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,10 +0,0 @@
---- 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
- {
Deleted: trunk/jarjar/debian/patches/21_util_RemappingClassTransformer.patch
===================================================================
--- trunk/jarjar/debian/patches/21_util_RemappingClassTransformer.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/21_util_RemappingClassTransformer.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,13 +0,0 @@
---- 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) {
Deleted: trunk/jarjar/debian/patches/22_util_StandaloneJarProcessor.patch
===================================================================
--- trunk/jarjar/debian/patches/22_util_StandaloneJarProcessor.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/22_util_StandaloneJarProcessor.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,10 +0,0 @@
---- 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
Deleted: trunk/jarjar/debian/patches/23_KeepProcessor.patch
===================================================================
--- trunk/jarjar/debian/patches/23_KeepProcessor.patch 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/patches/23_KeepProcessor.patch 2008-01-19 18:16:35 UTC (rev 5496)
@@ -1,10 +0,0 @@
---- 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.
Deleted: trunk/jarjar/debian/patches/24_util_GetNameClassWriter.patch
===================================================================
Modified: trunk/jarjar/debian/rules
===================================================================
--- trunk/jarjar/debian/rules 2008-01-19 17:59:02 UTC (rev 5495)
+++ trunk/jarjar/debian/rules 2008-01-19 18:16:35 UTC (rev 5496)
@@ -10,8 +10,5 @@
JAVA_HOME := /usr/lib/jvm/java-gcj/
ANT_HOME := /usr/share/ant
-DEB_JARS := asm3 asm3-commons asm3-util gnu-regexp
+DEB_JARS := asm3 asm3-commons
DEB_ANT_BUILD_TARGET := jar javadoc
-
-#clean::
-# -rm -rf build
More information about the pkg-java-commits
mailing list