[jabref] 86/459: * Add liblog4j1.2-java to build dependencies.

[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 002301e671051b416d0f3d7658a838e5397e1dd7
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Aug 29 21:20:08 2007 +0000

    * Add liblog4j1.2-java to build dependencies.
---
 debian/changelog                |  3 ++-
 debian/control                  |  2 +-
 debian/install                  |  2 +-
 debian/links                    |  2 +-
 debian/patches/00list           |  1 +
 debian/patches/04_logger.dpatch | 19 +++++++++++++++++++
 6 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index daf11ab..df1d8e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at comodo.priv.at>  Wed, 29 Aug 2007 22:37:39 +0200
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Wed, 29 Aug 2007 23:11:12 +0200
 
 jabref (2.3~beta1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b3b8ffa..ba365b0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: gregor herrmann <gregor+debian at comodo.priv.at>
 Uploaders: tony mancill <tmancill at 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/
diff --git a/debian/install b/debian/install
index b018c1e..5c7c0f8 100644
--- a/debian/install
+++ b/debian/install
@@ -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
diff --git a/debian/links b/debian/links
index 03edd05..0c7c01b 100644
--- a/debian/links
+++ b/debian/links
@@ -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
diff --git a/debian/patches/00list b/debian/patches/00list
index eaab941..59e43cc 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -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
index 0000000..7ad9fca
--- /dev/null
+++ b/debian/patches/04_logger.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_logger.dpatch by  <gregor+debian at 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
+
+ at 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

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