~ubuntu-branches/ubuntu/vivid/cglib/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/03_jarjar.diff

  • Committer: Package Import Robot
  • Author(s): Damien Raude-Morvan
  • Date: 2011-11-01 22:05:40 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20111101220540-k68c9ybx884yzfte
Tags: 2.2.2+dfsg-1
* New upstream release.
* Bump Standards-Version to 3.9.2: no changes needed.
* d/copyright: Use DEP-5 format.
* d/rules: Enable unit testing.
* d/patches/04_skiptests_ParallelSorter.diff: Skip some failing test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Index: b/build.xml
 
2
===================================================================
1
3
--- a/build.xml
2
4
+++ b/build.xml
3
5
@@ -127,7 +127,7 @@
4
6
     <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/>
5
7
     <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" >
6
8
       <zipfileset dir="lib" includes="asm*.txt"/>
7
 
-      <zipfileset src="lib/asm-3.1.jar" excludes="META-INF"/>
 
9
-      <zipfileset src="lib/asm-3.3.1.jar" excludes="META-INF"/>
8
10
+      <zipfileset src="/usr/share/java/asm3-all.jar" excludes="META-INF"/>
9
11
       <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/>
10
12
       <include name="**/*"/>