[SCM] bindex packaging branch, master, updated. debian/2.2-3-9-gb4fcfa4

[Damien Raude-Morvan]

The following commit has been merged in the master branch:
commit 8b9fb9ded7fe7276dfe818eb09cea9b633bff9ac
Author: Damien Raude-Morvan <drazzib at debian.org>
Date:   Tue Nov 8 02:06:47 2011 +0100

    Fix bnd.bnd location and version extract.

diff --git a/debian/rules b/debian/rules
index ada26aa..3b615d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 PACKAGE			:= $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
-VERSION			:= $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//')
+VERSION			:= $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//' | sed -e 's/\+svn.*//')
 JAVA_HOME		:= /usr/lib/jvm/default-java/
 JAR_BASE		:= /usr/share/java
 CLASSPATH:= /usr/share/ant/lib/ant.jar:$(JAR_BASE)/kxml2-min.jar:$(JAR_BASE)/org.osgi.service.obr.jar:$(JAR_BASE)/osgi.core.jar:$(JAR_BASE)/junit4.jar:$(JAR_BASE)/bnd.annotation.jar
@@ -12,7 +12,7 @@ CLASSPATH:= /usr/share/ant/lib/ant.jar:$(JAR_BASE)/kxml2-min.jar:$(JAR_BASE)/org
 override_dh_auto_build:
 	mkdir -p bin dist; \
 	javac -classpath $(CLASSPATH) -d bin $(shell find src -name *.java); \
-	bnd buildx -output dist/bindex-$(VERSION).jar bindex.bnd;
+	bnd buildx -output dist/bindex-$(VERSION).jar bnd.bnd;
 
 override_dh_clean:
 	rm -rf bin dist

-- 
bindex packaging