[jffi] 01/06: Revert "Re-establish compatibility with bnd 1.50.0"

Markus Koschany apo-guest at moszumanska.debian.org
Wed Nov 18 15:30:52 UTC 2015


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

apo-guest pushed a commit to branch master
in repository jffi.

commit 22809a52f81f038f4ea70bfa37e778c24811e468
Author: Markus Koschany <apo at debian.org>
Date:   Wed Nov 18 15:59:23 2015 +0100

    Revert "Re-establish compatibility with bnd 1.50.0"
    
    This reverts commit ef494ba393ac5294b432a720b5156ae119ac4c65.
---
 debian/control | 2 +-
 debian/rules   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index f3478ba..77bc924 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
  maven-debian-helper,
  libmaven-antrun-plugin-java, libmaven-assembly-plugin-java,
  maven-repo-helper, libffi-dev, pkg-config, ant,
- ant-optional, default-jdk, junit4, bnd,
+ ant-optional, default-jdk, junit4, bnd (>= 2.1.0),
  libltdl-dev
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/jffi.git
diff --git a/debian/rules b/debian/rules
index 6eb227b..93c9ce0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,8 @@ override_jh_manifest:
 
 	# generate OSGi metadata
 	-test -f $(JAR) && \
-	bnd wrap -properties debian/jffi.bnd -output $(JAR) $(JAR)
+	bnd wrap --properties debian/jffi.bnd --output $(JAR).tmp $(JAR)
+	mv $(JAR).tmp $(JAR)
 
 override_dh_clean:
 	ant clean

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



More information about the pkg-java-commits mailing list