Merge tag 'debian/2.10+ds-4'

jabref Debian release 2.10+ds-4

diff --cc debian/changelog
index 8df1ef5057b84fde5b6b9985c18ea7902050e80d,618137db100fe274503271395cb90e6ca9163dd2..3560ad2db22289c09f95fdf5f054533b4115c105
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,12 +1,26 @@@
 +jabref (2.11~beta3+ds-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release candidates 2.11b, 2.11b2, 2.11b3.
 +  * debian/rules: drop override_dh_installchangelogs.
 +    CHANGELOG is now in the top-level directory.
 +  * Update years of packaging copyright.
 +  * Update upstream copyright notices.
 +    Some files were (re)moved.
 +  * Drop fix-headless-bibtex-output.diff, refresh other patches.
 +  * First new (build) dependencies added: antlr3-runtime, jna.
 +  * Adjust some paths and filenames in debian/.
 +
 + -- 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 ]

diff --cc debian/control
Simple merge

diff --cc debian/copyright
index ae4ba3b97f32eab17ddaf0193b8d95894e448a8d,287970c310c4630eca11ee908eb81c6032546d78..bef29fd483f852b1350dc62e3eb246bc4ac6c71a
--- 1/debian/copyright
--- 2/debian/copyright
+++ b/debian/copyright
@@@ -194,9 -196,9 +194,9 @@@ Files: src/main/java/net/sf/jabref/expo
  Copyright: 2009, Laura Hernández Gómez
  License: GPL-3+
  
 -Files: src/osx/osxadapter/OSXAdapter.java
 +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