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

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

The branch, master has been updated
       via  cc4c5a42e520ff2e0da01c923e7bc616fc6e2372 (commit)
       via  351bcde250d27439379cf0d59940b0c0310e8032 (commit)
      from  2ed61d70b6b6b84df38ab0875b8bab6228101834 (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 cc4c5a42e520ff2e0da01c923e7bc616fc6e2372
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jan 9 17:11:46 2011 -0500

    Convert to pure dh with javahelper. Also add VCS entries in debian/control.

commit 351bcde250d27439379cf0d59940b0c0310e8032
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun Jan 9 16:47:49 2011 -0500

    Bump to Standards-Version 3.9.1.

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

Summary of changes:
 debian/control |   11 +++++++----
 debian/rules   |   52 ++++++++++++++++++++++++++++++----------------------
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index e994dd8..3421298 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.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-framework.html
+Vcs-Git: git://git.debian.org/git/pkg-java/felix-framework.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/felix-framework.git
 
 Package: libfelix-framework-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, 
+Depends: ${shlibs:Depends}, ${java:Depends}, ${misc:Depends}, 
  default-jre-headless | java2-runtime-headless, libequinox-osgi-java
 Suggests: libfelix-framework-java-doc
 Description: The Felix Framework subproject 
@@ -21,7 +23,8 @@ Description: The Felix Framework subproject
 Package: libfelix-framework-java-doc
 Architecture: all
 Section: doc
-Depends:  ${misc:Depends}
+Depends: ${misc:Depends}
+Recommends: ${java:Recommends}
 Description: Javadoc API documentation for the Felix Framework subproject 
  The Felix Framework subproject is an implementation 
  of the OSGi R4.2 core framework specification.
diff --git a/debian/rules b/debian/rules
index 579f4d8..e62d5bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +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.eclipse.osgi.jar
+JAR_NAME		:= org.apache.felix.framework
+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-framework-java
+	mh_installjar -plibfelix-framework-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.apache.felix.framework
-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-framework packaging