tweak build path for ure >= 5.0
authortony mancill <tmancill@debian.org>
Tue, 20 Oct 2015 03:24:43 +0000 (20:24 -0700)
committertony mancill <tmancill@debian.org>
Tue, 20 Oct 2015 03:40:06 +0000 (20:40 -0700)
debian/patches/debian_libs.patch

index 737032d..a097851 100644 (file)
@@ -7,7 +7,7 @@ Last-Update: 2013-01-01
 
 --- a/build.xml
 +++ b/build.xml
-@@ -76,8 +76,10 @@
+@@ -76,8 +76,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" />
@@ -15,7 +15,6 @@ Last-Update: 2013-01-01
 -      <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="tests.dir" value="${src.dir}/tests" />
  
@@ -66,7 +65,7 @@ Last-Update: 2013-01-01
 -        <include name="oo/ridl.jar" />
 -        <include name="oo/juh.jar" />
 -        <include name="oo/jurt.jar" />
-+    <fileset id="ureFileset" dir="${ure.dir}">
++    <fileset id="ureFileset" dir="${oo.dir}">
 +        <include name="ridl.jar" />
 +        <include name="juh.jar" />
 +        <include name="jurt.jar" />