[pkg-java] r18910 - trunk/apache-log4j1.2/debian

[Markus Koschany]

Author: apo-guest
Date: 2015-11-17 17:41:53 +0000 (Tue, 17 Nov 2015)
New Revision: 18910

Modified:
   trunk/apache-log4j1.2/debian/README.Debian
   trunk/apache-log4j1.2/debian/changelog
   trunk/apache-log4j1.2/debian/control
   trunk/apache-log4j1.2/debian/liblog4j1.2-java-doc.doc-base
   trunk/apache-log4j1.2/debian/rules
Log:
Release 1.2.17-7


Modified: trunk/apache-log4j1.2/debian/README.Debian
===================================================================
--- trunk/apache-log4j1.2/debian/README.Debian	2015-11-17 16:55:35 UTC (rev 18909)
+++ trunk/apache-log4j1.2/debian/README.Debian	2015-11-17 17:41:53 UTC (rev 18910)
@@ -11,11 +11,11 @@
 
     import org.apache.log4j.Logger;
     import org.apache.log4j.BasicConfigurator;
-    
+
     public class Hello {
-    
+
       static Logger logger = Logger.getLogger(Hello.class);
-    
+
       public
       static
       void main(String argv[]) {
@@ -35,24 +35,24 @@
 include log statements in your own code.
 
 
-==================   
+==================
 log4j dependencies
 ==================
-   
+
 Log4j is based on JDK 1.1 with the following additional requirements:
 
     ----------------------------
-    Package org.apache.log4j.xml 
+    Package org.apache.log4j.xml
     ----------------------------
 
     The DOMConfigurator is based on the DOM Level 1 API. The
     DOMConfigurator.configure(Element) method will work with any
     XML parser that will pass it a DOM tree.
-    
+
     The DOMConfigurator.configure(String filename) method and its variants
     require a JAXP compatible XMLparser, for example the Apache Xerces
     parser. Compiling the DOMConfigurator requires the presence of a
-    JAXP parser in the classpath.  
+    JAXP parser in the classpath.
 
     ------------
     SMTPAppender

Modified: trunk/apache-log4j1.2/debian/changelog
===================================================================
--- trunk/apache-log4j1.2/debian/changelog	2015-11-17 16:55:35 UTC (rev 18909)
+++ trunk/apache-log4j1.2/debian/changelog	2015-11-17 17:41:53 UTC (rev 18910)
@@ -1,3 +1,11 @@
+apache-log4j1.2 (1.2.17-7) unstable; urgency=medium
+
+  * Team upload.
+  * Transition to bnd 2.1.0.
+  * Vcs-Browser: Use https.
+
+ -- Markus Koschany <apo at debian.org>  Tue, 17 Nov 2015 18:22:37 +0100
+
 apache-log4j1.2 (1.2.17-6) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/apache-log4j1.2/debian/control
===================================================================
--- trunk/apache-log4j1.2/debian/control	2015-11-17 16:55:35 UTC (rev 18909)
+++ trunk/apache-log4j1.2/debian/control	2015-11-17 17:41:53 UTC (rev 18910)
@@ -8,7 +8,7 @@
            Jakub Adam <jakub.adam at ktknet.cz>,
            Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: ant,
-               bnd,
+               bnd (>= 2.1.0),
                cdbs,
                debhelper (>= 9),
                default-jdk,
@@ -17,7 +17,7 @@
                maven-repo-helper
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/apache-log4j1.2
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/apache-log4j1.2
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/apache-log4j1.2
 Homepage: http://logging.apache.org/log4j/1.2/
 
 Package: liblog4j1.2-java

Modified: trunk/apache-log4j1.2/debian/liblog4j1.2-java-doc.doc-base
===================================================================
--- trunk/apache-log4j1.2/debian/liblog4j1.2-java-doc.doc-base	2015-11-17 16:55:35 UTC (rev 18909)
+++ trunk/apache-log4j1.2/debian/liblog4j1.2-java-doc.doc-base	2015-11-17 17:41:53 UTC (rev 18910)
@@ -1,7 +1,7 @@
 Document: liblog4j1.2-java-doc
 Title: Documenation for log4j 1.2
 Author: The Apache log4j team
-Abstract: This is the documentation for log4j, a logging library 
+Abstract: This is the documentation for log4j, a logging library
  for java. The documentation includes the javadoc API.
 Section: Programming
 

Modified: trunk/apache-log4j1.2/debian/rules
===================================================================
--- trunk/apache-log4j1.2/debian/rules	2015-11-17 16:55:35 UTC (rev 18909)
+++ trunk/apache-log4j1.2/debian/rules	2015-11-17 17:41:53 UTC (rev 18910)
@@ -20,10 +20,10 @@
 
 common-build-indep::
 	cat debian/log4j.bnd | sed s/VERSION/$(VERSION)/ > debian/.log4j-versioned.bnd
-	java -jar /usr/share/java/bnd.jar wrap -properties debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar
-	java -jar /usr/share/java/bnd.jar wrap -properties debian/.log4j-versioned.bnd \
-		-classpath /usr/share/java/javax.mail.jar \
-		-output log4j.jar dist/lib/log4j-$(VERSION).jar
+	java -jar /usr/share/java/bnd.jar wrap --properties debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar
+	java -jar /usr/share/java/bnd.jar wrap --properties debian/.log4j-versioned.bnd \
+		--classpath /usr/share/java/javax.mail.jar \
+		--output log4j.jar dist/lib/log4j-$(VERSION).jar
 	rm debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar
 	mv log4j.jar dist/lib/log4j-$(VERSION).jar
 	cp pom.xml dist/lib/log4j.javadoc.pom