[libnanoxml2-java] 03/09: Imported Debian patch 2.2.3.dfsg-2

[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 1bf6909c161da8bff2229183d7fa448c70552041
Author: Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net>
Date:   Sun Aug 24 21:17:35 2008 +0200

    Imported Debian patch 2.2.3.dfsg-2
---
 debian/changelog |  9 +++++++++
 debian/control   | 14 +++++++-------
 debian/copyright |  2 +-
 debian/rules     | 11 ++++++++---
 debian/watch     |  3 ++-
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dcbaf0d..c83794f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libnanoxml2-java (2.2.3.dfsg-2) unstable; urgency=low
+
+  * Made description and copyright file more precise
+  * Build-Depends-Indep instead of Build-Depends (Lintian fix)
+  * Watchfile and homepage field updated (Closes: #504764)
+  * Fix FTBFS on Ubuntu (LP: #295686)
+
+ -- Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net>  Sun, 24 Aug 2008 21:17:35 +0200
+
 libnanoxml2-java (2.2.3.dfsg-1) unstable; urgency=low
 
   * Initial release (Closes: #478727)
diff --git a/debian/control b/debian/control
index 8c92c87..86bd6c3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,20 @@ Source: libnanoxml2-java
 Section: libs
 Priority: optional
 Maintainer: Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net>
-Build-Depends: debhelper (>= 5),
-               classpath-doc,
-               default-jdk-builddep
+Build-Depends: debhelper (>= 5)
+Build-Depends-Indep: classpath-doc,
+                     default-jdk-builddep
 Standards-Version: 3.8.0
-Homepage: http://nanoxml.cyberelf.be/
+Homepage: http://devkix.com/nanoxml.php
 
 Package: libnanoxml2-java
 Architecture: all
 Depends: openjdk-6-jre | java2-runtime
 Suggests: libnanoxml2-java-doc
 Description: small XML parser for Java
- NanoXML is a (actually more than one) small XML parser for Java.
- Provides the Java packages net.n3.nanoxml.*, net.n3.nanoxml.sax.* and
- nanoxml.* in different jars.
+ NanoXML is a (actually more than one) small XML parser for Java. It
+ provides the Java packages net.n3.nanoxml.*, net.n3.nanoxml.sax.* and
+ nanoxml.* in nanoxml2.jar, nanoxml2-sax.jar and nanoxml2-lite.jar.
  The package nanoxml.* is source compatible with NanoXML 1 but is more
  restrictive on what it will parse than NanoXML 1.
 
diff --git a/debian/copyright b/debian/copyright
index 261006d..9468fc7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ This package was debianized by Sveinung Kvilhaugsvik
 <sveinung84 at users.sourceforge.net> on Wed, 23 Apr 2008 20:12:50 +0000.
 
 It was downloaded from http://nanoxml.cyberelf.be/
-It was modified to remove a jar.
+It was modified to remove generated files.
 To reproduce call get-orig-source in debian/rules
 
 Upstream Author: 
diff --git a/debian/rules b/debian/rules
index b61abea..709d0b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,20 +35,25 @@ SAX := nanoxml2-sax-${VERSION}.jar
 build: build-stamp test
 
 build-stamp:
+	mkdir classes
 	(cd Sources/Lite && \
+	mkdir ../../classes/Lite && \
 	${JAVAC} ${JFLAGS} -d ../../classes/Lite `find -iname *.java`)
 	(cd classes/Lite && \
 	${JAR} cf ../../${LITE} * )
 	(cd Sources/Java && \
+	mkdir ../../classes/Java && \
 	${JAVAC} ${JFLAGS} -d ../../classes/Java `find -iname *.java`)
 	(cd classes/Java && ${JAR} cf ../../${NANOXML} * )
-	(cd Sources/SAX && ${JAVAC} ${JFLAGS} -d ../../classes/SAX \
+	(cd Sources/SAX && \
+	mkdir ../../classes/SAX && \
+	${JAVAC} ${JFLAGS} -d ../../classes/SAX \
 	-cp ../../${NANOXML} `find -iname *.java`)
 	(cd classes/SAX && \
 	echo Class-Path: /usr/share/java/${NANOXML} >> manifest && \
-	${JAR} cf ../../${SAX} net  -m manifest)
+	${JAR} cmf manifest ../../${SAX} net)
 	${JAVADOC} -author -link /usr/share/doc/classpath-doc/api/ -quiet \
-	-sourcepath Sources/Java/:Sources/Lite/:Sources/SAX/ -validhtml \
+	-sourcepath Sources/Java/:Sources/Lite/:Sources/SAX/ -source 1.4 \
 	nanoxml net.n3.nanoxml net.n3.nanoxml.sax -d api
 	touch $@
 
diff --git a/debian/watch b/debian/watch
index 1a242ac..4656f3f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,6 @@
 version=3
 opts=dversionmangle=s/\.dfsg(.)*//g \
-http://nanoxml.cyberelf.be/downloads/NanoXML-(.+)\.tar\.gz \
+http://devkix.com/nanoxml.php \
+NanoXML-(.+)\.tar\.gz \
 debian \
 debian/origCleaner.sh

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