[pkg-java] r16204 - trunk/sacjava/debian

[Niels Thykier]

Author: nthykier
Date: 2012-06-25 08:01:40 +0000 (Mon, 25 Jun 2012)
New Revision: 16204

Modified:
   trunk/sacjava/debian/changelog
   trunk/sacjava/debian/control
   trunk/sacjava/debian/rules
Log:
Fix FTBFS with gcj and add missing mh_clean target

Modified: trunk/sacjava/debian/changelog
===================================================================
--- trunk/sacjava/debian/changelog	2012-06-24 20:06:15 UTC (rev 16203)
+++ trunk/sacjava/debian/changelog	2012-06-25 08:01:40 UTC (rev 16204)
@@ -1,3 +1,14 @@
+sacjava (1.3-6) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Skip javadoc compilation in build-arch target.
+    (Closes: #678905)
+  * Add missing call to mh_clean.
+  * Add versioned Build-Depends on dpkg-dev to ensure
+    build-arch is available.
+
+ -- Niels Thykier <niels at thykier.net>  Mon, 25 Jun 2012 09:46:11 +0200
+
 sacjava (1.3-5) unstable; urgency=low
 
   * Team upload.

Modified: trunk/sacjava/debian/control
===================================================================
--- trunk/sacjava/debian/control	2012-06-24 20:06:15 UTC (rev 16203)
+++ trunk/sacjava/debian/control	2012-06-25 08:01:40 UTC (rev 16204)
@@ -2,7 +2,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 8), default-jdk, gcj-native-helper, maven-repo-helper
+Build-Depends: debhelper (>= 8), default-jdk, dpkg-dev (>= 1.16.2),
+  gcj-native-helper, maven-repo-helper
 Standards-Version: 3.9.2
 Section: java
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/sacjava

Modified: trunk/sacjava/debian/rules
===================================================================
--- trunk/sacjava/debian/rules	2012-06-24 20:06:15 UTC (rev 16203)
+++ trunk/sacjava/debian/rules	2012-06-25 08:01:40 UTC (rev 16204)
@@ -10,30 +10,38 @@
 
 build: build-arch build-indep
 build-arch: build-stamp
-build-indep: build-stamp
+build-indep: build-stamp build-indep-stamp
+
+build-indep-stamp: configure-stamp
+	if [ ! -d doc ]; then mkdir doc; fi
+	/usr/lib/jvm/default-java/bin/javadoc -source 1.5 -d doc `find org -name "*.java" | xargs`
+
+	touch $@
+
 build-stamp: configure-stamp 
 	dh_testdir
 
 	/usr/lib/jvm/default-java/bin/javac -source 1.5 -target 1.5 `find org -name "*.java" | xargs`
 	/usr/lib/jvm/default-java/bin/jar cvf sac-1.3.jar `find org -name "*.class" | xargs`
-	if [ ! -d doc ]; then mkdir doc; fi
-	/usr/lib/jvm/default-java/bin/javadoc -source 1.5 -d doc `find org -name "*.java" | xargs`
 
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-stamp build-indep-stamp configure-stamp
 
 	rm -f sac.jar sac-1.3.jar
 	-find org -name "*.class" | xargs rm
 	# remove this; will be rebuilt
 	rm -rf doc
 
+	mh_clean
 	dh_clean 
 
-install: build
+install:
+	@[ -f build-stamp -o -f build-indep-stamp ] || \
+	  ( echo "Package has not been build!  Use binary{,-arch,-indep} target" >&2 )
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -42,7 +50,7 @@
 	mh_installpom -plibsac-java debian/pom.xml
 	mh_installjar -plibsac-java -l debian/pom.xml sac-1.3.jar
 
-binary-indep: build install
+binary-indep: build-indep install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -i
@@ -55,7 +63,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build install
+binary-arch: build-arch install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs -s