Remove patch 06_BibtexEntry.patch, applied upstream.
[debian/jabref.git] / debian / patches / 02_libs.patch
index 071cabdfc5c95ea81971ec7fbaa51a7bcb7dfee0..063c85e54d0ca3c1de9e7c966b501db905f8b84e 100644 (file)
@@ -12,7 +12,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
        <property name="tests.dir" value="${src.dir}/tests" />
  
        <property name="nsis.executable" value="makensis.exe"/>
-@@ -107,22 +107,21 @@
+@@ -107,22 +107,22 @@
  
        <fileset id="jarsFileset" dir="${lib.dir}">
                <include name="antlr.jar" />
@@ -20,6 +20,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
 -              <include name="looks-2.3.1.jar" />
 -              <include name="forms-1.1.0.jar" />
 +              <include name="antlr3.jar" />
++              <include name="antlr3-runtime.jar" />
 +              <include name="looks.jar" />
 +              <include name="forms.jar" />
                <include name="spin.jar" />
@@ -46,7 +47,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
        </fileset>
  
        <!-- Build classpath -->
-@@ -134,10 +133,10 @@
+@@ -134,10 +134,10 @@
  
        <!-- Classpath for running the code generator -->
        <path id="codegenerator">
@@ -61,7 +62,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
        </path>
  
        <!-- Classpath for tests -->
-@@ -217,7 +216,7 @@
+@@ -217,7 +217,7 @@
        </target>
  
        <!-- Jars up project -->
@@ -70,11 +71,10 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
                <mkdir dir="${build.lib}" />
                <mkdir dir="${build.tmp}" />
                <jar destfile="${build.lib}/${build.jar}">
-@@ -612,6 +611,6 @@ Number (CCN)           maintenance
+@@ -623,6 +623,4 @@ Number (CCN)           maintenance
                </jalopy>
        </target>
  
--      <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
-+<!--  <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" /> -->
+-      <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-2.1.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
+-
  </project>