[SCM] felix-main packaging branch, master, updated. debian/2.0.5-0ubuntu1-3-g661e597

[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-main packaging".

The branch, master has been updated
       via  661e597390d449389912e84c7dec7055864bb65e (commit)
      from  32be6dd4960585b6f9a2a5cd3cbb109d71b79b68 (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 661e597390d449389912e84c7dec7055864bb65e
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jan 9 17:39:21 2011 -0500

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

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

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

diff --git a/debian/changelog b/debian/changelog
index 1e72940..d068469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ felix-main (2.0.5-1) unstable; urgency=low
 
   * Upload for 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 in debian/control.
 
- -- Andres Mejia <mcitadel at gmail.com>  Tue, 04 Jan 2011 19:24:40 -0500
+ -- Andres Mejia <mcitadel at gmail.com>  Sun, 09 Jan 2011 17:32:23 -0500
 
 felix-main (2.0.5-0ubuntu1) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index edf9b49..6f938f2 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.3.3), cdbs (>= 0.4.63), default-jdk
+Build-Depends: debhelper (>= 7.3.3), javahelper, default-jdk
 Build-Depends-Indep: ant (>= 1.7.0), libfelix-framework-java, libequinox-osgi-java, maven-repo-helper (>> 0.5)
 Standards-Version: 3.9.1
 Homepage: http://felix.apache.org/site/
+Vcs-Git: git://git.debian.org/git/pkg-java/felix-main.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/felix-main.git
 
 Package: libfelix-main-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, 
+Depends: ${shlibs:Depends}, ${java:Depends}, ${misc:Depends}, 
  default-jre-headless | java2-runtime-headless, libfelix-framework-java, libequinox-osgi-java
 Suggests: libfelix-main-java-doc
 Description: Classes to instatiate and execute the Felix Framework
@@ -22,6 +24,7 @@ Package: libfelix-main-java-doc
 Architecture: all
 Section: doc
 Depends:  ${misc:Depends}
+Recommends: ${java:Recommends}
 Description: Javadoc API for classes to instatiate and execute the Felix Framework
  The Felix Framework subproject is an implementation 
  of the OSGi R4.2 core framework specification.
diff --git a/debian/rules b/debian/rules
index 70252dc..b1d3a52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,30 +1,37 @@
 #!/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.apache.felix.framework.jar:/usr/share/java/org.eclipse.osgi.jar
+JAR_NAME		:= org.apache.felix.main
+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-main-java
+	mh_installjar -plibfelix-main-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_INSTALL_CHANGELOGS_ALL:= ./doc/changelog.txt
-DEB_ANT_BUILDFILE	:= ./debian/build.xml
-DEB_ANT_BUILD_TARGET	:= build javadoc
-DEB_JARS 		:= org.apache.felix.framework org.eclipse.osgi
-JAR_NAME		:= org.apache.felix.main
-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-main packaging