[pkg-java] r16154 - trunk/batik/debian

[Niels Thykier]

Author: nthykier
Date: 2012-06-19 10:54:07 +0000 (Tue, 19 Jun 2012)
New Revision: 16154

Modified:
   trunk/batik/debian/changelog
   trunk/batik/debian/control
   trunk/batik/debian/rules
Log:
Add OpenJDK-7 alternative and add mh_clean

Modified: trunk/batik/debian/changelog
===================================================================
--- trunk/batik/debian/changelog	2012-06-19 09:40:16 UTC (rev 16153)
+++ trunk/batik/debian/changelog	2012-06-19 10:54:07 UTC (rev 16154)
@@ -1,3 +1,12 @@
+batik (1.7+dfsg-2) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Allow OpenJDK-7 as alternative to OpenJDK-6.
+  * Remove old references to sun-java.
+  * Add missing call to mh_clean in the clean rule.
+
+ -- Niels Thykier <niels at thykier.net>  Tue, 19 Jun 2012 12:50:04 +0200
+
 batik (1.7+dfsg-1) unstable; urgency=low
 
   * Provide a repackaged tarball stripping all binary jars (closes: #657244)

Modified: trunk/batik/debian/control
===================================================================
--- trunk/batik/debian/control	2012-06-19 09:40:16 UTC (rev 16153)
+++ trunk/batik/debian/control	2012-06-19 10:54:07 UTC (rev 16154)
@@ -6,7 +6,7 @@
  Vincent Fourmond <fourmond at debian.org>, Onkar Shinde <onkarshinde at ubuntu.com>
 Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 5.0), cdbs
-Build-Depends-Indep: openjdk-6-jdk | sun-java5-jdk | sun-java6-jdk, ant, 
+Build-Depends-Indep: openjdk-6-jdk | openjdk-7-jdk, ant, 
  libbsf-java, libxalan2-java, rhino, libavalon-framework-java (>= 4.2.0), 
  libcommons-io-java, libcommons-logging-java, libxml-commons-external-java,
  maven-repo-helper
@@ -16,13 +16,13 @@
 
 Package: libbatik-java
 Architecture: all
-Depends: openjdk-6-jre-headless | java2-runtime-headless,
+Depends: openjdk-6-jre-headless | openjdk-7-jre-headless | java7-runtime-headless,
  libxalan2-java, libbsf-java, 
  libavalon-framework-java (>= 4.2.0), libcommons-io-java, 
  libcommons-logging-java, java-wrappers (>= 0.1.12),
  libxml-commons-external-java,
  ${misc:Depends}
-Recommends: fop (>= 1:0.94), rhino, openjdk-6-jre
+Recommends: fop (>= 1:0.94), rhino, openjdk-6-jre | openjdk-7-jre-headless 
 Description: xml.apache.org SVG Library
  Batik is a toolkit for applications or applets that want to use images
  in the Scalable Vector Graphics (SVG) format for various purposes, such

Modified: trunk/batik/debian/rules
===================================================================
--- trunk/batik/debian/rules	2012-06-19 09:40:16 UTC (rev 16153)
+++ trunk/batik/debian/rules	2012-06-19 10:54:07 UTC (rev 16154)
@@ -12,8 +12,7 @@
 arch = $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 JAVA_HOME_DIRS       := /usr/lib/jvm/java-7-openjdk-$(arch) \
-	/usr/lib/jvm/java-6-openjdk-$(arch) /usr/lib/jvm/java-6-openjdk \
-	/usr/lib/jvm/java-1.5.0-sun /usr/lib/jvm/java-6-sun
+	/usr/lib/jvm/java-6-openjdk-$(arch) /usr/lib/jvm/java-6-openjdk
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar bfs \
 	gnujaxp js xalan2 xml-apis-ext
@@ -53,3 +52,6 @@
 	for prog in debian/wrappers/* ; do \
 		install -t debian/libbatik-java/usr/bin/ $$prog  ; \
 	done
+
+clean::
+	mh_clean