Refresh patch 02_libs.patch.
authorgregor herrmann <gregoa@debian.org>
Mon, 29 Oct 2012 18:27:34 +0000 (19:27 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 29 Oct 2012 18:27:34 +0000 (19:27 +0100)
debian/patches/02_libs.patch

index 063c85e..617047e 100644 (file)
@@ -3,37 +3,46 @@ Author: Philip Rinn <rinni@gmx.net>
 Description: Use debian libraries and disable unnecesary unjarlib target,
 --- a/build.xml
 +++ b/build.xml
-@@ -85,7 +85,7 @@
+@@ -74,7 +74,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="tests.dir" value="${src.dir}/tests" />
  
-       <property name="nsis.executable" value="makensis.exe"/>
-@@ -107,22 +107,22 @@
+       <property name="nsis.executable" value="C:\Program files\NSIS\makensis.exe"/>
+@@ -95,34 +97,36 @@
+       </condition>
  
        <fileset id="jarsFileset" dir="${lib.dir}">
-               <include name="antlr.jar" />
+-              <include name="antlr.jar" />
 -              <include name="antlr-3.0b5.jar" />
--              <include name="looks-2.3.1.jar" />
--              <include name="forms-1.1.0.jar" />
+-        <include name="jgoodies-common-1.3.1.jar" />
+-              <include name="jgoodies-looks-2.5.1.jar" />
+-              <include name="jgoodies-forms-1.5.1.jar" />
 +              <include name="antlr3.jar" />
 +              <include name="antlr3-runtime.jar" />
-+              <include name="looks.jar" />
-+              <include name="forms.jar" />
++        <include name="jgoodies-common.jar" />
++              <include name="jgoodies-looks.jar" />
++              <include name="jgoodies-forms.jar" />
                <include name="spin.jar" />
--              <include name="glazedlists-1.7.0_java15.jar" />
+-              <include name="glazedlists-1.8.0_java15.jar" />
 +              <include name="glazedlists.jar" />
                <include name="microba.jar" />
--              <include name="PDFBox-0.7.3-dev-reduced.jar" />
--              <include name="JempBox-0.2.0.jar" />
--              <include name="zoom-java.jar" />
--      <include name="mysql-connector-java-5.0.7-bin.jar" />
+-              <include name="pdfbox-1.6.0.jar" />
+-              <include name="jempbox-1.6.0.jar" />
+-              <include name="fontbox-1.6.0.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.1-902.jdbc4.jar" />
 +      <include name="mysql-connector-java.jar" />
++              <include name="postgresql.jar" />
          <!--<include name="substance-4.1.jar" />-->
          <!-- Plugin runtime dependencies -->
 -              <include name="plugin/JPFCodeGenerator-rt.jar" />
@@ -46,8 +55,28 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
 +              <include name="commons-logging.jar" />
        </fileset>
  
-       <!-- Build classpath -->
-@@ -134,10 +134,10 @@
+     <!-- 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 -->
+@@ -145,14 +149,15 @@
+         <!-- Done by MrDlib -->
+               <fileset refid="jarsFileset" />
+         <fileset refid="ooFileset" />
++        <fileset refid="ureFileset" />
+       </path>
  
        <!-- Classpath for running the code generator -->
        <path id="codegenerator">
@@ -62,19 +91,19 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
        </path>
  
        <!-- Classpath for tests -->
-@@ -217,7 +217,7 @@
+@@ -233,7 +238,7 @@
        </target>
  
        <!-- Jars up project -->
 -      <target name="jars" depends="build, unjarlib">
 +      <target name="jars" depends="build">
                <mkdir dir="${build.lib}" />
+         
                <mkdir dir="${build.tmp}" />
-               <jar destfile="${build.lib}/${build.jar}">
-@@ -623,6 +623,4 @@ Number (CCN)           maintenance
+@@ -660,6 +665,4 @@
                </jalopy>
        </target>
  
--      <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-2.1.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
+-      <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
 -
  </project>