[SCM] felix-osgi-obr packaging branch, master, updated. debian/1.0.2-0ubuntu1-6-g9af0933

[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 "felix-osgi-obr packaging".

The branch, master has been updated
       via  9af09338c17c5f9b1d8af9c3c59c37babb237614 (commit)
       via  5cb3976b5ba258eb4c4d2c1d453aa89f1e784860 (commit)
       via  01f999c5fe5d97ae0102f4693ba3cbe7c461fd60 (commit)
       via  7758224e3b46f3f53cc5cf40c30474b15b729261 (commit)
       via  41762d5c51e4e037998511019edb4a7ca763f617 (commit)
      from  f52a05c0134cd2d9c2d2dc14832e8541275b1e39 (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 9af09338c17c5f9b1d8af9c3c59c37babb237614
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jan 9 16:36:15 2011 -0500

    Update changelog.

commit 5cb3976b5ba258eb4c4d2c1d453aa89f1e784860
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jan 9 16:35:13 2011 -0500

    Minor cosmetic change.

commit 01f999c5fe5d97ae0102f4693ba3cbe7c461fd60
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jan 9 16:34:56 2011 -0500

    Add VCS entries.

commit 7758224e3b46f3f53cc5cf40c30474b15b729261
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jan 9 16:32:41 2011 -0500

    Convert to pure dh with javahelper for packaging.

commit 41762d5c51e4e037998511019edb4a7ca763f617
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jan 9 15:35:42 2011 -0500

    Bump to Standards-Version 3.9.1.

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

Summary of changes:
 debian/changelog |    4 +++-
 debian/control   |    7 ++++---
 debian/rules     |   53 +++++++++++++++++++++++++++++++----------------------
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 586275a..473a280 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ felix-osgi-obr (1.0.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 for packaging.
 
- -- Andres Mejia <mcitadel at gmail.com>  Sun, 02 Jan 2011 12:48:00 -0500
+ -- Andres Mejia <mcitadel at gmail.com>  Sun, 09 Jan 2011 16:35:43 -0500
 
 felix-osgi-obr (1.0.2-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index 3ef2451..a826f96 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,12 @@ 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.3.3), cdbs (>= 0.4.5.3), default-jdk
+Build-Depends: debhelper (>= 7.3.3), javahelper, default-jdk
 Build-Depends-Indep: ant, libequinox-osgi-java, maven-repo-helper (>> 0.5)
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://felix.apache.org/site/apache-felix-osgi-bundle-repository.html
+Vcs-Git: git://git.debian.org/git/pkg-java/felix-osgi-obr.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/felix-osgi-obr.git
 
 Package: libfelix-osgi-obr-java
 Architecture: all
@@ -20,7 +22,6 @@ Description: OSGi OBR Service API
  2. To encourage independent bundle development so that communities of 
  interest can grow.
 
-
 Package: libfelix-osgi-obr-java-doc
 Architecture: all
 Section: doc
diff --git a/debian/rules b/debian/rules
index 3a1ab6b..5a6c3e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,38 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
+VERSION			:= $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed -e 's/-[^-]*$$//')
+JAVA_HOME		:= /usr/lib/jvm/default-java
+CLASSPATH		:= /usr/share/java/org.eclipse.osgi.jar
+JAR_NAME		:= org.osgi.service.obr
+ANT_HOME		:= /usr/share/ant
+ANT_BUILDFILE		:= ./debian/build.xml
+ANT_BUILD_TARGET	:= build javadoc
+ANT_ARGS		:= -Dbuild.sysclasspath=first \
+	-Dversion=$(VERSION) \
+	-Djar.name=$(JAR_NAME) \
+	-Djava.class.path=$(CLASSPATH)
 
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@ --with javahelper
+
+override_dh_auto_build:
+	ant \
+	$(ANT_ARGS) \
+	-f $(ANT_BUILDFILE) $(ANT_BUILD_TARGET)
+
+override_dh_install:
+	mh_installpoms -plibfelix-osgi-obr-java
+	mh_installjar -plibfelix-osgi-obr-java -l pom.xml dist/$(JAR_NAME)-$(VERSION).jar
+	dh_install
+
+override_dh_clean:
+	ant \
+	$(ANT_ARGS) \
+	-f $(ANT_BUILDFILE) clean
+	rm -rf debian/tmp
+	rm -rf debian/.mh
+	dh_clean
 
-PACKAGE			:= $(DEB_SOURCE_PACKAGE)
-VERSION			:= $(DEB_UPSTREAM_VERSION)
-JAVA_HOME		:= /usr/lib/jvm/default-java/
-ANT_HOME		:= /usr/share/ant
-DEB_ANT_BUILDFILE	:= ./debian/build.xml
-DEB_ANT_BUILD_TARGET	:= build javadoc
-DEB_JARS 		:= org.eclipse.osgi
-JAR_NAME		:= org.osgi.service.obr
-DEB_ANT_ARGS		:= -Dbuild.sysclasspath=first -Dversion=$(VERSION) -Djar.name=$(JAR_NAME)
-	
-	
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l pom.xml dist/$(JAR_NAME)-$(VERSION).jar
-	
-clean::
-	-rm -rf debian/tmp
-	-rm -rf debian/.mh
-	
 get-orig-source:
 	uscan \
 		--verbose \


hooks/post-receive
-- 
felix-osgi-obr packaging