From: gregor herrmann Date: Mon, 26 Oct 2015 00:43:18 +0000 (+0100) Subject: Merge tag 'debian/2.10+ds-4' X-Git-Url: https://git.toastfreeware.priv.at/debian/jabref.git/commitdiff_plain/5bf49c85463d8d22270c44e0521e2ce8711b99bc Merge tag 'debian/2.10+ds-4' jabref Debian release 2.10+ds-4 --- 5bf49c85463d8d22270c44e0521e2ce8711b99bc diff --cc debian/changelog index 8df1ef5,618137d..3560ad2 --- a/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 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 Mon, 19 Oct 2015 20:46:41 -0700 + jabref (2.10+ds-3) unstable; urgency=medium [ tony mancill ] diff --cc debian/copyright index ae4ba3b,287970c..bef29fd --- a/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