Refresh patches.
[debian/jabref.git] / debian / patches / debian_libs.patch
index 22a7a597c61e75cc011cd36ec96311e00d42fa29..d1b18db68cbb0a56f6c9de31108b2c1306354eb2 100644 (file)
-Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>
-Author: Philip Rinn <rinni@gmx.net>
-Description: Use debian libraries and disable unnecesary unjarlib target,
+Description: Use debian libraries and disable unnecesary unjarlib target,\r
+Forwarded: not needed
+Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>,\r
+ Philip Rinn <rinni@gmx.net>\r
+Reviewed-by: gregor herrmann <gregoa@debian.org>
+Last-Update: 2013-01-01
+
 --- a/build.xml
 +++ b/build.xml
 --- a/build.xml
 +++ b/build.xml
-@@ -75,7 +75,9 @@
-       <property name="help.dir" value="${src.dir}/help" />
-       <property name="extensions.dir" value="${src.dir}/extensions" />
-       <property name="layout.dir" value="${src.dir}/resource/layout" />
--      <property name="lib.dir" value="lib" />
-+      <property name="lib.dir" value="/usr/share/java" />
-+      <property name="oo.dir" value="/usr/lib/libreoffice/program/classes" />
-+      <property name="ure.dir" value="/usr/lib/ure/share/java" />
-       <property name="buildlib.dir" value="buildlib" />
-       <property name="tests.dir" value="${src.dir}/tests" />
-@@ -100,33 +102,35 @@
-       <fileset id="jarsFileset" dir="${lib.dir}">
-               <include name="antlr.jar" />
--              <include name="antlr-3.4-complete.jar" />
--        <include name="jgoodies-common-1.4.0.jar" />
--              <include name="jgoodies-looks-2.5.2.jar" />
--              <include name="jgoodies-forms-1.6.0.jar" />
--              <include name="jayatana-1.2.4.jar" />
-+              <include name="antlr3.jar" />
-+              <include name="antlr3-runtime.jar" />
-+        <include name="jgoodies-common.jar" />
-+              <include name="jgoodies-looks.jar" />
-+              <include name="jgoodies-forms.jar" />
-               <include name="spin.jar" />
--              <include name="glazedlists-1.8.0_java15.jar" />
-+              <include name="glazedlists.jar" />
-               <include name="microba.jar" />
--              <include name="pdfbox-1.7.1.jar" />
--              <include name="jempbox-1.7.1.jar" />
--              <include name="fontbox-1.7.1.jar" />
-+              <include name="pdfbox.jar" />
-+              <include name="jempbox.jar" />
-+              <include name="fontbox.jar" />
-               <include name="zoom-java.jar" />
--      <include name="mysql-connector-java-5.0.7-bin.jar" />
--              <include name="postgresql-9.2-1002.jdbc4.jar" />
-+      <include name="mysql-connector-java.jar" />
-+              <include name="postgresql.jar" />
-         <!-- Plugin runtime dependencies -->
--              <include name="plugin/JPFCodeGenerator-rt.jar" />
--              <include name="plugin/jpf.jar" />
--              <include name="plugin/jpf-boot.jar" />
--              <include name="plugin/commons-logging.jar" />
-+              <include name="JPFCodeGenerator-rt.jar" />
-+              <include name="jpf.jar" />
-+              <include name="jpf-boot.jar" />
-+              <include name="commons-logging.jar" />
-       </fileset>
-     <!-- Openoffice connection dependencies. Compile-time only -->
--    <fileset id="ooFileset" dir="${lib.dir}">
--        <include name="oo/unoil.jar" />
--        <include name="oo/ridl.jar" />
--        <include name="oo/juh.jar" />
--        <include name="oo/jurt.jar" />
-+    <fileset id="ureFileset" dir="${ure.dir}">
-+        <include name="ridl.jar" />
-+        <include name="juh.jar" />
-+        <include name="jurt.jar" />
-+    </fileset>
-+    <fileset id="ooFileset" dir="${oo.dir}">
-+        <include name="unoil.jar" />
-     </fileset>
-     <!-- Done by MrDlib -->
-@@ -149,14 +153,15 @@
-         <!-- Done by MrDlib -->
-               <fileset refid="jarsFileset" />
-         <fileset refid="ooFileset" />
-+        <fileset refid="ureFileset" />
-       </path>
-       <!-- Classpath for running the code generator -->
-       <path id="codegenerator">
--              <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
--              <pathelement location="${lib.dir}/plugin/jpf.jar" />
--              <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
--              <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
-+              <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />
-+              <pathelement location="${lib.dir}/jpf.jar" />
-+              <pathelement location="${lib.dir}/jpf-boot.jar" />
-+              <pathelement location="${lib.dir}/velocity.jar" />
-       </path>
-       <!-- Classpath for tests -->
-@@ -237,7 +242,7 @@
-       </target>
-       <!-- Jars up project -->
--      <target name="jars" depends="build, unjarlib">
-+      <target name="jars" depends="build">
-               <mkdir dir="${build.lib}" />
-         
-               <mkdir dir="${build.tmp}" />
-@@ -595,6 +600,4 @@
-               </jalopy>
-       </target>
--      <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
--
- </project>
+@@ -76,7 +76,9 @@
+       <property name="help.dir" value="${src.dir}/help" />\r
+       <property name="extensions.dir" value="${src.dir}/extensions" />\r
+       <property name="layout.dir" value="${src.dir}/resource/layout" />\r
+-      <property name="lib.dir" value="lib" />\r
++      <property name="lib.dir" value="/usr/share/java" />\r
++      <property name="oo.dir" value="/usr/lib/libreoffice/program/classes" />\r
++      <property name="ure.dir" value="/usr/lib/ure/share/java" />\r
+       <property name="buildlib.dir" value="buildlib" />\r
+       <property name="tests.dir" value="${src.dir}/tests" />\r
\r
+@@ -102,33 +104,35 @@
\r
+       <fileset id="jarsFileset" dir="${lib.dir}">\r
+               <include name="antlr.jar" />\r
+-              <include name="antlr-3.4-complete.jar" />\r
+-        <include name="jgoodies-common-1.4.0.jar" />\r
+-              <include name="jgoodies-looks-2.5.2.jar" />\r
+-              <include name="jgoodies-forms-1.6.0.jar" />\r
+-              <include name="jayatana-1.2.4.jar" />\r
++              <include name="antlr3.jar" />\r
++              <include name="antlr3-runtime.jar" />\r
++        <include name="jgoodies-common.jar" />\r
++              <include name="jgoodies-looks.jar" />\r
++              <include name="jgoodies-forms.jar" />\r
+               <include name="spin.jar" />\r
+-              <include name="glazedlists-1.8.0_java15.jar" />\r
++              <include name="glazedlists.jar" />\r
+               <include name="microba.jar" />\r
+-              <include name="pdfbox-1.7.1.jar" />\r
+-              <include name="jempbox-1.7.1.jar" />\r
+-              <include name="fontbox-1.7.1.jar" />\r
++              <include name="pdfbox.jar" />\r
++              <include name="jempbox.jar" />\r
++              <include name="fontbox.jar" />\r
+               <include name="zoom-java.jar" />\r
+-      <include name="mysql-connector-java-5.0.7-bin.jar" />\r
+-              <include name="postgresql-9.2-1002.jdbc4.jar" />\r
++      <include name="mysql-connector-java.jar" />\r
++              <include name="postgresql.jar" />\r
+         <!-- Plugin runtime dependencies -->\r
+-              <include name="plugin/JPFCodeGenerator-rt.jar" />\r
+-              <include name="plugin/jpf.jar" />\r
+-              <include name="plugin/jpf-boot.jar" />\r
+-              <include name="plugin/commons-logging.jar" />\r
++              <include name="JPFCodeGenerator-rt.jar" />\r
++              <include name="jpf.jar" />\r
++              <include name="jpf-boot.jar" />\r
++              <include name="commons-logging.jar" />\r
+       </fileset>\r
\r
+     <!-- Openoffice connection dependencies. Compile-time only -->\r
+-    <fileset id="ooFileset" dir="${lib.dir}">\r
+-        <include name="oo/unoil.jar" />\r
+-        <include name="oo/ridl.jar" />\r
+-        <include name="oo/juh.jar" />\r
+-        <include name="oo/jurt.jar" />\r
++    <fileset id="ureFileset" dir="${ure.dir}">\r
++        <include name="ridl.jar" />\r
++        <include name="juh.jar" />\r
++        <include name="jurt.jar" />\r
++    </fileset>\r
++    <fileset id="ooFileset" dir="${oo.dir}">\r
++        <include name="unoil.jar" />\r
+     </fileset>\r
\r
+     <!-- Done by MrDlib -->\r
+@@ -151,14 +155,15 @@
+         <!-- Done by MrDlib -->\r
+               <fileset refid="jarsFileset" />\r
+         <fileset refid="ooFileset" />\r
++        <fileset refid="ureFileset" />\r
+       </path>\r
\r
+       <!-- Classpath for running the code generator -->\r
+       <path id="codegenerator">\r
+-              <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />\r
+-              <pathelement location="${lib.dir}/plugin/jpf.jar" />\r
+-              <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />\r
+-              <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />\r
++              <pathelement location="${lib.dir}/JPFCodeGenerator.jar" />\r
++              <pathelement location="${lib.dir}/jpf.jar" />\r
++              <pathelement location="${lib.dir}/jpf-boot.jar" />\r
++              <pathelement location="${lib.dir}/velocity.jar" />\r
+       </path>\r
\r
+       <!-- Classpath for tests -->\r
+@@ -239,7 +244,7 @@
+       </target>\r
\r
+       <!-- Jars up project -->\r
+-      <target name="jars" depends="build, unjarlib">\r
++      <target name="jars" depends="build">\r
+               <mkdir dir="${build.lib}" />\r
+         \r
+               <mkdir dir="${build.tmp}" />\r
+@@ -631,8 +636,6 @@
+               </jalopy>\r
+       </target>\r
\r
+-      <taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />\r
+-\r
+       <target name="zipsrc">\r
+               <!-- clone current repo into tmp dir. Reason: we want to have a clean src.zip, but do not want to execute "git clean -xdf" to allow developers having some temporary files (and user.properties) -->\r
+               <tempfile property="temp.dir" destDir="${java.io.tmpdir}" prefix="jabrefsrc"/>\r