[pkg-java] r6822 - trunk/libjaxp1.3-java/debian

[doko at alioth.debian.org]

Author: doko
Date: 2008-07-31 11:16:43 +0000 (Thu, 31 Jul 2008)
New Revision: 6822

Modified:
   trunk/libjaxp1.3-java/debian/changelog
   trunk/libjaxp1.3-java/debian/control
   trunk/libjaxp1.3-java/debian/rules
Log:
  * Depend on default-jre-headless.
  * debian/rules: Fix jar options.


Modified: trunk/libjaxp1.3-java/debian/changelog
===================================================================
--- trunk/libjaxp1.3-java/debian/changelog	2008-07-31 11:08:44 UTC (rev 6821)
+++ trunk/libjaxp1.3-java/debian/changelog	2008-07-31 11:16:43 UTC (rev 6822)
@@ -1,3 +1,10 @@
+libjaxp1.3-java (1.3.04-4) UNRELEASED; urgency=low
+
+  * Depend on default-jre-headless.
+  * debian/rules: Fix jar options.
+
+ -- Matthias Klose <doko at debian.org>  Thu, 31 Jul 2008 11:09:28 +0000
+
 libjaxp1.3-java (1.3.04-3) unstable; urgency=low
 
   * Build-Depends on default-jdk-builddep. Closes: #477879

Modified: trunk/libjaxp1.3-java/debian/control
===================================================================
--- trunk/libjaxp1.3-java/debian/control	2008-07-31 11:08:44 UTC (rev 6821)
+++ trunk/libjaxp1.3-java/debian/control	2008-07-31 11:16:43 UTC (rev 6822)
@@ -12,7 +12,7 @@
 Package: libjaxp1.3-java
 Architecture: all
 Section: libs
-Depends: gij | java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless
 Recommends: libjaxp1.3-java-gcj
 Description: Java XML parser and transformer APIs (DOM, SAX, JAXP, TrAX)
  xml-apis.jar from the Apache XML Commons project is used by the Xerces-J XML

Modified: trunk/libjaxp1.3-java/debian/rules
===================================================================
--- trunk/libjaxp1.3-java/debian/rules	2008-07-31 11:08:44 UTC (rev 6821)
+++ trunk/libjaxp1.3-java/debian/rules	2008-07-31 11:16:43 UTC (rev 6822)
@@ -20,8 +20,8 @@
 	# An alternative would be to build the classes using GCJ
 	$(JAVA_HOME)/bin/javac -d build `find javax org -name \*.java`
 	cp LICENSE.*.txt README.*.txt build/license
-	cd build && $(JAVA_HOME)/bin/jar -c -m ../manifest.commons \
-		-f jaxp-1.3.jar javax license org
+	cd build && $(JAVA_HOME)/bin/jar cmf ../manifest.commons \
+		jaxp-1.3.jar javax license org
 	touch debian/build-stamp
 
 ifeq ($(with_gcj_native),yes)