[libxerces2-java] 08/61: Debian release 2.5.0-1

Sun Jun 18 22:23:38 UTC 2017

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libxerces2-java.

commit 487646ba2b1f68656b001aaa68ea161980b636fe
Author: Stefan Gybas <sgybas at debian.org>
Date:   Fri Oct 17 14:44:11 2003 +0000

    Debian release 2.5.0-1
---
 debian/changelog                    | 11 +++++
 debian/control                      | 12 +++--
 debian/libxerces2-java-doc.docs     |  2 +-
 debian/libxerces2-java-doc.examples |  2 +-
 debian/libxerces2-java.dirs         |  1 -
 debian/libxerces2-java.docs         |  6 +--
 debian/patches/01_xalan2_path.patch | 14 ++++++
 debian/rules                        | 92 ++++++++++++++-----------------------
 8 files changed, 71 insertions(+), 69 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 33578f5..5da388d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libxerces2-java (2.5.0-1) unstable; urgency=low
+
+  * New upstream release (closes: #206185)
+  * Renamed to source package to libxerces2-java
+  * Set maintainer to Debian Java Maintainers
+  * Mention XML Inclusions (XInclude) in the long description
+  * Standards-Version: 3.6.1
+    + Changed Build-Depends-Indep to Build-Depends
+
+ -- Stefan Gybas <sgybas at debian.org>  Fri, 17 Oct 2003 15:22:07 +0200
+
 xerces2-j (2.4.0-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 23b872a..a95d108 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,10 @@
-Source: xerces2-j
+Source: libxerces2-java
 Section: contrib/libs
 Priority: optional
-Maintainer: Stefan Gybas <sgybas at debian.org>
-Uploaders: Takashi Okamoto <tora at debian.org>, Ola Lundqvist <opal at debian.org>
-Build-Depends-Indep: debhelper (>= 4.1.0), ant (>= 1.5-1), j2sdk1.4, jikes (>= 1.18), libxerces-java, libxalan2-java
-Standards-Version: 3.5.9
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Stefan Gybas <sgybas at debian.org>, Takashi Okamoto <tora at debian.org>
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.1.0), libant1.5-java, j2re1.4, jikes (>= 1.18), libxerces-java, libxalan2-java
+Standards-Version: 3.6.1
 
 Package: libxerces2-java
 Architecture: all
@@ -25,6 +25,8 @@ Description: Validating XML parser for Java
   * XML Schema 1.0 Structures and Datatypes Recommendations
   * experimental implementation of the Document Object Model (DOM) Level 3
     Core and Load/Save Working Drafts
+  * provides a partial implementation of the XML Inclusions (XInclude) W3C
+    Candidate Recommendation
  .
  Xerces is now able to parse documents written according to the XML 1.1
  Candidate Recommendation, except that it does not yet provide an option to
diff --git a/debian/libxerces2-java-doc.docs b/debian/libxerces2-java-doc.docs
index a401422..c0a6098 100644
--- a/debian/libxerces2-java-doc.docs
+++ b/debian/libxerces2-java-doc.docs
@@ -1 +1 @@
-build/docs/*
+build-tree/xerces/build/docs/*
diff --git a/debian/libxerces2-java-doc.examples b/debian/libxerces2-java-doc.examples
index 781fb73..eee42a3 100644
--- a/debian/libxerces2-java-doc.examples
+++ b/debian/libxerces2-java-doc.examples
@@ -1 +1 @@
-samples/*
+build-tree/xerces/samples/*
diff --git a/debian/libxerces2-java.dirs b/debian/libxerces2-java.dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/libxerces2-java.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libxerces2-java.docs b/debian/libxerces2-java.docs
index ea4894c..1ae120a 100644
--- a/debian/libxerces2-java.docs
+++ b/debian/libxerces2-java.docs
@@ -1,3 +1,3 @@
-ISSUES
-STATUS
-TODO
+build-tree/xerces/ISSUES
+build-tree/xerces/STATUS
+build-tree/xerces/TODO
diff --git a/debian/patches/01_xalan2_path.patch b/debian/patches/01_xalan2_path.patch
new file mode 100644
index 0000000..3f97738
--- /dev/null
+++ b/debian/patches/01_xalan2_path.patch
@@ -0,0 +1,14 @@
+--- build.xml.orig
++++ build.xml
+@@ -333,9 +334,10 @@
+   <target name="docs" depends="prepare, prepare-docs">
+     <echo message="Building docs for ${parser.Name} ${parser.Version} ..." />
+     <java fork="yes"
+-          classpath="${java.class.path}:${doc.generator.package}:./tools/xalan.jar"
++          classpath="/usr/share/java/xerces.jar:${java.class.path}:${doc.generator.package}:/usr/share/java/xalan2.jar"
+           classname="${doc.generator}"
+           failOnError="yes">
++      <jvmarg value="-Djava.awt.headless=true"/>
+       <arg value="targetDirectory=${build.docs}"/>
+       <arg value="${build.dir}/xdocs/docs-book.xml"/>
+       <arg value="${build.dir}/xdocs/style"/>
diff --git a/debian/rules b/debian/rules
index d2c4a3d..01d9245 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,68 +1,44 @@
 #!/usr/bin/make -f
-# debian/rules file for xerces2-j (uses debhelper)
+# debian/rules file for libxerces2-java (uses cdbs)
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# DEB_TAR_SRCDIR has to be defined (It's the directory that is unpacked from
+# the tarball).
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed -e "s/\./_/g")
+DEB_TAR_SRCDIR   := xerces-$(UPSTREAM_VERSION)
+TOOLS_SRCDIR     := tools
 
-# Build using Blackdown's JDK 1.4 package
-export JAVA_HOME=/usr/lib/j2se/1.4
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/tarball.mk
+include /usr/share/cdbs/1/class/ant.mk
 
-ANT=/usr/bin/ant
-UPSTREAM_VERSION = $(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)
+# Directories to look for JAVA_HOME (JDK 1.4+ required!)
+JAVA_HOME_DIRS := /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4
+ANT_HOME := /usr/share/ant1.5
 
-build: build-stamp
-build-stamp:
-	dh_testdir
-	$(ANT) jar-dom3 apijar-dom3 sampjar-dom3 docs javadocs
-	touch build-stamp
+# Additional JARs to add to the class path, either full path or just the
+# basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
+DEB_JARS := xerces $(CURDIR)/$(DEB_SRCDIR)/tools/xml-apis.jar $(CURDIR)/$(DEB_SRCDIR)/tools/bin/xjavac.jar
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	rm -rf build
-	dh_clean
+# Build compiler
+DEB_ANT_COMPILER := jikes
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	install -m 644 build/dom3-xercesImpl.jar debian/libxerces2-java/usr/share/java/xercesImpl-$(UPSTREAM_VERSION).jar
-	ln -s xercesImpl-$(UPSTREAM_VERSION).jar debian/libxerces2-java/usr/share/java/xercesImpl.jar
-	install -m 644 build/dom3-xml-apis.jar debian/libxerces2-java/usr/share/java/xmlParserAPIs-$(UPSTREAM_VERSION).jar
-	ln -s xmlParserAPIs-$(UPSTREAM_VERSION).jar debian/libxerces2-java/usr/share/java/xmlParserAPIs.jar
-	install -m 644 build/xercesSamples.jar debian/libxerces2-java/usr/share/java/xercesSamples-$(UPSTREAM_VERSION).jar
-	ln -s xercesSamples-$(UPSTREAM_VERSION).jar debian/libxerces2-java/usr/share/java/xercesSamples.jar
+# Ant targets to call
+DEB_ANT_BUILD_TARGET := jar-dom3 apijar-dom3 sampjar-dom3 docs javadocs
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-#	dh_installdebconf	
-	dh_installdocs
-	dh_installexamples
-#	dh_installmenu
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
-#	dh_undocumented
-	dh_installchangelogs
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-#	dh_perl
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+API_VERSION     := 2.5
 
-# Build architecture-dependent files here.
-binary-arch: build install
-# We have nothing to do here
+pre-build:: $(DEB_SRCDIR)/tools
+$(DEB_SRCDIR)/tools:
+	ln -s $(DEB_TAR_SRCDIR)  $(_cdbs_tarball_dir)/xerces
+	ln -s ../tools $(DEB_SRCDIR)
+
+install/libxerces2-java::
+	mkdir -p debian/libxerces2-java/usr/share/java
+	install -m 644 $(DEB_SRCDIR)/build/dom3-xercesImpl.jar debian/libxerces2-java/usr/share/java/xercesImpl-$(API_VERSION).jar
+	ln -s xercesImpl-$(API_VERSION).jar debian/libxerces2-java/usr/share/java/xercesImpl.jar
+	install -m 644 $(DEB_SRCDIR)/build/dom3-xml-apis.jar debian/libxerces2-java/usr/share/java/xmlParserAPIs-$(API_VERSION).jar
+	ln -s xmlParserAPIs-$(API_VERSION).jar debian/libxerces2-java/usr/share/java/xmlParserAPIs.jar
+	install -m 644 $(DEB_SRCDIR)/build/xercesSamples.jar debian/libxerces2-java/usr/share/java/xercesSamples-$(API_VERSION).jar
+	ln -s xercesSamples-$(API_VERSION).jar debian/libxerces2-java/usr/share/java/xercesSamples.jar
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

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

