[libjaxen-java] 11/49: Changes for the new release.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Oct 25 13:22:08 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libjaxen-java.
commit ed4e9e8f5c39ec80326c29addc3782b43e9c3252
Author: Marcus Better <marcus at better.se>
Date: Mon Oct 9 09:47:51 2006 +0000
Changes for the new release.
---
debian/changelog | 16 +++++----
debian/compat | 2 +-
debian/control | 20 +++++------
debian/copyright | 100 +++++++++++++++++++++++++--------------------------
debian/doc-base | 9 +++++
debian/rules | 71 ++++++++++++++++++++++++++++--------
debian/svn-deblayout | 2 ++
debian/watch | 3 ++
8 files changed, 140 insertions(+), 83 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0205d0a..ce3542d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,22 @@
-libjaxen-java (1.1.beta8-1) unstable; urgency=low
+libjaxen-java (1.1~beta11-1) unstable; urgency=low
+ [ Wolfgang Baer ]
* New upstream release
* libsaxpath-java code is now included in the jaxen source base
+ No more libsaxpath-java binary from this source
- + Added conflicts, replaces with libsaxpath-java
+ + Added conflicts, replaces with libsaxpath-java
* Updated jdom dependency to libjdom1-java
- * Updated documentation everywhere (description, README.Debian, download
+ * Updated documentation everywhere (description, README.Debian, download
location and copyright)
- * Applied several patches: 01_RemoveXomDom4jTests.patch - to disable
+ * Applied several patches: 01_RemoveXomDom4jTests.patch - to disable
outsourced dom4j/xom functionality from tests.
* Enabled junit tests
- -- Wolfgang Baer <WBaer at gmx.de> Sun, 12 Feb 2006 17:56:29 +0100
+ [ Marcus Better ]
+ * New upstream release.
+ * debian/rules: Don't use cdbs. Build with gcj instead of kaffe.
+
+ -- Marcus Better <marcus at better.se> Mon, 9 Oct 2006 11:08:37 +0200
libjaxen-java (1.0FCS-3) unstable; urgency=low
@@ -35,4 +40,3 @@ libjaxen-java (1.0FCS-1) unstable; urgency=low
* Initial Release.
-- Arnaud Vandyck <avdyk at debian.org> Fri, 15 Apr 2005 17:42:45 +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 ba6625c..2ba6389 100644
--- a/debian/control
+++ b/debian/control
@@ -2,20 +2,20 @@ Source: libjaxen-java
Section: libs
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.8), kaffe (>= 2:1.1.5-1), ant, ant-optional, junit, libjdom1-java, libjaxp1.2-java
-Standards-Version: 3.6.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>, Marcus Better <marcus at better.se>
+Build-Depends: debhelper (>= 5.0.0), ant, ant-optional
+Build-Depends-Indep: java-gcj-compat-dev, junit, libjdom1-java, libxerces2-java
+Standards-Version: 3.7.2
Package: libjaxen-java
Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime, libjdom1-java
+Depends: kaffe | java1-runtime | java2-runtime, libjdom1-java, libxerces2-java
Suggests: java-virtual-machine
Conflicts: libsaxpath-java
Replaces: libsaxpath-java
-Description: Java XPath engine for use on a variety of XML object models
- The Jaxen project is a Java XPath Engine. Jaxen is a universal object model
- walker, capable of evaluating XPath expressions across multiple models.
- Currently supported models are JDOM, DOM internally. DOM4J is supported
- through its own package. XOM is currently not packaged in Debian.
+Description: Java XPath engine
+ jaxen is a universal object model walker, capable of evaluating XPath
+ expressions across multiple models. Currently supported are dom4j,
+ JDOM, and DOM.
.
- Homepage: <http://jaxen.org>
+ Homepage: http://jaxen.org
diff --git a/debian/copyright b/debian/copyright
index 7c0a3bd..ffb178c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,55 +1,51 @@
This package was debianized by Arnaud Vandyck <avdyk at debian.org> on
Fri, 15 Apr 2005 15:53:37 +0200.
-It was downloaded <from http://jaxen.org/>
-
-Upstream Authors: Bob McWhirter <bob at werken.com> and
- James Strachan <jstrachan at apache.org>
-
-Copyright:
-
-/*
- $Id$
-
- Copyright 2003 (C) The Werken Company. All Rights Reserved.
-
- 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.
-
- 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 "jaxen" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of The Werken Company. For written permission,
- please contact bob at werken.com.
-
- 4. Products derived from this Software may not be called "jaxen"
- nor may "jaxen" appear in their names without prior written
- permission of The Werken Company. "jaxen" is a registered
- trademark of The Werken Company.
-
- 5. Due credit should be given to The Werken Company.
- (http://jaxen.werken.com/).
-
- THIS SOFTWARE IS PROVIDED BY THE WERKEN COMPANY 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
- THE WERKEN COMPANY 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.
-
- */
+It was downloaded from <http://jaxen.org>.
+
+Upstream Authors: Attila Szegedi, Bob McWhirter <bob at werken.com>,
+Bradley S. Huffman, Brett McLaughlin, David Megginson, Elliotte Rusty
+Harold, Erwin Bolwidt <ejb at klomp.org>, James Pereira
+<JPereira at CT.BBD.CO.ZA>, James Strachan <jstrachan at apache.org>, Jan
+Dvorak <jan.dvorak at mathan.cz>, Jason Hunter, Jérôme Nègre
+<jerome.negre at e-xmlmedia.fr>, Mark Wilson <mark at wilsoncom.de>, Stephen
+Colebourne.
+
+jaxen is Copyright (C) 2000-2005 Bob McWhirter and James Strachan
+ 2000-2004 Jason Hunter and Brett McLaughlin
+ 2001-2006 Codehaus
+ 2003-2006 The Werken Company
+ 2005-2006 Elliotte Rusty Harold
+
+License:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * 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.
+
+ * Neither the name of the Jaxen Project nor the names of its
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS 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 THE COPYRIGHT OWNER
+ OR 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 contributions to the Debian packaging by Marcus Better are
+Copyright (C) 2006 Marcus Better <marcus at better.se> and are licensed
+under the same license as above.
diff --git a/debian/doc-base b/debian/doc-base
new file mode 100644
index 0000000..904ac74
--- /dev/null
+++ b/debian/doc-base
@@ -0,0 +1,9 @@
+Document: libjaxen-java
+Title: jaxen API
+Author: jaxen developers
+Abstract: JavaDoc documentation for jaxen
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/libjaxen-java/api/index.html
+Files: /usr/share/doc/libjaxen-java/api/*
diff --git a/debian/rules b/debian/rules
index 3415f6c..467fa1a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,63 @@
#!/usr/bin/make -f
-# debian/rules for libjaxen-java (uses CDBS)
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_JARS_BASE := /usr/share/java
+JAVACMD := $(JAVA_HOME)/bin/java
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/ant.mk
+DEB_JARS := ant ant-launcher jdom1 ant-junit junit xercesImpl
-JAVA_HOME := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-junit.jar jdom1 junit
-DEB_ANT_BUILD_TARGET := jar javadoc
+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)
-VERSION=1.1.beta8
+DEB_ANT_ARGS := -propertyfile debian/ant.properties
+ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
+ org.apache.tools.ant.Main $(DEB_ANT_ARGS)
-install/libjaxen-java::
- install -m 644 target/jaxen-1.1-beta-8.jar debian/libjaxen-java/usr/share/java/jaxen-$(VERSION).jar
- ln -s jaxen-$(VERSION).jar debian/libjaxen-java/usr/share/java/jaxen.jar
+PKGNAME := libjaxen-java
+INSTALLDIR := $(CURDIR)/debian/$(PKGNAME)
+JAVALIBDIR := $(INSTALLDIR)/usr/share/java
+
+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) all javadoc 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
+ install -m 644 target/jaxen-1.1-beta-11.jar $(JAVALIBDIR)/jaxen-$(VERSION).jar
+ ln -s jaxen-$(VERSION).jar $(JAVALIBDIR)/jaxen.jar
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ 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
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..018c8f0
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts="dversionmangle=s/~beta/-beta-/" \
+ http://dist.codehaus.org/jaxen/distributions/jaxen-(.*)-src.tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjaxen-java.git
More information about the pkg-java-commits
mailing list