[libjaxen-java] 30/49: libjaxen-java (1.1.1-3) unstable; urgency=low
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Oct 25 13:22:12 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 c4a9bdf053ed58dcb43d33984aba65a2664234ff
Author: Michael Koch <konqueror at gmx.de>
Date: Sun Jan 20 08:44:08 2008 +0000
libjaxen-java (1.1.1-3) unstable; urgency=low
* Added XOM support. Closes: 427813
* Port to CDBS.
* Depend on java-gcj-compat instead of kaffe.
* Renamed XS-Vcs-* fields to Vcs-*.
* Add Homepage field.
* Updated Standards-Version to 3.7.3.
* Added myself to Uploaders.
-- Michael Koch <konqueror at gmx.de> Sun, 20 Jan 2008 00:15:22 +0100
---
debian/README.Debian | 8 -------
debian/changelog | 12 ++++++++++
debian/control | 12 +++++-----
debian/doc-base | 4 ++--
debian/rules | 67 +++++++---------------------------------------------
5 files changed, 29 insertions(+), 74 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index a04d622..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,8 +0,0 @@
-libjaxen-java for Debian
-------------------------
-
-Jaxen in Debian supports JDOM, DOM and dom4j out of the box. Support
-for XOM is disabled for the time being, since XOM has not yet been
-packaged for Debian.
-
- -- Marcus Better <marcus at better.se>, Wed, 6 Jun 2007 17:35:58 +0200
diff --git a/debian/changelog b/debian/changelog
index 1b04ef7..8c2ea9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libjaxen-java (1.1.1-3) unstable; urgency=low
+
+ * Added XOM support. Closes: 427813
+ * Port to CDBS.
+ * Depend on java-gcj-compat instead of kaffe.
+ * Renamed XS-Vcs-* fields to Vcs-*.
+ * Add Homepage field.
+ * Updated Standards-Version to 3.7.3.
+ * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de> Sun, 20 Jan 2008 00:15:22 +0100
+
libjaxen-java (1.1.1-2) unstable; urgency=low
* Recommends libdom4j-java and libjdom1-java instead of depending on
diff --git a/debian/control b/debian/control
index d958744..07664bd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,17 +2,17 @@ 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>, Marcus Better <marcus at better.se>
-Build-Depends: debhelper (>= 5), ant, ant-optional
-Build-Depends-Indep: java-gcj-compat-dev, junit, libjdom1-java, libxerces2-java, libdom4j-java
-Standards-Version: 3.7.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Marcus Better <marcus at better.se>, Michael Koch <konqueror at gmx.de>
+Build-Depends: cdbs, debhelper (>= 5), ant, ant-optional
+Build-Depends-Indep: java-gcj-compat-dev, junit, libjdom1-java, libxerces2-java, libdom4j-java, libxom-java
+Standards-Version: 3.7.3
Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjaxen-java
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjaxen-java/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjaxen-java
Homepage: http://jaxen.org
Package: libjaxen-java
Architecture: all
-Depends: kaffe | java1-runtime | java2-runtime, libxerces2-java
+Depends: java-gcj-compat | java1-runtime | java2-runtime, libxerces2-java
Recommends: libdom4j-java, libjdom1-java
Suggests: java-virtual-machine
Conflicts: libsaxpath-java
diff --git a/debian/doc-base b/debian/doc-base
index d354d77..3478687 100644
--- a/debian/doc-base
+++ b/debian/doc-base
@@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided by the jaxen library.
Section: Programming
Format: HTML
-Index: /usr/share/doc/libjaxen-java/apidocs/index.html
-Files: /usr/share/doc/libjaxen-java/apidocs/*
+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 4753540..3e3293d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,62 +1,13 @@
#!/usr/bin/make -f
-JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_JARS_BASE := /usr/share/java
-JAVACMD := $(JAVA_HOME)/bin/java
+include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
-DEB_JARS := ant ant-launcher ant-junit junit
+JAVA_HOME := /usr/lib/jvm/java-gcj
+DEB_JARS := ant-junit junit xom
+DEB_ANT_BUILD_TARGET := dist
-DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
- echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; \
- done; \
- if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
-
-DEB_ANT_ARGS := -propertyfile debian/ant.properties
-ANT_INVOKE := $(JAVACMD) -classpath $(DEB_CLASSPATH) \
- org.apache.tools.ant.Main $(DEB_ANT_ARGS)
-
-PKGNAME := libjaxen-java
-INSTALLDIR := $(CURDIR)/debian/$(PKGNAME)
-JAVALIBDIR := $(INSTALLDIR)/usr/share/java
-DOCDIR := $(INSTALLDIR)/usr/share/doc/$(PKGNAME)
-
-VERSION := $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
-
-build: build-stamp
-build-stamp:
- dh_testdir
- $(ANT_INVOKE) dist
- 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 dist/jaxen-$(VERSION).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
- mv $(DOCDIR)/api $(DOCDIR)/apidocs
- 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
+install/libjaxen-java::
+ install -m 644 -D dist/jaxen-$(DEB_UPSTREAM_VERSION).jar debian/libjaxen-java/usr/share/java/jaxen-$(DEB_UPSTREAM_VERSION).jar
+ dh_link -plibjaxen-java usr/share/java/jaxen-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jaxen.jar
--
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