revert last commit and integrate Rene's patch instead
authorgregor herrmann <gregoa@debian.org>
Mon, 7 Feb 2011 18:07:14 +0000 (18:07 -0000)
committergregor herrmann <gregoa@debian.org>
Mon, 7 Feb 2011 18:07:14 +0000 (18:07 -0000)
debian/README.Debian
debian/changelog
debian/control
debian/patches/debian-libs.patch

index b830a172964d4a8c3edfc7d38f7cd96349c16e6a..35f9278594b6d5a8648d8153bf088c31e3d372b9 100644 (file)
@@ -1,2 +1,2 @@
-The OpenOffice.org plugin for JabRef is automatically loaded at a restart of
+The Libreoffice plugin for JabRef is automatically loaded at a restart of
 JabRef. To configure/use it go to the Plugin menu in the main menu bar.
index fca8b3840d282f5630ed1bc3eb7334decebba53f..e9c87d006ccd8ecec0770aeaf4584663c4895a70 100644 (file)
@@ -1,11 +1,10 @@
 jabref-plugin-oo (0.7.4+ds-4) UNRELEASED; urgency=low
 
   * debian/control: add Vcs-* fields.
-  * Replace OpenOffice with OpenOffice.org in debian/control and
-    debian/README.Debian; thanks to Rene Engelhard for the bug report 
-    (closes: #609709).
+  * Apply patch by Rene Engelhard: update for LibreOffice and new jar location
+    thanks alot! Closes: #609709
 
- -- gregor herrmann <gregoa@debian.org>  Wed, 29 Dec 2010 14:53:30 +0100
+ -- Rene Engelhard <rene@debian.org>  Sat, 05 Feb 2011 13:11:47 +0000
 
 jabref-plugin-oo (0.7.4+ds-3) unstable; urgency=low
 
index 4ab78032743ee3728ce4430c806c1189837e4a3c..82f99a46e47daf9a12a299a969530ac5864d6c73 100644 (file)
@@ -5,7 +5,7 @@ Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
 Build-Depends: debhelper (>= 7.3.7), ant
 Build-Depends-Indep: default-jdk, jabref (>= 2.4),
- openoffice.org-java-common (>= 1:2.4)
+ libreoffice-java-common, ure
 Standards-Version: 3.9.1
 Homepage: http://jabref.sourceforge.net/OOPlugin-jabref.php
 Vcs-Svn: http://svn.toastfreeware.priv.at/debian/jabref-plugin-oo/trunk/
@@ -13,9 +13,9 @@ Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/jabref-pl
 
 Package: jabref-plugin-oo
 Architecture: all
-Depends: ${misc:Depends}, jabref (>= 2.6~beta3), openoffice.org-writer (>= 1:2.4),
- openoffice.org-java-common (>= 1:2.4)
+Depends: ${misc:Depends}, jabref (>= 2.6~beta3), libreoffice-writer | openoffice.org-writer,
+ libreoffice-java-common | openoffice.org-java-common
 Enhances: jabref
-Description: OpenOffice.org plugin for JabRef
+Description: LibreOffice plugin for JabRef
  This plugin offers an interface for inserting citations and formatting a
- Bibliography in an OpenOffice.org text document from JabRef.
+ Bibliography in an OpenDocument text document from JabRef.
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" />