[libnanoxml2-java] 06/09: Apply patch from Markus Koschany <apo at debian.org> * Transition to bnd 2.1.0. (Closes: #805499) * Do not depend on a Java runtime because the Java Policy does not require this anymore.

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libnanoxml2-java.

commit 47a3581a39daefcd056c75cb5fd4c97abefd580c
Author: Markus Koschany <apo at debian.org>
Date:   Wed Nov 18 21:05:35 2015 +0100

    Apply patch from Markus Koschany <apo at debian.org>
      * Transition to bnd 2.1.0. (Closes: #805499)
      * Do not depend on a Java runtime because the Java Policy does not require
        this anymore.
---
 debian/changelog |  9 +++++++++
 debian/control   |  4 ++--
 debian/rules     | 19 +++++++++++--------
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f08133d..bcb11a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libnanoxml2-java (2.2.3.dfsg-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Transition to bnd 2.1.0.
+  * Do not depend on a Java runtime because the Java Policy does not require
+    this anymore.
+
+ -- Markus Koschany <apo at debian.org>  Wed, 18 Nov 2015 21:05:35 +0100
+
 libnanoxml2-java (2.2.3.dfsg-4) unstable; urgency=low
 
   * Removed no longer needed work around for 567899 (Closes: #573697)
diff --git a/debian/control b/debian/control
index fca1286..b8a4b48 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net>
 Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: default-jdk-doc,
                      default-jdk,
-                     bnd,
+                     bnd (>= 2.1.0),
                      perl,
                      javahelper
 Standards-Version: 3.8.4.0
@@ -13,7 +13,7 @@ Homepage: http://devkix.com/nanoxml.php
 
 Package: libnanoxml2-java
 Architecture: all
-Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends}
+Depends: ${misc:Depends}
 Suggests: libnanoxml2-java-doc
 Description: small XML parser for Java
  NanoXML is a (actually more than one) small XML parser for Java. It
diff --git a/debian/rules b/debian/rules
index 2683c53..2972c5e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ NANOXML := nanoxml.jar
 LITE := nanoxml-lite.jar
 SAX := nanoxml-sax.jar
 
-#Architecture 
+#Architecture
 build: build-stamp
 
 build-stamp:
@@ -37,9 +37,12 @@ build-stamp:
 	CLASSPATH=${NANOXML} jh_build -o'${JFLAGS}' -N ${SAX} Sources/SAX/
 	jh_manifest -c /usr/share/java/${NANOXML} ${SAX}
 
-	bnd wrap *.jar
-	rm *.jar
-	prename 's/bar/jar/' *.bar
+	bnd wrap --output $(NANOXML).tmp $(NANOXML)
+	bnd wrap --output $(LITE).tmp $(LITE)
+	bnd wrap --output $(SAX).tmp $(SAX)
+	mv $(NANOXML).tmp $(NANOXML)
+	mv $(LITE).tmp $(LITE)
+	mv $(SAX).tmp $(SAX)
 
 	${JAVA_HOME}/bin/javadoc -author -link /usr/share/doc/default-jdk-doc/api -quiet \
 	-sourcepath Sources/Java/:Sources/Lite/:Sources/SAX/ -source 1.4 \
@@ -61,12 +64,12 @@ clean:
 	rm -rf Test/*/*.class
 	rm -rf debian/orig.tmp || echo "No failed source fetch"
 
-	dh_clean 
+	dh_clean
 
 install:
 	dh_testdir
 	dh_testroot
-	dh_clean -k -i 
+	dh_clean -k -i
 
 	jh_installlibs -i
 	jh_installjavadoc -plibnanoxml2-java-doc
@@ -78,10 +81,10 @@ install:
 binary-common:
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_installdocs
 	dh_link
-	dh_compress 
+	dh_compress
 	dh_fixperms
 	dh_installdeb
 	dh_gencontrol

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