[SCM] bindex packaging branch, master, updated. debian/2.2-0ubuntu1-2-g983a7ef

[Andres Mejia]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "bindex packaging".

The branch, master has been updated
       via  983a7ef6fcaaab562be555576506835fa234c3a9 (commit)
      from  93baff25b5839475242a667945e920aa35b16f96 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 983a7ef6fcaaab562be555576506835fa234c3a9
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jan 9 18:03:49 2011 -0500

    Bump to Standards-Version 3.9.1.
    Convert to pure dh with javahelper.
    Add VCS entries to debian/control.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    5 ++++-
 debian/control   |    8 +++++---
 debian/rules     |   33 +++++++++++++--------------------
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 59f2908..7d4ebba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ bindex (2.2-1) unstable; urgency=low
 
   * Upload to Debian.
   * Add Debian Java team as Maintainer, Yulia and myself as Uploaders.
+  * Bump to Standards-Version 3.9.1.
+  * Convert to pure dh with javahelper.
+  * Add VCS entries to debian/control.
 
- -- Andres Mejia <mcitadel at gmail.com>  Tue, 04 Jan 2011 20:15:34 -0500
+ -- Andres Mejia <mcitadel at gmail.com>  Sun, 09 Jan 2011 17:50:18 -0500
 
 bindex (2.2-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index 932bbff..ae52dd1 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,16 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Yulia Novozhilova <Yulia.Novozhilova at sun.com>,
  Andres Mejia <mcitadel at gmail.com>
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
+Build-Depends: debhelper (>= 7.0.50~), javahelper, default-jdk
 Build-Depends-Indep: ant, bnd, libxpp3-java, libkxml2-java, libfelix-osgi-obr-java, libequinox-osgi-java, junit4
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://www.osgi.org/Repository/BIndex
+Vcs-Git: git://git.debian.org/git/pkg-java/bindex.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/bindex.git
 
 Package: libbindex-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
+Depends: ${misc:Depends}, ${java:Depends}, default-jre-headless | java2-runtime-headless
 Description: The BIndex program 
  Is a small Java progam that implements the manifest header to repository
  format mapping as described in RFC-0112 Bundle Repository. BIndex can recurse
diff --git a/debian/rules b/debian/rules
index 2cb64a8..b13029e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,39 +1,32 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-
-PACKAGE			:= $(DEB_SOURCE_PACKAGE)
-VERSION			:= $(DEB_UPSTREAM_VERSION)
+PACKAGE			:= $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
+VERSION			:= $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//')
 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)/org.eclipse.osgi.jar:$(JAR_BASE)/junit4.jar
 
-build/lib$(PACKAGE)-java:: stamp-build-lib$(PACKAGE)-java
+%:
+	dh $@ --with javahelper
 
-# This target is here to avoid multiple invocation of build target.
-# build/$(sw-pkg) is invoked 2 times when building binary packages.
-stamp-build-lib$(PACKAGE)-java:
-	cd $(DEB_SRCDIR); \
+override_dh_auto_build:
 	mkdir -p bin; \
 	javac -classpath $(CLASSPATH) -d bin $(shell find src -name *.java); \
-	bnd build -output bindex-$(VERSION).jar bindex.bnd; 
-	touch $@
+	bnd build -output bindex-$(VERSION).jar bindex.bnd;
 
-clean::
-	-rm -rf debian/tmp
-	-rm -rf debian/.mh
-	-rm -f bindex-$(VERSION).jar
-	-rm -rf bin
-	-rm -rf stamp-build*
+override_dh_clean:
+	rm -rf debian/tmp
+	rm -rf debian/.mh
+	rm -f bindex-$(VERSION).jar
+	rm -rf bin
+	dh_clean
 
 svnURL := http://www.osgi.org/svn/public/trunk/org.osgi.impl.bundle.bindex/
 svnRev := 96 
 
 get-orig-source:
 	svn export -r $(svnRev) $(svnURL) $(PACKAGE)-$(VERSION).orig;
-	GZIP=-9 tar -czf $(DEB_SRCDIR)/../$(PACKAGE)_$(VERSION).orig.tar.gz \
+	GZIP=-9 tar -czf ../$(PACKAGE)_$(VERSION).orig.tar.gz \
 		 --exclude 'jar/*' --exclude '.svn' \
 		 $(PACKAGE)-$(VERSION).orig;
 	rm -rf $(PACKAGE)-$(VERSION).orig;


hooks/post-receive
-- 
bindex packaging