Merge tag 'debian/2.10+ds-5'

jabref Debian release 2.10+ds-5

diff --cc debian/changelog
index 3560ad2db22289c09f95fdf5f054533b4115c105,b3ec8890c2a18f38e252f4c37689a04e41d52dc0..971c0084cd00c2a3077ee05ce030ad2ca3ac64c2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,17 +1,31 @@@
 +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-5) unstable; urgency=medium
+ 
+   [ tony mancill ]
+   * Apply patch for error thrown for 1-character strings.
+     See: http://sourceforge.net/p/jabref/bugs/1240/
+ 
+   [ gregor herrmann ]
+   * Drop creation and installation of xpm file.
+     Not needed since the menu file is gone.
+   * debian/copyright: rename BSD-3 to BSD-3-clause. Thanks to cme.
+   * Bump debhelper compatibility level to 9.
+ 
+  -- tony mancill <tmancill@debian.org>  Fri, 04 Dec 2015 22:34:55 -0800
+ 
  jabref (2.10+ds-4) unstable; urgency=medium
  
    * Drop /usr/lib/ure/share/java from the build-time classpath.

diff --cc debian/control
index 711616963768cd93dd3d00a5eae8d9e6fe4d7fc6,69c6d448f852043b88954ee8191712f5b3ddbe48..5aa18fc959af91e086cf532339a41918034ed507
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -8,8 -8,6 +8,7 @@@ Build-Depends-Indep: ant
                       antlr,
                       antlr3,
                       default-jdk,
-                      imagemagick,
 +                     libcommons-cli-java (>= 1.3.1),
                       libcommons-logging-java,
                       libglazedlists-java,
                       libjempbox-java (>= 1:1.5.0),

diff --cc debian/copyright
index bef29fd483f852b1350dc62e3eb246bc4ac6c71a,38418b91284be9daa492880ed5b481a15d5ae50a..588a5030fdc713f131c7eefba20144a3978a88ab
--- 1/debian/copyright
--- 2/debian/copyright
+++ b/debian/copyright
@@@ -100,24 -93,29 +100,24 @@@ Files: src/main/java/net/sf/jabref/Fiel
  Copyright: 2004, R. Nagel
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/about/AnimationListener.java
 - src/java/net/sf/jabref/about/AboutPanel.java
 - src/java/net/sf/jabref/about/AboutTextLine.java
 - src/java/net/sf/jabref/about/TextBlock.java
 - src/java/net/sf/jabref/about/ExtendedInfoPanel.java
 - src/java/net/sf/jabref/about/About2.java
 - src/java/net/sf/jabref/util/TBuildInfo.java
 +Files: src/main/java/net/sf/jabref/about/AnimationListener.java
 + src/main/java/net/sf/jabref/about/AboutPanel.java
 + src/main/java/net/sf/jabref/about/AboutTextLine.java
 + src/main/java/net/sf/jabref/about/TextBlock.java
 + src/main/java/net/sf/jabref/about/ExtendedInfoPanel.java
 + src/main/java/net/sf/jabref/about/About2.java
 + src/main/java/net/sf/jabref/util/TBuildInfo.java
  Copyright: 2005, Raik Nagel <kiar@users.sourceforge.net>
- License: BSD-3
+ License: BSD-3-clause
  
 -Files: src/java/net/sf/jabref/util/TXMLReader.java
 - src/java/net/sf/jabref/BibtexFields.java
 - src/java/net/sf/jabref/gui/date/DatePickerButton.java
 +Files: src/main/java/net/sf/jabref/util/TXMLReader.java
 + src/main/java/net/sf/jabref/BibtexFields.java
 + src/main/java/net/sf/jabref/gui/date/DatePickerButton.java
  Copyright: 2006, Raik Nagel <kiar@users.sourceforge.net>
- License: BSD-3
+ License: BSD-3-clause
  
 -Files: src/java/com/jgoodies/uif_lite/component/UIFSplitPane.java
 - src/java/com/jgoodies/uif_lite/panel/SimpleInternalFrame.java
 -Copyright: 2003, 2004 JGoodies Karsten Lentzsch.
 -License: BSD-3-clause
 -
 -Files: src/java/net/sf/jabref/SimpleUrlDragDrop.java
 - src/java/net/sf/jabref/UrlDragDrop.java
 +Files: src/main/java/net/sf/jabref/SimpleUrlDragDrop.java
 + src/main/java/net/sf/jabref/UrlDragDrop.java
  Copyright: 2004, E. Putrycz
  License: GPL-2+
  
@@@ -253,7 -255,14 +253,7 @@@ Files: debian/repack.stu
  Copyright: 2009, Ryan Niebur <ryan@debian.org>
  License: Artistic or GPL-1+
  
- License: BSD-3
 -License: Artistic
 -    This program is free software; you can redistribute it and/or modify
 -    it under the terms of the Artistic License, which comes with Perl.
 - .
 -    On Debian systems, the complete text of the Artistic License can be
 -    found in `/usr/share/common-licenses/Artistic'.
 -
+ License: BSD-3-clause
      Redistribution and use in source and binary forms, with or without
      modification, are permitted provided that the following conditions are met:
   .

diff --cc debian/jabref.install
index 051d62007276a8bebcdf9852a89a6e5f30b4765f,197a3ab107f31f36d7edb770b4ac8d06e1a1f2bc..0e1ef7beb7a6927e1f5ba5bdfeb6e0753dc863b1
--- 1/debian/jabref.install
--- 2/debian/jabref.install
+++ b/debian/jabref.install
@@@ -1,4 -1,3 +1,3 @@@
 -build/lib/JabRef-2.10.jar usr/share/jabref
 +buildant/lib/JabRef-2.11b3.jar usr/share/jabref
- build/*.xpm usr/share/pixmaps
  debian/jabref.desktop usr/share/applications
  src/images/JabRef-icon-48.png usr/share/pixmaps

diff --cc debian/patches/series
index 9ed273db943d555597cb9cea2b18aac7b93932be,5307253d402bce46daa07a0607fc53bc568d4bdc..a505911beaeb899bbdcbe2c348c36801549c9828
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,5 +1,4 @@@
  debian_libs.patch
  mrDlib_jayatana.patch
  generated_JabRefPlugin.java.patch
 -fix-headless-bibtex-output.diff
+ upstream_1240.patch

diff --cc debian/rules
Simple merge