Merge tag 'debian/2.10+ds-4'
authorgregor herrmann <gregoa@debian.org>
Mon, 26 Oct 2015 00:43:18 +0000 (01:43 +0100)
committergregor herrmann <gregoa@debian.org>
Mon, 26 Oct 2015 00:43:18 +0000 (01:43 +0100)
jabref Debian release 2.10+ds-4

debian/changelog
debian/control
debian/copyright
debian/jabref.menu [deleted file]

index 8df1ef5057b84fde5b6b9985c18ea7902050e80d..3560ad2db22289c09f95fdf5f054533b4115c105 100644 (file)
@@ -12,6 +12,15 @@ jabref (2.11~beta3+ds-1) UNRELEASED; urgency=medium
 
  -- gregor herrmann <gregoa@debian.org>  Wed, 20 May 2015 17:32:49 +0200
 
+jabref (2.10+ds-4) unstable; urgency=medium
+
+  * Drop /usr/lib/ure/share/java from the build-time classpath.
+    The ure JARs are now in /usr/lib/libreoffice/program/classes.
+    (Closes: #802402)
+  * Drop the .menu file in favor of the .desktop file.
+
+ -- tony mancill <tmancill@debian.org>  Mon, 19 Oct 2015 20:46:41 -0700
+
 jabref (2.10+ds-3) unstable; urgency=medium
 
   [ tony mancill ]
index 4fe43609e157acd19b076a127f59ba7fffa5e8db..711616963768cd93dd3d00a5eae8d9e6fe4d7fc6 100644 (file)
@@ -27,7 +27,7 @@ Build-Depends-Indep: ant,
                      libreoffice-java-common (>= 1:3.5),
                      libspin-java,
                      junit,
-                     ure,
+                     ure (>= 5.0~),
                      velocity
 Standards-Version: 3.9.6
 Vcs-Browser: http://git.toastfreeware.priv.at/debian/jabref.git/
index ae4ba3b97f32eab17ddaf0193b8d95894e448a8d..bef29fd483f852b1350dc62e3eb246bc4ac6c71a 100644 (file)
@@ -196,7 +196,7 @@ License: GPL-3+
 
 Files: src/main/resources/osx/osxadapter/OSXAdapter.java
 Copyright: 2003-2007, Apple Computer, Inc
-License: other
+License: other-2
     Disclaimer:  IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc.
     ("Apple") in consideration of your agreement to the following terms, and your
     use, installation, modification or redistribution of this Apple software
diff --git a/debian/jabref.menu b/debian/jabref.menu
deleted file mode 100644 (file)
index 35681a9..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-?package(jabref):needs="x11"  \
-section="Applications/Data Management" \
-title="JabRef" \
-command="jabref" \
-icon="/usr/share/pixmaps/jabref32.xpm" \
-icon32x32="/usr/share/pixmaps/jabref32.xpm" \
-icon16x16="/usr/share/pixmaps/jabref16.xpm"