[apache-log4j1.2] 26/40: Revert "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 373c26bf6eb8b9ae891074c196bb84c8e205c8ea
Author: Hilko Bengen <bengen at debian.org>
Date:   Mon Jul 27 17:04:01 2015 +0000

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

diff --git a/debian/changelog b/debian/changelog
index 18de0e5..7ebf975 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.
diff --git a/debian/rules b/debian/rules
index af01837..ee29cd8 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