Merge tag 'debian/2.10+ds-4'

jabref Debian release 2.10+ds-4

diff --combined 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 --combined debian/control
index 4fe43609e157acd19b076a127f59ba7fffa5e8db,f93fe7d7edd1875bb19646905007d5347e335b85..711616963768cd93dd3d00a5eae8d9e6fe4d7fc6
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -9,14 -9,12 +9,14 @@@ Build-Depends-Indep: ant
                       antlr3,
                       default-jdk,
                       imagemagick,
 +                     libcommons-cli-java (>= 1.3.1),
                       libcommons-logging-java,
                       libglazedlists-java,
                       libjempbox-java (>= 1:1.5.0),
                       libjgoodies-common-java (>= 1.4.0),
                       libjgoodies-forms-java (>= 1.6.0),
                       libjgoodies-looks-java (>= 2.4.0),
 +                     libjna-java,
                       libjpf-java,
                       libjpfcodegen-java,
                       liblog4j1.2-java,
@@@ -27,7 -25,7 +27,7 @@@
                       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/
@@@ -41,14 -39,12 +41,14 @@@ Depends: ${misc:Depends}
           antlr3,
           default-jre (>= 2:1.6) | java6-runtime,
           java-wrappers,
 +         libcommons-cli-java (>= 1.3.1),
           libcommons-logging-java,
           libglazedlists-java,
           libjempbox-java (>= 1:1.5.0),
           libjgoodies-common-java (>= 1.4.0),
           libjgoodies-forms-java (>= 1.6.0),
           libjgoodies-looks-java (>= 2.4.0),
 +         libjna-java,
           libjpf-java,
           libjpfcodegen-java,
           libmicroba-java,

diff --combined debian/copyright
index ae4ba3b97f32eab17ddaf0193b8d95894e448a8d,287970c310c4630eca11ee908eb81c6032546d78..bef29fd483f852b1350dc62e3eb246bc4ac6c71a
--- 1/debian/copyright
--- 2/debian/copyright
+++ b/debian/copyright
@@@ -1,35 -1,33 +1,35 @@@
  Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
  Upstream-Name: JabRef
 -Upstream-Contact: Morten Alver, Nizar Batada
 +Upstream-Contact: Morten Alver, Nizar Batada, Oliver Kopp
  Source: http://jabref.sourceforge.net/
  Comment: The +ds version is created by removing lib/, buildlib/, gradle/, osx/:
   contain sourceless pre-compiled libraries which are not used anyway
  
  Files: *
 -Copyright: 2003-2014, Morten Alver <mortenalver@users.sourceforge.net>
 - 2003-2014, Nizar Batada <nbatada@users.sourceforge.net>
 +Copyright: 2003-2015, Morten Alver <mortenalver@users.sourceforge.net>
 + 2003-2015, Nizar Batada <nbatada@users.sourceforge.net>
 + 2003-2015, Oliver Kopp <oliver.kopp@gmail.com>
 +License: GPL-2+
 +
 +Files: htdocs-helper/generate-htdocs-help-from-jabref-src-help.pl
 +Copyright: 2012, Kolja Brix
 + 2012, Oliver Kopp
  License: GPL-2
  
  Files: jabref.ebuild
  Copyright: 1999-2012 Gentoo Foundation
  License: GPL-2
  
 -Files: src/images/*
 +Files: src/main/resources/images/*
  Copyright: 2006-2007, Everaldo Coelho <everaldo@everaldo.com>
  License: LGPL-2.1
  Comment: The majority of icons are from the Crystal Clear icon set
  
 -Files: src/java/gnu/dtools/ritopt/*
 -Copyright: 2001, Damian Ryan Eads
 -License: GPL-2+
 -
 -Files: src/manuals/de/JabRef-UserManual_de.tex
 +Files: src/main/tex/manuals/de/JabRef-UserManual_de.tex
  Copyright: 2005-2010, Dominik Waßenhoven
  License: CC-BY-SA-3.0
  
 -Files: src/tests/net/sf/jabref/bst/abbrv.bst
 +Files: src/test/resources/net/sf/jabref/bst/abbrv.bst
  Copyright: 1985, unknown
  License: other
   % BibTeX standard bibliography style `abbrv'
@@@ -46,157 -44,161 +46,157 @@@ Comment: This is the standard abbrv.bs
  
  Files: src/resource/layout/tablerefsabsbib/tablerefsabsbib.begin.layout
   src/resource/layout/tablerefs/tablerefs.begin.layout
 +Files: src/main/resources/resource/layout/tablerefsabsbib/tablerefsabsbib.begin.layout
 + src/main/resources/resource/layout/tablerefs/tablerefs.begin.layout
 + src/main/resources/resource/layout/listrefs/listrefs.begin.layout
  Copyright: 2006-2011, Mark Schenk
  License: CC-BY-3.0
  
 -Files: src/java/jalopy.format.convention.xml
 - src/java/net/sf/jabref/export/layout/format/CreateDocBookAuthors.java
 - src/java/net/sf/jabref/export/layout/format/XMLChars.java
 - src/java/net/sf/jabref/export/layout/format/CreateBibORDFAuthors.java
 - src/java/net/sf/jabref/export/layout/format/RemoveBracketsAddComma.java
 - src/java/net/sf/jabref/export/layout/format/RemoveTilde.java
 - src/java/net/sf/jabref/export/layout/format/RemoveWhitespace.java
 - src/java/net/sf/jabref/export/layout/format/GetOpenOfficeType.java
 - src/java/net/sf/jabref/export/layout/format/RemoveBrackets.java
 - src/java/net/sf/jabref/export/layout/format/CreateDocBookEditors.java
 - src/java/net/sf/jabref/export/layout/format/AuthorLastFirst.java
 +Files: src/main/java/net/sf/jabref/export/layout/StringInt.java
 + src/main/java/net/sf/jabref/export/layout/WSITools.java
 + src/main/java/net/sf/jabref/export/layout/format/AuthorFirstFirst.java
 + src/main/java/net/sf/jabref/export/layout/format/CreateBibORDFAuthors.java
 + src/main/java/net/sf/jabref/export/layout/format/CreateDocBookAuthors.java
 + src/main/java/net/sf/jabref/export/layout/format/CreateDocBookEditors.java
 + src/main/java/net/sf/jabref/export/layout/format/GetOpenOfficeType.java
 + src/main/java/net/sf/jabref/export/layout/format/JournalAbbreviator.java
 + src/main/java/net/sf/jabref/export/layout/format/RemoveBrackets.java
 + src/main/java/net/sf/jabref/export/layout/format/RemoveBracketsAddComma.java
 + src/main/java/net/sf/jabref/export/layout/format/RemoveTilde.java
 + src/main/java/net/sf/jabref/export/layout/format/RemoveWhitespace.java
 + src/main/java/net/sf/jabref/export/layout/format/XMLChars.java
  Copyright: Dept. Computer Architecture, University of Tuebingen, Germany
  License: GPL-2
  
 -Files: src/java/net/sf/jabref/KeyCollisionException.java
 +Files: src/main/java/net/sf/jabref/KeyCollisionException.java
  Copyright: 2003, David Weitzman
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/BibtexEntryType.java
 - src/java/net/sf/jabref/BibtexDatabase.java
 - src/java/net/sf/jabref/BibtexEntry.java
 +Files: src/main/java/net/sf/jabref/BibtexEntryType.java
 + src/main/java/net/sf/jabref/BibtexDatabase.java
 + src/main/java/net/sf/jabref/BibtexEntry.java
  Copyright: 2003, David Weitzman
   2003, Morten O. Alver
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/imports/BibtexParser.java
 +Files: src/main/java/net/sf/jabref/imports/BibtexParser.java
  Copyright: 2003-2006, David Weitzman
   2003-2006, Nizar N. Batada
   2003-2006, Morten O. Alver
   2003-2006, Christopher Oezbek
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/FieldTextMenu.java
 - src/java/net/sf/jabref/wizard/text/TagToMarkedTextStore.java
 - src/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java
 - src/java/net/sf/jabref/wizard/text/gui/OverlayPanel.java
 - src/java/net/sf/jabref/wizard/auximport/AuxCommandLine.java
 - src/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java
 - src/java/net/sf/jabref/wizard/auximport/AuxSubGenerator.java
 - src/java/net/sf/jabref/wizard/integrity/IntegrityMessage.java
 - src/java/net/sf/jabref/wizard/integrity/IntegrityCheck.java
 - src/java/net/sf/jabref/wizard/integrity/gui/IntegrityWizard.java
 - src/java/net/sf/jabref/wizard/integrity/gui/IntegrityMessagePanel.java
 +Files: src/main/java/net/sf/jabref/FieldTextMenu.java
 + src/main/java/net/sf/jabref/wizard/text/TagToMarkedTextStore.java
 + src/main/java/net/sf/jabref/wizard/text/gui/TextInputDialog.java
 + src/main/java/net/sf/jabref/wizard/text/gui/OverlayPanel.java
 + src/main/java/net/sf/jabref/wizard/auximport/AuxCommandLine.java
 + src/main/java/net/sf/jabref/wizard/auximport/gui/FromAuxDialog.java
 + src/main/java/net/sf/jabref/wizard/auximport/AuxSubGenerator.java
 + src/main/java/net/sf/jabref/wizard/integrity/IntegrityMessage.java
 + src/main/java/net/sf/jabref/wizard/integrity/IntegrityCheck.java
 + src/main/java/net/sf/jabref/wizard/integrity/gui/IntegrityWizard.java
 + src/main/java/net/sf/jabref/wizard/integrity/gui/IntegrityMessagePanel.java
  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
  
 -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
  
 -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
 -
 -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+
  
 -Files: src/java/net/sf/jabref/SearchRuleSet.java
 - src/java/net/sf/jabref/SearchRule.java
 +Files: src/main/java/net/sf/jabref/SearchRuleSet.java
 + src/main/java/net/sf/jabref/SearchRule.java
  Copyright: 2003, Nathan Dunn
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/SimpleSearchRule.java
 - src/java/net/sf/jabref/DatabaseSearch.java
 +Files: src/main/java/net/sf/jabref/SimpleSearchRule.java
 + src/main/java/net/sf/jabref/DatabaseSearch.java
  Copyright: 2003, Nathan Dunn
   2003, Morten O. Alver
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/label/BookLabelRule.java
 - src/java/net/sf/jabref/label/InproceedingsLabelRule.java
 +Files: src/main/java/net/sf/jabref/label/BookLabelRule.java
 + src/main/java/net/sf/jabref/label/InproceedingsLabelRule.java
  Copyright: 2003, Nathan Dunn
   2003, Morten O. Alver
   2003, Nizar N. Batada
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/export/layout/format/ToLowerCase.java
 +Files: src/main/java/net/sf/jabref/export/layout/format/ToLowerCase.java
  Copyright: Egon Willighagen
  License: GPL-2
  
 -Files: src/java/net/sf/jabref/export/layout/format/CurrentDate.java
 +Files: src/main/java/net/sf/jabref/export/layout/format/CurrentDate.java
  Copyright: 2005, Andreas Rudert
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/util/CaseChangeMenu.java
 - src/java/net/sf/jabref/util/CaseChanger.java
 +Files: src/main/java/net/sf/jabref/util/CaseChangeMenu.java
 + src/main/java/net/sf/jabref/util/CaseChanger.java
  Copyright: 2003, Moritz Ringler
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/imports/DBLPHelper.java
 - src/java/net/sf/jabref/imports/DBLPParseException.java
 +Files: src/main/java/net/sf/jabref/imports/DBLPHelper.java
 + src/main/java/net/sf/jabref/imports/DBLPParseException.java
  Copyright: 2011, Sascha Hunold
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/imports/BooleanAssign.java
 +Files: src/main/java/net/sf/jabref/imports/BooleanAssign.java
  Copyright: 2003-2011, M. Spiegel
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/imports/ACMPortalFetcher.java
 +Files: src/main/java/net/sf/jabref/imports/ACMPortalFetcher.java
  Copyright: 2003-2011, Aaron Chen
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/imports/PdfContentImporter.java
 -Copyright: 2011, Oliver Kopp
 -License: GPL-2+
 -
 -Files: src/java/net/sf/jabref/FontSelectorDialog.java
 +Files: src/main/java/net/sf/jabref/FontSelectorDialog.java
  Copyright: 1999-2002, Sylvain Reynal
   2000, 2001, Slava Pestov
   1999, Jason Ginchereau
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/imports/ImportCustomizationDialog.java
 - src/java/net/sf/jabref/imports/ZipFileChooser.java
 - src/java/net/sf/jabref/imports/CustomImportList.java
 - src/java/net/sf/jabref/imports/RepecNepImporter.java
 +Files: src/main/java/net/sf/jabref/imports/ImportCustomizationDialog.java
 + src/main/java/net/sf/jabref/imports/ZipFileChooser.java
 + src/main/java/net/sf/jabref/imports/CustomImportList.java
 + src/main/java/net/sf/jabref/imports/RepecNepImporter.java
  Copyright: 2005, Andreas Rudert
  License: GPL-2+
  
 -Files: src/java/net/sf/jabref/PdfPreviewPanel.java
 +Files: src/main/java/net/sf/jabref/PdfPreviewPanel.java
  Copyright: 2012, Meltem Meltem Demirköprü
   2012, Ahmad Hammoud
   2012, Oliver Kopp
  License: GPL-3+
  
 -Files: src/java/org/xnap/commons/gui/shortcut/EmacsKeyBindings.java
 +Files: src/main/java/org/xnap/commons/gui/shortcut/EmacsKeyBindings.java
  Copyright: 2005, Steffen Pingel
   2005, Felix Berger
  License: LGPL-2.1+
  
 -Files: src/java/net/sf/jabref/export/layout/format/Iso690FormatDate.java
 - src/java/net/sf/jabref/export/layout/format/Iso690NamesAuthors.java
 +Files: src/main/java/net/sf/jabref/export/layout/format/Iso690FormatDate.java
 + src/main/java/net/sf/jabref/export/layout/format/Iso690NamesAuthors.java
  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
@@@ -232,7 -234,7 +232,7 @@@
      (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN
      ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
 -Files: src/windows/nsis/setup.nsi
 +Files: src/main/resources/windows/nsis/setup.nsi
  Copyright: Uwe Stöhr and others
  License: GPL-3
  Comment: The upstream distribution does not contain an explicit statement of
@@@ -241,8 -243,8 +241,8 @@@
   its respective authors unless otherwise stated.
  
  Files: debian/*
 -Copyright: 2005-2014, gregor herrmann <gregoa@debian.org>
 - 2005-2014, tony mancill <tmancill@debian.org>
 +Copyright: 2005-2015, gregor herrmann <gregoa@debian.org>
 + 2005-2015, tony mancill <tmancill@debian.org>
  License: GPL-2
  
  Files: debian/patches/mrDlib_jayatana.patch