refresh debian_libs.patch
authorgregor herrmann <gregoa@debian.org>
Thu, 9 Jul 2015 17:10:02 +0000 (19:10 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 9 Jul 2015 17:10:02 +0000 (19:10 +0200)
almost empty now, since all the external libs are gone

Gbp-Dch: Ignore

debian/patches/debian_libs.patch

index 8246968..1502e61 100644 (file)
@@ -3,101 +3,31 @@ Forwarded: not needed
 Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>,
  Philip Rinn <rinni@gmx.net>
 Reviewed-by: gregor herrmann <gregoa@debian.org>
-Last-Update: 2015-05-19
+Last-Update: 2015-07-09
 
 --- a/build.xml
 +++ b/build.xml
-@@ -71,8 +71,10 @@
+@@ -68,8 +68,8 @@
        <property name="help.dir" value="${resources.dir}/help" />
        <property name="extensions.dir" value="${resources.dir}/extensions" />
        <property name="layout.dir" value="${resources.dir}/resource/layout" />
 -      <property name="lib.dir" value="lib" />
 -      <property name="buildlib.dir" value="buildlib" />
 +      <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="/usr/share/java" />
  
        <property name="osxbin.dir" value="osx" />
  
-@@ -96,36 +98,38 @@
-       <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="antlr3.jar" />
-+              <include name="antlr3-runtime.jar" />
-+        <include name="jgoodies-common.jar" />
-+              <include name="jgoodies-looks.jar" />
-+              <include name="jgoodies-forms.jar" />
-         <include name="jgoodies/jgoodies-uif-lite.jar" />
--        <include name="jna-4.1.0.jar" />
-+        <include name="jna.jar" />
-         <include name="ritopt/ritopt-0.2.1-bin.jar" />
--              <include name="jayatana-1.2.4.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 -->
-@@ -146,6 +150,7 @@
-         <!-- Done by MrDlib -->
-               <fileset refid="jarsFileset" />
-         <fileset refid="ooFileset" />
-+        <fileset refid="ureFileset" />
-       </path>
-       <target name="run" depends="build">
-@@ -188,7 +193,7 @@
+@@ -149,7 +149,7 @@
+               <copy file="${osxbin.dir}/MacAdapter.class" todir="${build.classes.osx}" />
        </target>
  
-       <!-- Jars up project -->
--      <target name="jars" depends="build, unjarlib">
-+      <target name="jars" depends="build">
+-      <target name="jars" depends="build, unjarlib" description="Jars up project">
++      <target name="jars" depends="build" description="Jars up project">
                <mkdir dir="${build.lib}" />
  
                <mkdir dir="${build.tmp}" />
-@@ -510,8 +515,6 @@
+@@ -519,8 +519,6 @@
           Auxiliary targets
          +++++++++++++++++++++++++++++++++++++++++++++++++-->