[dom4j] 04/20: Packaging changes for new release.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Oct 25 10:34:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to annotated tag debian/1.6.1+dfsg-1
in repository dom4j.
commit 6caea9b3341bcdfc9208860bb8c43d0309c63ba2
Author: Marcus Better <marcus at better.se>
Date: Mon Oct 9 19:25:33 2006 +0000
Packaging changes for new release.
---
debian/README.Debian | 14 +++----
debian/README.Debian-source | 8 ++--
debian/changelog | 12 ++++--
debian/compat | 2 +-
debian/control | 32 ++++++---------
debian/copyright | 83 +++++++++++++++++++--------------------
debian/libdom4j-java-doc.doc-base | 11 +++---
debian/rules | 78 ++++++++++++++++++++++++++++--------
debian/svn-deblayout | 2 +
debian/watch | 3 ++
10 files changed, 145 insertions(+), 100 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 40ef310..225c673 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,10 +1,10 @@
-libdom4j-java for Debian
----------------------
+dom4j for Debian
+----------------
-dom4j for debian is currently build without support for xsd because
-of license issues.
+dom4j for debian is currently built without support for xsd because of
+license issues.
-Cause of circular dependencies with libjaxen-java for the XPath support
-dom4j jar will include the needed jaxen classes in its library.
+Because of circular dependencies with libjaxen-java for the XPath
+support, the dom4j jar will include the needed jaxen classes.
--- Wolfgang Baer <WBaer at gmx.de> Sat, 15 Oct 2005 13:34:45 +0200
+ -- Marcus Better <marcus at better.se>, Mon, 9 Oct 2006 21:13:53 +0200
diff --git a/debian/README.Debian-source b/debian/README.Debian-source
index cb26411..3daf09e 100644
--- a/debian/README.Debian-source
+++ b/debian/README.Debian-source
@@ -1,5 +1,5 @@
-From the original upstream distribution the prebuilt
-jar files were removed:
+The following changes have been applied to the upstream source package
+for DFSG compliance:
-rm -rf lib
-rm *.jar
+* Removed binary-only jars in the `lib' directory and its
+ subdirectories.
diff --git a/debian/changelog b/debian/changelog
index 9f21957..927b456 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
-libdom4j-java (1.6.1-1) unstable; urgency=low
+dom4j (1.6.1+dfsg-1) unstable; urgency=low
- * Initial Release (closes: #305227)
+ [ Wolfgang Baer ]
* Disabled support for STAX and datatypes (xsdlib)
- * Enabled junit tests - Stax/Datatype testcases failures are expected
- -- Wolfgang Baer <WBaer at gmx.de> Sat, 15 Oct 2005 13:34:45 +0200
+ [ Marcus Better ]
+ * Initial release. (Closes: #305227)
+ * Removed binary third-party jars from source tarball.
+ * debian/rules: Don't use cdbs.
+
+ -- Marcus Better <marcus at better.se> Mon, 9 Oct 2006 21:24:19 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 393f50f..ef7c910 100644
--- a/debian/control
+++ b/debian/control
@@ -1,33 +1,27 @@
-Source: libdom4j-java
+Source: dom4j
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.28), ant, ant-optional, kaffe, libxpp2-java, libxpp3-java, libjaxme-java, libjaxen-java (>= 1.1.beta8-1), libjaxp1.2-java, libjunitperf-java, junit, libxalan2-java, libxerces2-java
-Standards-Version: 3.6.2
+Uploaders: Marcus Better <marcus at better.se>
+Build-Depends: debhelper (>= 5.0.0), ant, ant-optional
+Build-Depends-Indep: antlr, java-gcj-compat-dev, libjaxen-java (>= 1.1~beta11), libjaxme-java, libxpp2-java, libxpp3-java, libxerces2-java, libxalan2-java, junit, libjunitperf-java
+Standards-Version: 3.7.2
Package: libdom4j-java
Architecture: all
-Section: libs
-Depends: kaffe | java1-runtime | java2-runtime, libxpp2-java, libxpp3-java, libjaxme-java, libjaxen-java (>= 1.1.beta8-1)
+Depends: kaffe | java1-runtime | java2-runtime, libjaxen-java (>= 1.1~beta11), libjaxme-java, libxpp2-java, libxpp3-java
Suggests: java-virtual-machine, libdom4j-java-doc
Description: flexible XML framework for Java
- dom4j is an open source framework for processing XML which is integrated with
- XPath and fully supports DOM, SAX, JAXP. It allows you to read, write,
- navigate, create and modify XML documents
- .
- Features:
- * full support for JAXP, SAX, DOM and XSLT (TrAX not in debian package)
- * fully integrated XPath support for easy navigation of XML documents
- * event based proccessing mode to support for massive documents or
- XML streams (based on XmlPull parser API)
+ dom4j is a library for working with XML, XPath and XSLT on the Java
+ platform using the Java Collections Framework and with full support
+ for DOM, SAX and JAXP.
.
- Homepage: http://www.dom4j.org/
+ Homepage: http://www.dom4j.org
Package: libdom4j-java-doc
Architecture: all
Section: doc
Suggests: libdom4j-java
-Description: documentation and API for libdom4j-java
- This package contains the html documentation for dom4j
- as well as the full javadoc API documentation.
+Description: documentation for libdom4j-java
+ This package contains the documentation for dom4j, including the API
+ Javadoc.
diff --git a/debian/copyright b/debian/copyright
index cb464f6..153317e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,58 +1,57 @@
This package was debianized by Wolfgang Baer <WBaer at gmx.de> on
Sat, 23 Apr 2005 15:23:09 +0200.
-It was downloaded from <http://www.dom4j.org/>
+It is currently maintained by the Debian Java Maintainers
+<pkg-java-maintainers at lists.alioth.debian.org>.
-Copyright:
+It was downloaded from <http://www.dom4j.org/>
-Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+dom4j is Copyright (C) 2001-2005 MetaStuff, Ltd.
-Upstream Authors: Curt Arnold, David Lucas, David White, Jakob Jenkov
+Upstream Authors: Curt Arnold, David Lucas, David White, Jakob Jenkov,
James Strachan, Laramie Crocker, Maarten Coene,
Michael Skells, Nick Sanderson, Steen Lehmann,
Tobias Rademacher, Bob McWhirter, Todd Wolff,
OuYang Chen, Yuxin Ruan, Aleksander Andrzej Slominski
-License:
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
+ 1. Redistributions of source code must retain copyright
+ statements and notices. Redistributions must also contain a
+ copy of this document.
-1. Redistributions of source code must retain copyright
- statements and notices. Redistributions must also contain a
- copy of this document.
-
-2. Redistributions in binary form must reproduce the
- above copyright notice, this list of conditions and the
- following disclaimer in the documentation and/or other
- materials provided with the distribution.
-
-3. The name "DOM4J" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of MetaStuff, Ltd. For written permission,
- please contact dom4j-info at metastuff.com.
-
-4. Products derived from this Software may not be called "DOM4J"
- nor may "DOM4J" appear in their names without prior written
- permission of MetaStuff, Ltd. DOM4J is a registered
- trademark of MetaStuff, Ltd.
-
-5. Due credit should be given to the DOM4J Project -
- http://www.dom4j.org
-
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
+ 2. Redistributions in binary form must reproduce the
+ above copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+ 3. The name "DOM4J" must not be used to endorse or promote
+ products derived from this Software without prior written
+ permission of MetaStuff, Ltd. For written permission,
+ please contact dom4j-info at metastuff.com.
+
+ 4. Products derived from this Software may not be called "DOM4J"
+ nor may "DOM4J" appear in their names without prior written
+ permission of MetaStuff, Ltd. DOM4J is a registered
+ trademark of MetaStuff, Ltd.
+
+ 5. Due credit should be given to the DOM4J Project -
+ http://www.dom4j.org
+
+ THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
The debian package also contains two classes from the jaxen project to
workaround circular dependencies. These classes are licensed as follows:
diff --git a/debian/libdom4j-java-doc.doc-base b/debian/libdom4j-java-doc.doc-base
index 3368635..607e9b2 100644
--- a/debian/libdom4j-java-doc.doc-base
+++ b/debian/libdom4j-java-doc.doc-base
@@ -1,10 +1,9 @@
Document: libdom4j-java-doc
-Title: Programmer API for libdom4j-java
-Author: Dom4J developers
-Abstract: Programmer API of the dom4j, a flexible XML framework for processing
- XML which is integrated with XPath and fully supports DOM, SAX, JAXP.
+Title: API Javadoc for dom4j
+Author: dom4j developers
+Abstract: This is the API Javadoc provided by the dom4j library.
Section: Programming
Format: HTML
-Index: /usr/share/doc/libdom4j-java-doc/apidocs/index.html
-Files: /usr/share/doc/libdom4j-java-doc/apidocs/*
+Index: /usr/share/doc/libdom4j-java-doc/api/index.html
+Files: /usr/share/doc/libdom4j-java-doc/api/*
diff --git a/debian/rules b/debian/rules
index f76d953..0f684e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,68 @@
#!/usr/bin/make -f
-# debian/rules file for dom4j (uses cdbs)
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_JARS_BASE := /usr/share/java
+JAVACMD := $(JAVA_HOME)/bin/java
-export UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+DEB_JARS := ant ant-launcher xpp2 xpp3 jaxen jaxme-api xalan2 xercesImpl \
+ ant-junit junit junitperf
-JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar xpp2 xpp3 jaxen jaxme-api junitperf xalan2 xercesImpl $(ANT_HOME)/lib/ant-junit.jar junit
-DEB_ANT_BUILD_TARGET := package test
+DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
+ if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
+ if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
+ if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
+ done; \
+ if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
-clean::
- rm -rf src/java/org/jaxen
+ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
+ org.apache.tools.ant.Main $(DEB_ANT_ARGS)
-common-configure-indep::
- # move jaxen/dom4j stuff to the source directory
- cp -r debian/jaxen_src/* src/java/
+PKGNAME := libjaxme-java
+INSTALLDIR := $(CURDIR)/debian/$(PKGNAME)
+JAVALIBDIR := $(INSTALLDIR)/usr/share/java
-install/libdom4j-java::
- install -m 644 build/dom4j.jar debian/libdom4j-java/usr/share/java/dom4j-$(UPSTREAM_VERSION).jar
- ln -s dom4j-$(UPSTREAM_VERSION).jar debian/libdom4j-java/usr/share/java/dom4j.jar
+VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\- | cut -f1 -d\+)
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+ $(ANT_INVOKE) package test
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ $(ANT_INVOKE) clean
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ mv $(INSTALLDIR)-doc/usr/share/doc/$(PKGNAME)-doc/apidocs \
+ $(INSTALLDIR)-doc/usr/share/doc/$(PKGNAME)-doc/api
+ install -m 644 build/dom4j.jar $(JAVALIBDIR)/dom4j-$(VERSION).jar
+ ln -s dom4j-$(VERSION).jar $(JAVALIBDIR)/dom4j.jar
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch: build install
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
+
+# move jaxen/dom4j stuff to the source directory
+# cp -r debian/jaxen_src/* src/java/
diff --git a/debian/svn-deblayout b/debian/svn-deblayout
new file mode 100644
index 0000000..3dc8c9c
--- /dev/null
+++ b/debian/svn-deblayout
@@ -0,0 +1,2 @@
+buildArea=../../build-area
+origDir=..
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..2514151
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="dversionmangle=s/\+dfsg//" \
+ http://sf.net/dom4j/dom4j-(.*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dom4j.git
More information about the pkg-java-commits
mailing list