[pkg-java] r12471 - trunk/junitperf/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2010-05-20 19:35:08 +0000 (Thu, 20 May 2010)
New Revision: 12471

Added:
   trunk/junitperf/debian/ant.properties
   trunk/junitperf/debian/libjunitperf-java.jlibs
Modified:
   trunk/junitperf/debian/changelog
   trunk/junitperf/debian/control
   trunk/junitperf/debian/rules
Log:
junitperf (1.9.1-8) unstable; urgency=low

  * Explicitly build Java2 code. (Closes: #582429) - Thanks to
    Artur Rona for providing a patch.
  * Bumped Standards-Version to 3.8.4 - no changes required.
  * Switched to dh7 instead of cdbs based build.

 -- Niels Thykier <niels at thykier.net>  Thu, 20 May 2010 21:34:35 +0200


Added: trunk/junitperf/debian/ant.properties
===================================================================
--- trunk/junitperf/debian/ant.properties	                        (rev 0)
+++ trunk/junitperf/debian/ant.properties	2010-05-20 19:35:08 UTC (rev 12471)
@@ -0,0 +1,2 @@
+ant.build.javac.target=1.4
+ant.build.javac.source=1.4

Modified: trunk/junitperf/debian/changelog
===================================================================
--- trunk/junitperf/debian/changelog	2010-05-20 14:16:39 UTC (rev 12470)
+++ trunk/junitperf/debian/changelog	2010-05-20 19:35:08 UTC (rev 12471)
@@ -1,3 +1,12 @@
+junitperf (1.9.1-8) unstable; urgency=low
+
+  * Explicitly build Java2 code. (Closes: #582429) - Thanks to
+    Artur Rona for providing a patch.
+  * Bumped Standards-Version to 3.8.4 - no changes required.
+  * Switched to dh7 instead of cdbs based build.
+
+ -- Niels Thykier <niels at thykier.net>  Thu, 20 May 2010 21:34:35 +0200
+
 junitperf (1.9.1-7) unstable; urgency=low
 
   * Corrected Depends to default-jre-headless instead of the

Modified: trunk/junitperf/debian/control
===================================================================
--- trunk/junitperf/debian/control	2010-05-20 14:16:39 UTC (rev 12470)
+++ trunk/junitperf/debian/control	2010-05-20 19:35:08 UTC (rev 12471)
@@ -4,9 +4,9 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>,
  Niels Thykier <niels at thykier.net>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant
+Build-Depends: ant, debhelper (>= 7.0.50~), default-jdk, javahelper
 Build-Depends-Indep: junit (>= 3.7-4), ant-optional
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://www.clarkware.com/software/JUnitPerf.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/junitperf
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/junitperf

Added: trunk/junitperf/debian/libjunitperf-java.jlibs
===================================================================
--- trunk/junitperf/debian/libjunitperf-java.jlibs	                        (rev 0)
+++ trunk/junitperf/debian/libjunitperf-java.jlibs	2010-05-20 19:35:08 UTC (rev 12471)
@@ -0,0 +1 @@
+dist/junitperf-*.jar

Modified: trunk/junitperf/debian/rules
===================================================================
--- trunk/junitperf/debian/rules	2010-05-20 14:16:39 UTC (rev 12470)
+++ trunk/junitperf/debian/rules	2010-05-20 19:35:08 UTC (rev 12471)
@@ -1,17 +1,7 @@
 #!/usr/bin/make -f
-# debian/rules file for junitperf (uses cdbs)
 
-export VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+%:
+	dh $@ --with javahelper
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-
-DEB_JARS := $(ANT_HOME)/lib/ant-junit.jar junit
-DEB_ANT_BUILD_TARGET := jar javadoc #test
-
-install/libjunitperf-java::
-	install -m 644 dist/junitperf-$(VERSION).jar debian/libjunitperf-java/usr/share/java/junitperf-$(VERSION).jar
-	ln -s junitperf-$(VERSION).jar debian/libjunitperf-java/usr/share/java/junitperf.jar
+override_dh_auto_build:
+	dh_auto_build -- jar javadoc