[libjaxp1.3-java] 11/36: * Depend on default-jre-headless. * debian/rules: Fix jar options.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libjaxp1.3-java.

commit 6175f3793b822115dc748fb2f9fb0c1b4db64173
Author: Matthias Klose <doko at debian.org>
Date:   Thu Jul 31 11:16:43 2008 +0000

      * Depend on default-jre-headless.
      * debian/rules: Fix jar options.
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 debian/rules     | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 98b3c68..dd06b2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index 98926f5..4740a86 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Homepage: http://java.sun.com/xml/jaxp/index.jsp
 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
diff --git a/debian/rules b/debian/rules
index 11e5e4a..2191673 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,8 @@ debian/build-stamp:
 	# 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)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjaxp1.3-java.git