[pkg-java] r10557 - trunk/libhamcrest-java/debian

[Michael Koch]

Author: mkoch
Date: 2009-09-24 06:31:56 +0000 (Thu, 24 Sep 2009)
New Revision: 10557

Modified:
   trunk/libhamcrest-java/debian/changelog
   trunk/libhamcrest-java/debian/compat
   trunk/libhamcrest-java/debian/control
   trunk/libhamcrest-java/debian/rules
Log:
libhamcrest-java (1.1-3) unstable; urgency=low

  * (Build-)Depends on default-jdk.
  * Build-Depends on debhelper >= 7.
  * Put package into section 'java'.
  * Added Depends ${misc:Depends}.
  * Added myself to Uploaders. 
  * Updated Standards-Version to 3.8.3.

 -- Michael Koch <konqueror at gmx.de>  Thu, 24 Sep 2009 08:04:44 +0200



Modified: trunk/libhamcrest-java/debian/changelog
===================================================================
--- trunk/libhamcrest-java/debian/changelog	2009-09-23 23:18:53 UTC (rev 10556)
+++ trunk/libhamcrest-java/debian/changelog	2009-09-24 06:31:56 UTC (rev 10557)
@@ -1,3 +1,14 @@
+libhamcrest-java (1.1-3) unstable; urgency=low
+
+  * (Build-)Depends on default-jdk.
+  * Build-Depends on debhelper >= 7.
+  * Put package into section 'java'.
+  * Added Depends ${misc:Depends}.
+  * Added myself to Uploaders. 
+  * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Thu, 24 Sep 2009 08:04:44 +0200
+
 libhamcrest-java (1.1-2) unstable; urgency=low
 
   * Fix java bytecode / java runtime version mismatch (Closes: #503799)

Modified: trunk/libhamcrest-java/debian/compat
===================================================================
--- trunk/libhamcrest-java/debian/compat	2009-09-23 23:18:53 UTC (rev 10556)
+++ trunk/libhamcrest-java/debian/compat	2009-09-24 06:31:56 UTC (rev 10557)
@@ -1 +1 @@
-6
+7

Modified: trunk/libhamcrest-java/debian/control
===================================================================
--- trunk/libhamcrest-java/debian/control	2009-09-23 23:18:53 UTC (rev 10556)
+++ trunk/libhamcrest-java/debian/control	2009-09-24 06:31:56 UTC (rev 10557)
@@ -1,12 +1,11 @@
 Source: libhamcrest-java
-Section: libs
+Section: java
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>
+Uploaders: Varun Hiremath <varun at debian.org>, Michael Koch <konqueror at gmx.de>
 Priority: optional
-Build-Depends: cdbs, debhelper (>= 6)
-Build-Depends-Indep: ant, openjdk-6-jdk, libqdox-java,
- libeasymock-java, libjmock-java
-Standards-Version: 3.8.0
+Build-Depends: cdbs, debhelper (>= 7), ant, default-jdk
+Build-Depends-Indep: libqdox-java, libeasymock-java, libjmock-java
+Standards-Version: 3.8.3
 Homepage: http://code.google.com/p/hamcrest/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libhamcrest-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libhamcrest-java
@@ -14,7 +13,7 @@
 
 Package: libhamcrest-java
 Architecture: all
-Depends: openjdk-6-jre | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime | java2-runtime, ${misc:Depends}
 Description: library of matchers for building test expressions
  Provides a library of matcher objects (also known as constraints or
  predicates) allowing 'match' rules to be defined declaratively, to be

Modified: trunk/libhamcrest-java/debian/rules
===================================================================
--- trunk/libhamcrest-java/debian/rules	2009-09-23 23:18:53 UTC (rev 10556)
+++ trunk/libhamcrest-java/debian/rules	2009-09-24 06:31:56 UTC (rev 10557)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME		:= /usr/lib/jvm/java-6-openjdk
+JAVA_HOME		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_JARS		:= easymock jmock qdox