X-Git-Url: https://git.toastfreeware.priv.at/debian/jabref.git/blobdiff_plain/5a68eb82eaa10f3dd5ce399a125b5a4b927518d9..b9ab365d19410ea7b28414f4bcec50e0ef572bfc:/debian/patches/debian_libs.patch?ds=sidebyside

diff --git a/debian/patches/debian_libs.patch b/debian/patches/debian_libs.patch
index 80b9a31..a097851 100644
--- a/debian/patches/debian_libs.patch
+++ b/debian/patches/debian_libs.patch
@@ -1,20 +1,25 @@
-Author: Gerardo Curiel <gerardo@sophie.gerardo.com.ve>
-Author: Philip Rinn <rinni@gmx.net>
 Description: Use debian libraries and disable unnecesary unjarlib target,
+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: 2013-01-01
+
 --- a/build.xml
 +++ b/build.xml
-@@ -75,7 +75,9 @@
+@@ -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" />
 -	<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="buildlib" />
++	<property name="buildlib.dir" value="/usr/share/java" />
  	<property name="tests.dir" value="${src.dir}/tests" />
  
-@@ -100,33 +102,35 @@
+ 	<property name="osxbin.dir" value="osx" />
+@@ -102,33 +104,35 @@
  
  	<fileset id="jarsFileset" dir="${lib.dir}">
  		<include name="antlr.jar" />
@@ -27,7 +32,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
 +		<include name="antlr3-runtime.jar" />
 +        <include name="jgoodies-common.jar" />
 +		<include name="jgoodies-looks.jar" />
-+		<include name="forms.jar" />
++		<include name="jgoodies-forms.jar" />
  		<include name="spin.jar" />
 -		<include name="glazedlists-1.8.0_java15.jar" />
 +		<include name="glazedlists.jar" />
@@ -60,7 +65,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
 -        <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" />
@@ -70,7 +75,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
      </fileset>
  
      <!-- Done by MrDlib -->
-@@ -149,14 +153,15 @@
+@@ -151,14 +155,15 @@
          <!-- Done by MrDlib -->
  		<fileset refid="jarsFileset" />
          <fileset refid="ooFileset" />
@@ -90,19 +95,21 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
  	</path>
  
  	<!-- Classpath for tests -->
-@@ -237,7 +242,7 @@
+@@ -238,7 +243,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 @@
+@@ -645,8 +650,6 @@
  		</jalopy>
  	</target>
  
 -	<taskdef name="jarbundler" classpath="${buildlib.dir}/jarbundler-2.2.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
 -
- </project>
+ 	<target name="compresssrc">
+ 		<!-- 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) -->
+ 		<mkdir dir="${temp.dir}"/>