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

[Hilko Bengen]

Author: bengen
Date: 2015-07-27 17:04:01 +0000 (Mon, 27 Jul 2015)
New Revision: 18790

Modified:
   trunk/apache-log4j1.2/debian/changelog
   trunk/apache-log4j1.2/debian/rules
Log:
Revert "Transition to bnd 2.1.0"

Modified: trunk/apache-log4j1.2/debian/changelog
===================================================================
--- trunk/apache-log4j1.2/debian/changelog	2015-07-26 00:00:34 UTC (rev 18789)
+++ trunk/apache-log4j1.2/debian/changelog	2015-07-27 17:04:01 UTC (rev 18790)
@@ -1,10 +1,3 @@
-apache-log4j1.2 (1.2.17-6) unstable; urgency=medium
-
-  * Team upload.
-  * Transition to bnd 2.1.0. Update bnd parameters in debian/rules.
-
- -- Markus Koschany <apo at gambaru.de>  Thu, 04 Jun 2015 19:51:14 +0200
-
 apache-log4j1.2 (1.2.17-5) unstable; urgency=medium
 
   * Team upload.

Modified: trunk/apache-log4j1.2/debian/rules
===================================================================
--- trunk/apache-log4j1.2/debian/rules	2015-07-26 00:00:34 UTC (rev 18789)
+++ trunk/apache-log4j1.2/debian/rules	2015-07-27 17:04:01 UTC (rev 18790)
@@ -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