[libxerces2-java] 10/61: Debian release 2.6.1-1 (split from libxerces2-java-doc, moved to main!)
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
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 083555faa3b5d0d6fc619971e1c32059c572b334
Author: Stefan Gybas <sgybas at debian.org>
Date: Wed Feb 18 13:26:08 2004 +0000
Debian release 2.6.1-1 (split from libxerces2-java-doc, moved to main!)
---
debian/README.Debian | 17 +++++++--------
debian/ant.properties | 4 ++++
debian/changelog | 14 +++++++++++++
debian/control | 32 ++++++++--------------------
debian/copyright | 3 ---
debian/libxerces2-java-doc.docs | 1 -
debian/libxerces2-java-doc.examples | 1 -
debian/libxerces2-java.docs | 6 +++---
debian/libxerces2-java.install | 1 +
debian/libxerces2-java.links | 2 ++
debian/patches/01_xalan2_path.patch | 14 -------------
debian/patches/01_xjavac_taskdef.patch | 11 ++++++++++
debian/patches/02_build_dont_unzip.patch | 18 ++++++++++++++++
debian/rules | 36 +++++++++++---------------------
14 files changed, 81 insertions(+), 79 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 6827eef..752f1f7 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,20 +1,17 @@
Xerces2-J for Debian
====================
-- Unlike Xerces-J (libxerces-java) this package contains 2 JARs in
- /usr/share/java/ which both need to be in your class path:
+- Unlike Xerces-J 1.x (Debian package libxerces-java) this package contains
+ two JARs in /usr/share/java/ which both need to be in your class path:
* xercesImpl.jar contains the actual Xerces parser
* xmlParserAPIs.jar contains the XML APIs (DOM, SAX) which are used by
- all standard XML parsers
+ all standard XML parsers. This is a symbolic link to jaxp-1.2.jar from
+ the libjaxp1.2-java package.
-- The APIs have not changed since the previous version so your application
+- The APIs have not changed since the previous version so your applications
should run fine with this new version if you don't use any internal
classes.
-- This package is in contrib because it requires Ant (which in turn requires
- an XML parser!?!) to build and a Java2 environment (JDK 1.2 and above) to
- run. This means that you need libxerces-java to build this package.
-
-- The HTML documentation for Xerces2-J, the XML APIs and XNI (Xerces Native
- Interface) can be found in the libxerces2-java-doc package.
+- The HTML documentation for Xerces2-J and XNI (Xerces Native Interface) can
+ be found in the libxerces2-java-doc package in the contrib section.
diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 0000000..f01a99a
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1,4 @@
+jar.apis=jaxp-1.2.jar
+jar.resolver=xml-commons-resolver-1.1.jar
+tools.dir=/usr/share/java
+
diff --git a/debian/changelog b/debian/changelog
index 6220003..71ee5af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libxerces2-java (2.6.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Split the libxerces2-java source package into libxerces2-java (main)
+ and libxerces2-java-doc (contrib). The package in main now builds the
+ library package, the one in contrib the documentation. Building the
+ documentation requires JDK 1.4 and other packages from contrib. The split
+ also avoids circular build dependencies with Xalan-J.
+ * Use Kaffe, Jikes and Ant 1.6 to build the package
+ * Use the new libjaxp1.2-java and libxml-commons-resolver1.1-java packages
+ * Updated the package description and README.Debian
+
+ -- Stefan Gybas <sgybas at debian.org> Wed, 18 Feb 2004 14:17:24 +0100
+
libxerces2-java (2.6.0-1) unstable; urgency=low
* New upstream release
diff --git a/debian/control b/debian/control
index dc8f554..1d676cf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,17 +1,17 @@
Source: libxerces2-java
-Section: contrib/libs
+Section: libs
Priority: optional
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
+Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.1.0), kaffe (>= 1.1.3-1), jikes (>= 1.18), libant1.6-java, libxerces-java, libjaxp1.2-java, libxml-commons-resolver1.1-java
Standards-Version: 3.6.1
Package: libxerces2-java
Architecture: all
-Section: contrib/libs
-Depends: classpath | java1-runtime | java2-runtime
+Section: libs
+Depends: classpath | java1-runtime | java2-runtime, libjaxp1.2-java
Suggests: libxerces2-java-doc
-Description: Validating XML parser for Java
+Description: Validating XML parser for Java with DOM level 3 support
The Xerces2 Java parser is the reference implementation of XNI, the
Xerces Native Interface, and also a fully conforming XML Schema processor.
.
@@ -20,12 +20,12 @@ Description: Validating XML parser for Java
* Namespaces in XML Recommendation
* Document Object Model (DOM) Level 2 Core, Events, and Traversal and
Range Recommendations
- * Simple API for XML (SAX) 2.0 Core and Extension
- * Java APIs for XML Processing (JAXP) 1.1
+ * Simple API for XML (SAX) 2.0.1 Core and Extension
+ * Java APIs for XML Processing (JAXP) 1.2.01
* XML Schema 1.0 Structures and Datatypes Recommendations
- * experimental implementation of the Document Object Model (DOM) Level 3
+ * 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
+ * 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
@@ -38,17 +38,3 @@ Description: Validating XML parser for Java
For more information about Xerces2-J see the home page at
http://xml.apache.org/xerces2-j/index.html.
-Package: libxerces2-java-doc
-Architecture: all
-Section: contrib/libs
-Suggests: libxerces2-java, doc-html-w3
-Description: Validating XML parser for Java - Documentation and examples
- The Xerces2 Java parser is the reference implementation of XNI, the
- Xerces Native Interface, and also a fully conforming XML Schema processor.
- .
- This package contains the documentation in HTML format, the Javadoc API
- documentation and some examples.
- .
- For more information about Xerces2-J see the home page at
- http://xml.apache.org/xerces2-j/index.html.
-
diff --git a/debian/copyright b/debian/copyright
index 2fc71c1..b507ae4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,6 @@
This package was debianized by Stefan Gybas <sgybas at debian.org> on 07-Feb-2002.
The source was downloaded from http://www.apache.de/dist/xml/xerces-j/
-The Debian orig.tar.gz contains the files Xerces-J-src.*.tar.gz and
-Xerces-J-tools.*.tar.gz from the above download site.
-
Copyright:
/*
diff --git a/debian/libxerces2-java-doc.docs b/debian/libxerces2-java-doc.docs
deleted file mode 100644
index c0a6098..0000000
--- a/debian/libxerces2-java-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-build-tree/xerces/build/docs/*
diff --git a/debian/libxerces2-java-doc.examples b/debian/libxerces2-java-doc.examples
deleted file mode 100644
index eee42a3..0000000
--- a/debian/libxerces2-java-doc.examples
+++ /dev/null
@@ -1 +0,0 @@
-build-tree/xerces/samples/*
diff --git a/debian/libxerces2-java.docs b/debian/libxerces2-java.docs
index 1ae120a..ea4894c 100644
--- a/debian/libxerces2-java.docs
+++ b/debian/libxerces2-java.docs
@@ -1,3 +1,3 @@
-build-tree/xerces/ISSUES
-build-tree/xerces/STATUS
-build-tree/xerces/TODO
+ISSUES
+STATUS
+TODO
diff --git a/debian/libxerces2-java.install b/debian/libxerces2-java.install
new file mode 100644
index 0000000..27c14a9
--- /dev/null
+++ b/debian/libxerces2-java.install
@@ -0,0 +1 @@
+build/xercesImpl.jar /usr/share/java
diff --git a/debian/libxerces2-java.links b/debian/libxerces2-java.links
new file mode 100644
index 0000000..575031a
--- /dev/null
+++ b/debian/libxerces2-java.links
@@ -0,0 +1,2 @@
+/usr/share/java/jaxp-1.2.jar /usr/share/java/xmlParserAPIs.jar
+
diff --git a/debian/patches/01_xalan2_path.patch b/debian/patches/01_xalan2_path.patch
deleted file mode 100644
index 3f97738..0000000
--- a/debian/patches/01_xalan2_path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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/patches/01_xjavac_taskdef.patch b/debian/patches/01_xjavac_taskdef.patch
new file mode 100644
index 0000000..a22a24e
--- /dev/null
+++ b/debian/patches/01_xjavac_taskdef.patch
@@ -0,0 +1,11 @@
+--- build.xml.orig 2004-02-17 15:11:07.000000000 +0100
++++ build.xml 2004-02-17 21:30:12.000000000 +0100
+@@ -19,7 +19,7 @@
+ <project default="usage" basedir=".">
+
+ <!-- enable compilation under IBM JDK 1.4 -->
+- <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
++ <taskdef name="xjavac" classname="org.apache.tools.ant.taskdefs.Javac"/>
+
+ <!-- Allow properties following these statements to be overridden -->
+ <!-- Note that all of these don't have to exist. They've just been defined
diff --git a/debian/patches/02_build_dont_unzip.patch b/debian/patches/02_build_dont_unzip.patch
new file mode 100644
index 0000000..9930f33
--- /dev/null
+++ b/debian/patches/02_build_dont_unzip.patch
@@ -0,0 +1,18 @@
+--- build.xml.orig 2004-01-30 16:42:54.000000000 +0100
++++ build.xml 2004-02-18 13:40:34.000000000 +0100
+@@ -191,6 +191,7 @@
+ </copy>
+
+ <!-- now deal with API's: -->
++ <!-- not neede for Debian, use the classes in /usr/share/java/jaxp-1.2.jar
+ <unzip src="${src.apis.zip}" dest="${build.src}">
+ <patternset
+ includes="org/xml/sax/**
+@@ -202,6 +203,7 @@
+ org/w3c/dom/traversal/**"
+ />
+ </unzip>
++ -->
+
+ <!-- substitute tokens as needed -->
+ <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
diff --git a/debian/rules b/debian/rules
index 6697bd9..03cd1a1 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,42 +1,30 @@
#!/usr/bin/make -f
# debian/rules file for libxerces2-java (uses cdbs)
-# 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
-
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
-# 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
+# Ugly hack to use a different XML parser than the one that is included
+# with Kaffe. Kaffe's wrapper script does not support overriding BOOTCLASSPATH
+JAVA_HOME := /usr/lib/kaffe
+JAVACMD := ${JAVA_HOME}/jre/bin/kaffe-bin
+ANT_HOME := /usr/share/ant1.6
+export BOOTCLASSPATH = /usr/share/java/jaxp-1.2.jar:/usr/share/java/xerces.jar:${JAVA_HOME}/jre/lib/rt.jar
+export LD_LIBRARY_PATH = ${JAVA_HOME}/jre/lib/${DEB_ARCH}
# 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 := $(CURDIR)/$(DEB_SRCDIR)/tools/bin/xjavac.jar
+DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar xml-commons-resolver-1.1
# Build compiler
DEB_ANT_COMPILER := jikes
# Ant targets to call
-DEB_ANT_BUILD_TARGET := jar-dom3 apijar-dom3 sampjar-dom3 docs javadocs
-
-pre-build:: $(DEB_SRCDIR)/tools
-$(DEB_SRCDIR)/tools:
- ln -s $(DEB_TAR_SRCDIR) $(_cdbs_tarball_dir)/xerces
- ln -s ../tools $(DEB_SRCDIR)
+DEB_ANT_CLEAN_TARGET :=
+DEB_ANT_BUILD_TARGET := jar
-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.jar
- install -m 644 $(DEB_SRCDIR)/build/dom3-xml-apis.jar debian/libxerces2-java/usr/share/java/xmlParserAPIs.jar
-install/libxerces2-java-doc::
- mkdir -p debian/libxerces2-java-doc/usr/share/doc/libxerces2-java-doc/examples
- install -m 644 $(DEB_SRCDIR)/build/xercesSamples.jar debian/libxerces2-java-doc/usr/share/doc/libxerces2-java-doc/examples/xercesSamples.jar
+clean::
+ rm -rf build
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxerces2-java.git
More information about the pkg-java-commits
mailing list