revert last commit and integrate Rene's patch instead
[debian/jabref-plugin-oo.git] / debian / patches / debian-libs.patch
index 3c2762ac3aad8dc621342c001934c0804cfe6db4..a99b55feeec6f09864864c94dfe6025082a9c762 100644 (file)
@@ -4,25 +4,29 @@ Debian-Specific: yes
 
 --- a/build.xml
 +++ b/build.xml
-@@ -14,17 +14,24 @@
+@@ -14,17 +14,27 @@
        <!-- Properties -->
        <property name="version" value="0.7.4" />
        <property name="build.classes" value="classes" />
 -      <property name="jabref.build.dir" value="lib" />
 +      <property name="jabref.dir" value="/usr/share/java" />
-+      <property name="oo.dir" value="/usr/share/java/openoffice" />
++      <property name="oo.dir" value="/usr/lib/libreoffice/basis-link/program/classes" />
++      <property name="ure.dir" value="/usr/lib/ure/share/java" />
      <property name="jar.dir" value="dist" />
      <property name="jar" value="${jar.dir}/${ant.project.name}-${version}.jar" />
        
        <path id="classpath">
 -              <fileset dir="${jabref.build.dir}">
-+              <fileset dir="${oo.dir}">
++              <fileset dir="${ure.dir}">
              <include name="jurt.jar" />
              <include name="juh.jar" />
-             <include name="unoil.jar" />
+-            <include name="unoil.jar" />
              <include name="ridl.jar" />
 -            <include name="JabRef-2.6.jar" />
 +              </fileset>
++              <fileset dir="${oo.dir}">
++            <include name="unoil.jar" />
++              </fileset>
 +              <fileset dir="${jabref.dir}">
 +            <include name="jabref.jar" />
 +            <include name="glazedlists.jar" />