Merge tag 'debian/2.10+ds-5'
authorgregor herrmann <gregoa@debian.org>
Sun, 13 Dec 2015 16:47:58 +0000 (17:47 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 13 Dec 2015 16:47:58 +0000 (17:47 +0100)
jabref Debian release 2.10+ds-5

debian/changelog
debian/compat
debian/control
debian/copyright
debian/jabref.install
debian/patches/series
debian/patches/upstream_1240.patch [new file with mode: 0644]
debian/rules

index 3560ad2..971c008 100644 (file)
@@ -12,6 +12,20 @@ jabref (2.11~beta3+ds-1) UNRELEASED; urgency=medium
 
  -- 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.
index 45a4fb7..ec63514 100644 (file)
@@ -1 +1 @@
-8
+9
index 7116169..5aa18fc 100644 (file)
@@ -3,12 +3,11 @@ Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
 Section: tex
 Priority: optional
-Build-Depends: debhelper (>= 8)
+Build-Depends: debhelper (>= 9)
 Build-Depends-Indep: ant,
                      antlr,
                      antlr3,
                      default-jdk,
-                     imagemagick,
                      libcommons-cli-java (>= 1.3.1),
                      libcommons-logging-java,
                      libglazedlists-java,
index bef29fd..588a503 100644 (file)
@@ -108,13 +108,13 @@ Files: src/main/java/net/sf/jabref/about/AnimationListener.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/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/main/java/net/sf/jabref/SimpleUrlDragDrop.java
  src/main/java/net/sf/jabref/UrlDragDrop.java
@@ -253,7 +253,7 @@ Files: debian/repack.stub
 Copyright: 2009, Ryan Niebur <ryan@debian.org>
 License: Artistic or GPL-1+
 
-License: BSD-3
+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:
  .
index 051d620..0e1ef7b 100644 (file)
@@ -1,4 +1,3 @@
 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
index 9ed273d..a505911 100644 (file)
@@ -1,3 +1,4 @@
 debian_libs.patch
 mrDlib_jayatana.patch
 generated_JabRefPlugin.java.patch
+upstream_1240.patch
diff --git a/debian/patches/upstream_1240.patch b/debian/patches/upstream_1240.patch
new file mode 100644 (file)
index 0000000..6b21624
--- /dev/null
@@ -0,0 +1,35 @@
+commit dd4676b6cc75f0ce38cf44843ab7abea89249fb1
+Author: Leonardo Haddad <leeohaddad@usp.br>
+Date:   Tue Oct 28 01:46:39 2014 -0200
+
+    Fixed bug #1240. Now, strings with length of one character can be included and no exception is thrown by the system.
+
+--- a/src/help/About.html
++++ b/src/help/About.html
+@@ -81,7 +81,8 @@
+         David Weitzman,
+         Seb Wills,
+         John Zedlewski,
+-        Waluyo Adi Siswanto</p>
++        Waluyo Adi Siswanto,
++        Leonardo Haddad Carlos</p>
+         <h2>Thanks to:</h2>
+--- a/src/java/net/sf/jabref/BibtexString.java
++++ b/src/java/net/sf/jabref/BibtexString.java
+@@ -1,4 +1,4 @@
+-/*  Copyright (C) 2003-2011 JabRef contributors.
++/*  Copyright (C) 2003-2014 JabRef contributors.
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2 of the License, or
+@@ -67,7 +67,7 @@
+         }
+         public static final Type get(String name) {
+-              if (name.length() == 0) {
++              if (name.length() <= 1) {
+                       return OTHER;
+               }
+             if (!(name.charAt(1) + "").toUpperCase().equals(
index 51afbdf..8c4b25a 100755 (executable)
@@ -10,8 +10,6 @@ override_dh_auto_clean:
 override_dh_auto_build:
        JAVA_HOME=/usr/lib/jvm/default-java ANT_OPTS=-D"file.encoding=UTF-8" \
                dh_auto_build
-       convert -geometry 32x32 src/main/resources/images/JabRef-icon-48.png build/jabref32.xpm
-       convert -geometry 16x16 src/main/resources/images/JabRef-icon-48.png build/jabref16.xpm
 
 override_dh_auto_test:
        ANT_OPTS=-Dfile.encoding=iso-8859-1 ant compiletest