Author: twerner
Date: 2011-09-25 16:48:39 +0000 (Sun, 25 Sep 2011)
New Revision: 15033
Added:
trunk/libgnuinet-java/debian/patches/0001-make-logger-static-again.patch
trunk/libgnuinet-java/debian/patches/series
trunk/libgnuinet-java/debian/source/
trunk/libgnuinet-java/debian/source/format
Modified:
trunk/libgnuinet-java/debian/changelog
trunk/libgnuinet-java/debian/compat
trunk/libgnuinet-java/debian/control
Log:
* Team upload.
* Switch to source format 3.0.
* Add a patch to revert some changes in upstream version 1.1.2 that breaks
other packages. (Closes: #641130)
* Switch to debhelper level 7.
* Update Standards-Version: 3.9.2.
Modified: trunk/libgnuinet-java/debian/changelog
===================================================================
--- trunk/libgnuinet-java/debian/changelog 2011-09-24 23:55:29 UTC (rev 15032)
+++ trunk/libgnuinet-java/debian/changelog 2011-09-25 16:48:39 UTC (rev 15033)
@@ -1,3 +1,14 @@
+libgnuinet-java (1.1.2-2) unstable; urgency=low
+
+ * Team upload.
+ * Switch to source format 3.0.
+ * Add a patch to revert some changes in upstream version 1.1.2 that breaks
+ other packages. (Closes: #641130)
+ * Switch to debhelper level 7.
+ * Update Standards-Version: 3.9.2.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 25 Sep 2011 18:45:30 +0200
+
libgnuinet-java (1.1.2-1) unstable; urgency=low
* Team upload
Modified: trunk/libgnuinet-java/debian/compat
===================================================================
--- trunk/libgnuinet-java/debian/compat 2011-09-24 23:55:29 UTC (rev 15032)
+++ trunk/libgnuinet-java/debian/compat 2011-09-25 16:48:39 UTC (rev 15033)
@@ -1 +1 @@
-5
+7
Modified: trunk/libgnuinet-java/debian/control
===================================================================
--- trunk/libgnuinet-java/debian/control 2011-09-24 23:55:29 UTC (rev 15032)
+++ trunk/libgnuinet-java/debian/control 2011-09-25 16:48:39 UTC (rev 15033)
@@ -4,8 +4,8 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Michael Koch <konqueror at gmx.de>
Build-Depends-Indep: default-jdk, ant
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.8)
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 7), cdbs (>= 0.4.8)
+Standards-Version: 3.9.2
Homepage: http://savannah.gnu.org/projects/classpath
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgnuinet-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgnuinet-java
Added: trunk/libgnuinet-java/debian/patches/0001-make-logger-static-again.patch
===================================================================
--- trunk/libgnuinet-java/debian/patches/0001-make-logger-static-again.patch (rev 0)
+++ trunk/libgnuinet-java/debian/patches/0001-make-logger-static-again.patch 2011-09-25 16:48:39 UTC (rev 15033)
@@ -0,0 +1,65 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sun, 25 Sep 2011 18:36:30 +0200
+Subject: make logger static again
+
+Revert some changes in upstream version 1.1.2 that breaks other packages.
+---
+ source/gnu/inet/imap/IMAPConnection.java | 2 +-
+ source/gnu/inet/nntp/NNTPConnection.java | 2 +-
+ source/gnu/inet/pop3/POP3Connection.java | 2 +-
+ source/gnu/inet/smtp/SMTPConnection.java | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/source/gnu/inet/imap/IMAPConnection.java b/source/gnu/inet/imap/IMAPConnection.java
+index 039644a..42745db 100644
+--- a/source/gnu/inet/imap/IMAPConnection.java
++++ b/source/gnu/inet/imap/IMAPConnection.java
+@@ -120,7 +120,7 @@ public class IMAPConnection
+ /**
+ * The logger used for IMAP protocol traces.
+ */
+- public final Logger logger = Logger.getLogger("gnu.inet.imap");
++ public static final Logger logger = Logger.getLogger("gnu.inet.imap");
+
+ /**
+ * The socket used for communication with the server.
+diff --git a/source/gnu/inet/nntp/NNTPConnection.java b/source/gnu/inet/nntp/NNTPConnection.java
+index 26898d6..172a5cf 100644
+--- a/source/gnu/inet/nntp/NNTPConnection.java
++++ b/source/gnu/inet/nntp/NNTPConnection.java
+@@ -105,7 +105,7 @@ public class NNTPConnection
+ /**
+ * The logger used for NNTP protocol traces.
+ */
+- public final Logger logger = Logger.getLogger("gnu.inet.nntp");
++ public static final Logger logger = Logger.getLogger("gnu.inet.nntp");
+
+ /**
+ * The hostname of the host we are connected to.
+diff --git a/source/gnu/inet/pop3/POP3Connection.java b/source/gnu/inet/pop3/POP3Connection.java
+index 3bdaa48..859083c 100644
+--- a/source/gnu/inet/pop3/POP3Connection.java
++++ b/source/gnu/inet/pop3/POP3Connection.java
+@@ -136,7 +136,7 @@ public class POP3Connection
+ /**
+ * The logger used for POP3 protocol traces.
+ */
+- public final Logger logger = Logger.getLogger("gnu.inet.pop3");
++ public static final Logger logger = Logger.getLogger("gnu.inet.pop3");
+
+ /**
+ * The socket used to communicate with the server.
+diff --git a/source/gnu/inet/smtp/SMTPConnection.java b/source/gnu/inet/smtp/SMTPConnection.java
+index c625f28..f97262d 100644
+--- a/source/gnu/inet/smtp/SMTPConnection.java
++++ b/source/gnu/inet/smtp/SMTPConnection.java
+@@ -124,7 +124,7 @@ public class SMTPConnection
+ /**
+ * The logger used for SMTP protocol traces.
+ */
+- public final Logger logger = Logger.getLogger("gnu.inet.smtp");
++ public static final Logger logger = Logger.getLogger("gnu.inet.smtp");
+
+ /**
+ * The underlying socket used for communicating with the server.
+--
Added: trunk/libgnuinet-java/debian/patches/series
===================================================================
--- trunk/libgnuinet-java/debian/patches/series (rev 0)
+++ trunk/libgnuinet-java/debian/patches/series 2011-09-25 16:48:39 UTC (rev 15033)
@@ -0,0 +1 @@
+0001-make-logger-static-again.patch
Added: trunk/libgnuinet-java/debian/source/format
===================================================================
--- trunk/libgnuinet-java/debian/source/format (rev 0)
+++ trunk/libgnuinet-java/debian/source/format 2011-09-25 16:48:39 UTC (rev 15033)
@@ -0,0 +1 @@
+3.0 (quilt)