[libnanoxml2-java] 04/09: Imported Debian patch 2.2.3.dfsg-3
Andreas Tille
tille at debian.org
Wed Dec 23 17:43:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository libnanoxml2-java.
commit 43e43add06fd88c7486ff5a37ded9e483b9537d3
Author: Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net>
Date: Fri Feb 5 15:19:08 2010 +0100
Imported Debian patch 2.2.3.dfsg-3
---
debian/changelog | 23 +++++++++++++
debian/control | 15 +++++----
debian/copyright | 4 +--
debian/libnanoxml2-java-doc.install | 1 -
debian/libnanoxml2-java-doc.javadoc | 1 +
debian/libnanoxml2-java.install | 1 -
debian/libnanoxml2-java.jlibs | 1 +
debian/libnanoxml2-java.links | 10 +++---
debian/rules | 65 ++++++++++++++++++-------------------
9 files changed, 73 insertions(+), 48 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c83794f..f9cadb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+libnanoxml2-java (2.2.3.dfsg-3) unstable; urgency=low
+
+ * Depend on headless since full jre not needed
+ * Removed (C) from debian/copyright (Lintian fix)
+ * Added misc:Depends (Lintian fix)
+ * Changed section to java
+ * Use javahelper to shorten rules
+ + Use jh_build to build jars
+ + Use jh_installlibs to install jars
+ * Correct misunderstanding about Debian policy for naming jars
+ + Add links to old jar names in case someone used them
+ + Also link to how upstreams name the jars
+ * Should now follow Debian Policy 3.8.4.0
+ + Support nocheck in DEB_BUILD_OPTIONS
+ * depend on default-jdk-doc instead of classpath-doc (Closes: #567284)
+ * Don't build dep on default-jdk-builddep (pointed out by Matthew Johnson)
+ * Don't depend on openjdk as default (pointed out by Matthew Johnson)
+ * Use bnd to add OSGi metadata during build
+ * Use jh_installjavadoc to install and register javadocs
+ * Remove unused lines in clean target of rules
+
+ -- Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net> Fri, 05 Feb 2010 15:19:08 +0100
+
libnanoxml2-java (2.2.3.dfsg-2) unstable; urgency=low
* Made description and copyright file more precise
diff --git a/debian/control b/debian/control
index 86bd6c3..fca1286 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,19 @@
Source: libnanoxml2-java
-Section: libs
+Section: java
Priority: optional
Maintainer: Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net>
Build-Depends: debhelper (>= 5)
-Build-Depends-Indep: classpath-doc,
- default-jdk-builddep
-Standards-Version: 3.8.0
+Build-Depends-Indep: default-jdk-doc,
+ default-jdk,
+ bnd,
+ perl,
+ javahelper
+Standards-Version: 3.8.4.0
Homepage: http://devkix.com/nanoxml.php
Package: libnanoxml2-java
Architecture: all
-Depends: openjdk-6-jre | java2-runtime
+Depends: default-jre-headless | java2-runtime-headless, ${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
@@ -22,7 +25,7 @@ Description: small XML parser for Java
Package: libnanoxml2-java-doc
Architecture: all
Section: doc
-Depends: classpath-doc
+Depends: default-jdk-doc, ${misc:Depends}
Description: documentation for libnanoxml2-java
NanoXML is a small XML parser for Java. This is the javadoc for it
(the Java packages net.n3.nanoxml.*, net.n3.nanoxml.sax.* and nanoxml.*)
diff --git a/debian/copyright b/debian/copyright
index 9468fc7..a13dd64 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Upstream Author:
Copyright:
- Copyright (C) 2000-2002 Marc De Scheemaecker
+ Copyright ©2000-2002 Marc De Scheemaecker
License:
@@ -33,6 +33,6 @@ the following restrictions:
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
-The Debian packaging is (C) 2008, Sveinung Kvilhaugsvik
+The Debian packaging is ©2008-2009, Sveinung Kvilhaugsvik
<sveinung84 at users.sourceforge.net> and is licensed under the GPL, see
`/usr/share/common-licenses/GPL' or the license above if you prefer that.
diff --git a/debian/libnanoxml2-java-doc.install b/debian/libnanoxml2-java-doc.install
index 25a521a..b094a6e 100644
--- a/debian/libnanoxml2-java-doc.install
+++ b/debian/libnanoxml2-java-doc.install
@@ -1,3 +1,2 @@
-api /usr/share/doc/libnanoxml2-java/
Examples/* /usr/share/doc/libnanoxml2-java/examples
diff --git a/debian/libnanoxml2-java-doc.javadoc b/debian/libnanoxml2-java-doc.javadoc
new file mode 100644
index 0000000..2e2f46e
--- /dev/null
+++ b/debian/libnanoxml2-java-doc.javadoc
@@ -0,0 +1 @@
+api /usr/share/doc/libnanoxml2-java/api
diff --git a/debian/libnanoxml2-java.install b/debian/libnanoxml2-java.install
deleted file mode 100644
index e93b983..0000000
--- a/debian/libnanoxml2-java.install
+++ /dev/null
@@ -1 +0,0 @@
-*.jar /usr/share/java
diff --git a/debian/libnanoxml2-java.jlibs b/debian/libnanoxml2-java.jlibs
new file mode 100644
index 0000000..d392f0e
--- /dev/null
+++ b/debian/libnanoxml2-java.jlibs
@@ -0,0 +1 @@
+*.jar
diff --git a/debian/libnanoxml2-java.links b/debian/libnanoxml2-java.links
index 74ba0a0..a43472b 100644
--- a/debian/libnanoxml2-java.links
+++ b/debian/libnanoxml2-java.links
@@ -1,4 +1,6 @@
-/usr/share/java/nanoxml2-2.2.3.jar /usr/share/java/nanoxml2.jar
-/usr/share/java/nanoxml2-lite-2.2.3.jar /usr/share/java/nanoxml2-lite.jar
-/usr/share/java/nanoxml2-sax-2.2.3.jar /usr/share/java/nanoxml2-sax.jar
-
+/usr/share/java/nanoxml-sax-2.2.3.jar /usr/share/java/nanoxml2-2.2.3.jar
+/usr/share/java/nanoxml-lite-2.2.3.jar /usr/share/java/nanoxml2-lite-2.2.3.jar
+/usr/share/java/nanoxml-lite.jar /usr/share/java/nanoxml2-lite.jar
+/usr/share/java/nanoxml-sax-2.2.3.jar /usr/share/java/nanoxml2-sax-2.2.3.jar
+/usr/share/java/nanoxml-sax.jar /usr/share/java/nanoxml2-sax.jar
+/usr/share/java/nanoxml.jar /usr/share/java/nanoxml2.jar
diff --git a/debian/rules b/debian/rules
index 709d0b5..c926e04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,45 +16,40 @@
# This has to be exported to make some magic below work.
export DH_OPTIONS
-JAVA?=/usr/lib/jvm/default-java/bin/java
-JAVAC?=/usr/lib/jvm/default-java/bin/javac
-JAR?=/usr/lib/jvm/default-java/bin/jar
+JAVA_HOME?=/usr/lib/jvm/default-java
JFLAGS?=-source 1.4 -nowarn
-JAVADOC?=/usr/lib/jvm/default-java/bin/javadoc
SRCDIR := $(shell echo ./$(word $(words ${MAKEFILE_LIST}), ${MAKEFILE_LIST}) | \
sed -r "s/debian\/rules$$//")
VERSION := $(shell cd ${SRCDIR} && dpkg-parsechangelog | egrep '^Version:' | \
cut -f 2 -d ' ' | sed -r 's/\.dfsg(.)*//g')
-NANOXML := nanoxml2-${VERSION}.jar
-LITE := nanoxml2-lite-${VERSION}.jar
-SAX := nanoxml2-sax-${VERSION}.jar
+NANOXML := nanoxml.jar
+LITE := nanoxml-lite.jar
+SAX := nanoxml-sax.jar
#Architecture
-build: build-stamp test
+build: build-stamp
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 && \
- 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} cmf manifest ../../${SAX} net)
- ${JAVADOC} -author -link /usr/share/doc/classpath-doc/api/ -quiet \
+ jh_build -o'${JFLAGS}' -N ${LITE} Sources/Lite/
+ jh_build -o'${JFLAGS}' -N ${NANOXML} Sources/Java/
+ 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
+
+ cp /usr/share/doc/default-jdk-doc/api/package-list.gz .
+ gunzip package-list.gz
+ ${JAVA_HOME}/bin/javadoc -author -linkoffline /usr/share/doc/default-jdk-doc/api . -quiet \
-sourcepath Sources/Java/:Sources/Lite/:Sources/SAX/ -source 1.4 \
nanoxml net.n3.nanoxml net.n3.nanoxml.sax -d api
+ if [ $(filter nocheck, $(DEB_BUILD_OPTIONS)) ]; \
+ then echo "Disabeling tests"; \
+ else make -f debian/rules test; \
+ fi;
touch $@
clean:
@@ -62,14 +57,14 @@ clean:
dh_testroot
rm -f build-stamp test
- rm -rf classes || echo "no classes to remove"
- rm ${SAX} ${NANOXML} ${LITE} || echo "no jars to remove"
+ jh_clean
+ rm ${SAX} ${NANOXML} ${LITE} *.bar || echo "no jars to remove"
rm -rf api
- rm -rf debian/libnanoxml2-java-docs || echo "no old bin to remove"
- rm -rf debian/libnanoxml2-java || echo "no old bin to remove"
rm -rf Test/*/*.class
rm -rf debian/orig.tmp || echo "No failed source fetch"
+ rm -r package-list package-list.gz || echo "package-list not copied"
+
dh_clean
install:
@@ -77,6 +72,8 @@ install:
dh_testroot
dh_clean -k -i
+ jh_installlibs -i
+ jh_installjavadoc -plibnanoxml2-java-doc
dh_install -i
# Must not depend on anything. This is to be called by
@@ -107,18 +104,18 @@ binary: binary-indep
test:
set -e
cd Test/Lite && \
- ${JAVAC} ${JFLAGS} -cp .:../../${LITE} `find -iname *.java` && \
+ ${JAVA_HOME}/bin/javac ${JFLAGS} -cp .:../../${LITE} `find -iname *.java` && \
for TESTFILE in *.xml; \
- do if [ "`${JAVA} -cp .:../../${LITE} DumpXML_Lite $${TESTFILE}`" != "`cat $${TESTFILE}.out`" ]; \
+ do if [ "`${JAVA_HOME}/bin/java -cp .:../../${LITE} DumpXML_Lite $${TESTFILE}`" != "`cat $${TESTFILE}.out`" ]; \
then echo ${LITE} failed $${TESTFILE}; \
exit 1; \
fi; \
done
cd Test/Java && \
- ${JAVAC} ${JFLAGS} -cp .:../../${NANOXML} `find -iname *.java` && \
+ ${JAVA_HOME}/bin/javac ${JFLAGS} -cp .:../../${NANOXML} `find -iname *.java` && \
for TESTFILE in *.xml; \
- do if [ "`${JAVA} -cp .:../../${NANOXML} DumpXML $${TESTFILE}`" != "`cat $${TESTFILE}.out`" ] ;\
+ do if [ "`${JAVA_HOME}/bin/java -cp .:../../${NANOXML} DumpXML $${TESTFILE}`" != "`cat $${TESTFILE}.out`" ] ;\
then echo ${NANOXML} failed $${TESTFILE}; \
exit 1; \
fi; \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libnanoxml2-java.git
More information about the pkg-java-commits
mailing list