[SCM] bindex packaging branch, master, updated. debian/2.2-2-2-g469ecb2

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit d398b98d87dc4c72dc9de6e3d9a5c38f91bddc0a
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Sun Oct 23 23:27:12 2011 +0200

    Fix call to new bnd "buildx" command.

diff --git a/debian/changelog b/debian/changelog
index ab2d4a8..5e7812b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+bindex (2.2-3) unstable; urgency=low
+
+  * Fix call to new bnd "buildx" command.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 23 Oct 2011 23:26:35 +0200
+
 bindex (2.2-2) unstable; urgency=low
 
   [ Andres Mejia ]
diff --git a/debian/libbindex-java.install b/debian/libbindex-java.install
index 3d76e59..84008c5 100644
--- a/debian/libbindex-java.install
+++ b/debian/libbindex-java.install
@@ -1,2 +1,2 @@
+dist/bindex-2.2.jar usr/share/java/
 
-bindex-2.2.jar usr/share/java/
diff --git a/debian/rules b/debian/rules
index 46ad7df..291a6bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,12 @@ CLASSPATH:= /usr/share/ant/lib/ant.jar:$(JAR_BASE)/kxml2-min.jar:$(JAR_BASE)/org
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	mkdir -p bin; \
+	mkdir -p bin dist; \
 	javac -classpath $(CLASSPATH) -d bin $(shell find src -name *.java); \
-	bnd build -output bindex-$(VERSION).jar bindex.bnd;
+	bnd buildx -output dist/bindex-$(VERSION).jar bindex.bnd;
 
 override_dh_clean:
-	rm -f bindex-$(VERSION).jar
-	rm -rf bin
+	rm -rf bin dist
 	dh_clean
 
 svnURL := http://www.osgi.org/svn/public/trunk/org.osgi.impl.bundle.bindex/

-- 
bindex packaging