[SCM] libpjl-comp-filter-java packaging branch, master, updated. upstream/1.7+dfsg-5-g48fb2bd

[Andrew Harvey]

The following commit has been merged in the master branch:
commit 48fb2bd302fc1c27821980c176a148f7b8a8db36
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Sun Jan 22 13:16:40 2012 +1100

    change to cdbs

diff --git a/debian/control b/debian/control
index 1167858..43eb5e4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,15 @@ Priority: extra
 Maintainer: Andrew Harvey <andrew.harvey4 at gmail.com>
 DM-Upload-Allowed: yes
 Build-Depends:
- ant
- , debhelper (>= 8~)
+ debhelper (>= 7),
+ , cdbs (>= 0.4.5.3),
  , default-jdk
- , junit
- , maven-repo-helper
- , maven-ant-helper
+Build-Depends-Indep:
+ maven-repo-helper (>> 0.5)
+ , maven-ant-helper (>> 4)
+ , ant
+ , libservlet2.5-java
+ , libcommons-logging-java
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-java/libpjl-comp-filter-java.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/libpjl-comp-filter-java.git
@@ -20,7 +23,6 @@ Depends:
  ${misc:Depends}
  , libservlet2.5-java
  , libcommons-logging-java
- , libservlet2.5-java
 Description: PJL Compression Filter
  A J2EE servlet filter which compresses response data.
  .
diff --git a/debian/rules b/debian/rules
index 10f4717..f721a9c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,20 @@
 #!/usr/bin/make -f
 
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^+]+).*,\1,p')
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	dh_auto_build -- jar javadoc
-
-override_dh_auto_install:
-	dh_auto_install
-	install -m 644 $(CURDIR)/pjl-comp-filter-${DEB_UPSTREAM_VERSION}.jar $(CURDIR)/debian/libpjl-comp-filter-java/usr/share/java/pjl-comp-filter-${DEB_UPSTREAM_VERSION}.jar
-	dh_link usr/share/java/pjl-comp-filter-${DEB_UPSTREAM_VERSION}.jar usr/share/java/pjl-comp-filter.jar
-	
-	install -d $(CURDIR)/debian/libpjl-comp-filter-java-doc/usr/share/doc/libpjl-comp-filter-java-doc
-	cp -r docs/ $(CURDIR)/debian/libpjl-comp-filter-java-doc/usr/share/doc/libpjl-comp-filter-java-doc/api
-
-binary-post-install/libpjl-comp-filter-java::
-	mh_installpoms -plibpjl-comp-filter-java
-	mh_installjar -plibpjl-comp-filter-java -l debian/libpjl-comp-filter-java.pom pjl-comp-filter-${DEB_UPSTREAM_VERSION}.jar
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/ant.mk
+
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e "s/\+dfsg.*//")
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := pjl-comp-filter-$(DEB_UPSTREAM_VERSION).jar
+DEB_ANT_BUILD_TARGET := jar javadoc
+DEB_ANT_BUILDFILE    := build.xml
+DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE)
+API_DOCS             := docs
+
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l debian/lib$(PACKAGE)-java.pom $(PACKAGE)-$(VERSION).jar
 
 clean::
 	mh_clean

-- 
libpjl-comp-filter-java packaging