[pkg-java] r15304 - trunk/xslthl/debian

[Niels Thykier]

Author: nthykier
Date: 2011-10-30 10:31:13 +0000 (Sun, 30 Oct 2011)
New Revision: 15304

Added:
   trunk/xslthl/debian/javabuild
Modified:
   trunk/xslthl/debian/changelog
   trunk/xslthl/debian/control
   trunk/xslthl/debian/rules
Log:
Re-write debian/rules to use dh7 style

Modified: trunk/xslthl/debian/changelog
===================================================================
--- trunk/xslthl/debian/changelog	2011-10-30 10:08:50 UTC (rev 15303)
+++ trunk/xslthl/debian/changelog	2011-10-30 10:31:13 UTC (rev 15304)
@@ -6,6 +6,7 @@
     - Updated the name of some fields.
   * Bumped debhelper compat to 8.
   * Bumped Standards-Versions to 3.9.2 - no changes required.
+  * Rewrite d/rules to use dh7 style with javahelper support.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 30 Oct 2011 11:06:35 +0100
 

Modified: trunk/xslthl/debian/control
===================================================================
--- trunk/xslthl/debian/control	2011-10-30 10:08:50 UTC (rev 15303)
+++ trunk/xslthl/debian/control	2011-10-30 10:31:13 UTC (rev 15304)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre (malat) <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 8), javahelper
+Build-Depends: debhelper (>= 8), javahelper (>= 0.33~)
 Build-Depends-Indep: default-jdk, libsaxon-java, libsaxonb-java, libxalan2-java
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/xslthl

Added: trunk/xslthl/debian/javabuild
===================================================================
--- trunk/xslthl/debian/javabuild	                        (rev 0)
+++ trunk/xslthl/debian/javabuild	2011-10-30 10:31:13 UTC (rev 15304)
@@ -0,0 +1 @@
+xslthl.jar src

Modified: trunk/xslthl/debian/rules
===================================================================
--- trunk/xslthl/debian/rules	2011-10-30 10:08:50 UTC (rev 15303)
+++ trunk/xslthl/debian/rules	2011-10-30 10:31:13 UTC (rev 15304)
@@ -3,47 +3,12 @@
 export JAVA_HOME=/usr/lib/jvm/default-java
 export CLASSPATH=/usr/share/java/saxon.jar:/usr/share/java/saxonb.jar:/usr/share/java/xalan2.jar
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-	jh_build xslthl.jar src
-	touch $@
+TARGETS := build build-arch build-indep clean binary-indep binary-arch binary install
 
-clean:
-	dh_testdir
-	dh_testroot
-	jh_build --clean
-	dh_clean
-	rm -f build-stamp xslthl.jar
+$(TARGETS):
+	dh $@ --with javahelper
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-binary-arch: build install
-	# Java packages are arch: all, nothing to do here
-
-binary-indep: build install
-	# Create the package here
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_install -i
-	dh_installdocs -i
-	dh_installchangelogs -i
-	jh_installlibs -i
-	jh_depends -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
 get-orig-source:
 	uscan --force-download
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: $(TARGETS)