Merge lp:~ari-tczew/ubuntu/maverick/junitperf/lp-521390 into lp:ubuntu/maverick/junitperf

[Artur Rona]

=== modified file 'debian/changelog'
--- debian/changelog	2009-09-02 14:37:01 +0000
+++ debian/changelog	2010-05-06 20:39:26 +0000
@@ -1,3 +1,37 @@
+junitperf (1.9.1-7ubuntu1) maverick; urgency=low
+
+  * Merge from Debian testing, remaining changes: (LP: #521390)
+    - debian/ant.properties: Force java2 code generation
+
+ -- Artur Rona <[e-mail]>  Thu, 06 May 2010 21:40:02 +0200
+
+junitperf (1.9.1-7) unstable; urgency=low
+
+  * Corrected Depends to default-jre-headless instead of the
+    nonexistent default-java-headless.
+
+ -- Niels Thykier <[e-mail]>  Tue, 01 Dec 2009 15:08:44 +0100
+
+junitperf (1.9.1-6) unstable; urgency=low
+
+  [ Kumar Appaiah ]
+  * Add a watch file.
+
+  [ Niels Thykier ]
+  * Added missing ${misc:Depends}.
+  * Changed Depends to -headless versions of java.
+    - Also added more java alternatives.
+  * Stopped using cdbs's simple-patch system - it was not used.
+  * Switched to default-jdk from java-gcj-compat.
+  * Bumped debhelper compat to 7.
+  * Bumped Standards-Version to 3.8.3.
+    - Changed section to java.
+    - Added Homepage and Vcs-* fields.
+  * Added myself to uploaders.
+  * Converted to 3.0 (quilt) source.
+
+ -- Niels Thykier <[e-mail]>  Sat, 21 Nov 2009 12:51:16 +0100
+
 junitperf (1.9.1-5ubuntu1) karmic; urgency=low
 
   * debian/control, debian/rules: Build with default-jdk
 
=== modified file 'debian/compat'
--- debian/compat	2009-09-02 14:37:01 +0000
+++ debian/compat	2010-05-06 20:39:26 +0000
@@ -1,1 +1,1 @@
-5
+7
 
=== modified file 'debian/control'
--- debian/control	2009-09-02 14:37:01 +0000
+++ debian/control	2010-05-06 20:39:26 +0000
@@ -3,14 +3,20 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Debian Java Maintainers <[e-mail]>
-Uploaders: Arnaud Vandyck <[e-mail]>, Wolfgang Baer <[e-mail]>
-Build-Depends: debhelper (>= 5), cdbs, ant
-Build-Depends-Indep: junit (>= 3.7-4), default-jdk, ant-optional
-Standards-Version: 3.7.2
+Uploaders: Arnaud Vandyck <[e-mail]>, Wolfgang Baer <[e-mail]>,
+ Niels Thykier <[e-mail]>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant
+Build-Depends-Indep: junit (>= 3.7-4), ant-optional
+Standards-Version: 3.8.3
+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
 
 Package: libjunitperf-java
 Architecture: all
-Depends: default-jre-headless | java2-runtime-headless, junit, ${misc:Depends}
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless |
+ java5-runtime-headless | java6-runtime-headless,
+ junit, ${misc:Depends}
 Suggests: libjunitperf-java-doc
 Description: JUnit extensions for performance and scalability testing
  JUnitPerf is a collection of JUnit test decorators used to measure the 
 
=== modified file 'debian/rules'
--- debian/rules	2009-09-02 14:37:01 +0000
+++ debian/rules	2010-05-06 20:39:26 +0000
@@ -5,7 +5,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
 ANT_HOME := /usr/share/ant
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2010-05-06 20:39:26 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)
 
=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2010-05-06 20:39:26 +0000
@@ -0,0 +1,2 @@
+version=3
+http://clarkware.com/software/JUnitPerf.html http://www.clarkware.com/software/junitperf-([\d\.]+).zip debian uupdate