[pkg-java] r15301 - trunk/stylebook/debian

[Niels Thykier]

Author: nthykier
Date: 2011-10-30 09:34:54 +0000 (Sun, 30 Oct 2011)
New Revision: 15301

Modified:
   trunk/stylebook/debian/changelog
   trunk/stylebook/debian/compat
   trunk/stylebook/debian/control
   trunk/stylebook/debian/rules
Log:
Bump dh + S-V, use dh7 style, set classpath in installed jar

Modified: trunk/stylebook/debian/changelog
===================================================================
--- trunk/stylebook/debian/changelog	2011-10-30 08:50:51 UTC (rev 15300)
+++ trunk/stylebook/debian/changelog	2011-10-30 09:34:54 UTC (rev 15301)
@@ -1,3 +1,18 @@
+stylebook (1.0~b3~svn20061109-4) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Removed Marcus Better from uploaders - Thanks for your
+    work on this package.
+  * Added build-arch and build-indep targets.    
+  * Bumped Standards-Versions to 3.9.2 - no changes required.
+  * Bumped debhelper compat to 8.
+    - replaced dh_clean -k with dh_prep.
+    - migrated to dh7 style rules
+  * Use javahelper to install the jar file.
+  * Set classpath in the xalan jar file.
+
+ -- Niels Thykier <niels at thykier.net>  Sun, 30 Oct 2011 10:13:18 +0100
+
 stylebook (1.0~b3~svn20061109-3) unstable; urgency=low
 
   * Team upload

Modified: trunk/stylebook/debian/compat
===================================================================
--- trunk/stylebook/debian/compat	2011-10-30 08:50:51 UTC (rev 15300)
+++ trunk/stylebook/debian/compat	2011-10-30 09:34:54 UTC (rev 15301)
@@ -1 +1 @@
-5
+8

Modified: trunk/stylebook/debian/control
===================================================================
--- trunk/stylebook/debian/control	2011-10-30 08:50:51 UTC (rev 15300)
+++ trunk/stylebook/debian/control	2011-10-30 09:34:54 UTC (rev 15301)
@@ -2,10 +2,10 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: default-jdk, ant, libxerces2-java
-Standards-Version: 3.8.4
+Uploaders: Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 8)
+Build-Depends-Indep: default-jdk, ant, javahelper (>= 0.33~), libxerces2-java
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/stylebook
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/stylebook/
 

Modified: trunk/stylebook/debian/rules
===================================================================
--- trunk/stylebook/debian/rules	2011-10-30 08:50:51 UTC (rev 15300)
+++ trunk/stylebook/debian/rules	2011-10-30 09:34:54 UTC (rev 15301)
@@ -22,45 +22,20 @@
 INSTALLDIR	:= $(CURDIR)/debian/lib$(PKGNAME)-java
 JAVALIBDIR	:= $(INSTALLDIR)/usr/share/java
 
-VERSION		:= $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\- | cut -f1 -d\+ | cut -f1-2 -d\~ | tr \~ \-)
+TARGETS 	:= build build-arch build-indep clean binary-indep binary-arch binary install
 
-build: build-stamp
-build-stamp:
-	dh_testdir
+$(TARGETS):
+	dh $@
+
+override_dh_auto_build:
 	$(ANT_INVOKE)
-	touch build-stamp
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	rm -rf build
+override_dh_auto_clean:
 	$(ANT_INVOKE) clean
-	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
+override_dh_auto_install:
+	jh_classpath --classpath="/usr/share/java/xercesImpl.jar" build/$(PKGNAME)-*_xalan-2.jar
+	jh_installlibs build/$(PKGNAME)-*_xalan-2.jar
 
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_install
-	install -m 644 build/$(PKGNAME)-$(VERSION)_xalan-2.jar $(JAVALIBDIR)/$(PKGNAME)-$(VERSION).jar
-	ln -s $(PKGNAME)-$(VERSION).jar $(JAVALIBDIR)/$(PKGNAME).jar
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+.PHONY: $(TARGETS)
 
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install