* Add liblog4j1.2-java to build dependencies.
authorgregor herrmann <gregoa@debian.org>
Wed, 29 Aug 2007 21:20:08 +0000 (21:20 -0000)
committergregor herrmann <gregoa@debian.org>
Wed, 29 Aug 2007 21:20:08 +0000 (21:20 -0000)
debian/changelog
debian/control
debian/install
debian/links
debian/patches/00list
debian/patches/04_logger.dpatch [new file with mode: 0755]

index daf11ab..df1d8e0 100644 (file)
@@ -1,8 +1,9 @@
 jabref (2.3~beta2-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Add liblog4j1.2-java to build dependencies.
 
- -- gregor herrmann <gregor+debian@comodo.priv.at>  Wed, 29 Aug 2007 22:37:39 +0200
+ -- gregor herrmann <gregor+debian@comodo.priv.at>  Wed, 29 Aug 2007 23:11:12 +0200
 
 jabref (2.3~beta1-2) unstable; urgency=low
 
index b3b8ffa..ba365b0 100644 (file)
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: gregor herrmann <gregor+debian@comodo.priv.at>
 Uploaders: tony mancill <tmancill@debian.org>
 Build-Depends: debhelper (>= 5.0.0), dpatch
-Build-Depends-Indep: java-gcj-compat-dev, ant, imagemagick
+Build-Depends-Indep: java-gcj-compat-dev, ant, imagemagick, liblog4j1.2-java
 Standards-Version: 3.7.2
 XS-Vcs-Svn: http://svn.toastfreeware.priv.at/debian/jabref/trunk/
 XS-Vcs-Browser: http://svn.toastfreeware.priv.at/wsvn/ToastfreewareDebian/jabref/trunk/
index b018c1e..5c7c0f8 100644 (file)
@@ -1,4 +1,4 @@
-build/lib/JabRef-2.3b.jar usr/share/java
+build/lib/JabRef-2.3b2.jar usr/share/java
 jabref usr/bin
 build/*.xpm usr/share/pixmaps
 debian/jabref.desktop usr/share/applications
index 03edd05..0c7c01b 100644 (file)
@@ -1 +1 @@
-usr/share/java/JabRef-2.3b.jar usr/share/java/jabref.jar
+usr/share/java/JabRef-2.3b2.jar usr/share/java/jabref.jar
index eaab941..59e43cc 100644 (file)
@@ -1,2 +1,3 @@
 01_free_javac
 03_external_apps
+04_logger
diff --git a/debian/patches/04_logger.dpatch b/debian/patches/04_logger.dpatch
new file mode 100755 (executable)
index 0000000..7ad9fca
--- /dev/null
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_logger.dpatch by  <gregor+debian@comodo.priv.at>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Logger.GLOBAL_LOGGER_NAME is to new for liblog4j1.2-java
+
+@DPATCH@
+diff -urNad jabref~/src/java/net/sf/jabref/Globals.java jabref/src/java/net/sf/jabref/Globals.java
+--- jabref~/src/java/net/sf/jabref/Globals.java        2007-08-29 22:34:03.000000000 +0200
++++ jabref/src/java/net/sf/jabref/Globals.java 2007-08-29 23:13:39.000000000 +0200
+@@ -153,7 +153,7 @@
+     public static final int NEWLINE_LENGTH = System.getProperty("line.separator").length();
+     // Instantiate logger:
+-    private static Logger logger = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
++    private static Logger logger = Logger.getLogger("global");
+     /**
+        * true if we have unix newlines