[apache-log4j1.2] 25/40: Transition to bnd 2.1.0

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository apache-log4j1.2.

commit 5318fcee8676017ce625d014ee72cc39fe0994b6
Author: Markus Koschany <apo at debian.org>
Date:   Thu Jun 4 17:52:11 2015 +0000

    Transition to bnd 2.1.0
---
 debian/changelog | 7 +++++++
 debian/rules     | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7ebf975..18de0e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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.
diff --git a/debian/rules b/debian/rules
index ee29cd8..af01837 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,10 +20,10 @@ clean::
 
 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

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