[jabref] 459/459: Merge branch 'deb2.10+ds' of git+ssh://git.toastfreeware.priv.at/debian/jabref into deb2.10+ds

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch master
in repository jabref.

commit 738e3eedae9682f113764ce463658870a0ae9e38
Merge: cec819b 1a67101
Author: tony mancill <tmancill at debian.org>
Date:   Fri Dec 4 22:36:33 2015 -0800

    Merge branch 'deb2.10+ds' of git+ssh://git.toastfreeware.priv.at/debian/jabref into deb2.10+ds

 debian/changelog      |  7 +++++++
 debian/compat         |  2 +-
 debian/control        |  3 +--
 debian/copyright      | 52 +++++++++++++++++++++++++--------------------------
 debian/jabref.install |  1 -
 debian/rules          |  2 --
 6 files changed, 35 insertions(+), 32 deletions(-)

diff --cc debian/changelog
index ec60435,19819a7..b3ec889
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,16 @@@
 -jabref (2.10+ds-5) UNRELEASED; urgency=medium
 +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 at debian.org>  Wed, 21 Oct 2015 20:30:24 -0700
 + -- tony mancill <tmancill at debian.org>  Fri, 04 Dec 2015 22:34:55 -0800
  
  jabref (2.10+ds-4) unstable; urgency=medium
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git