[pkg-java] r13411 - in trunk/libsaxon-java/debian: . patches source
Niels Thykier
nthykier at alioth.debian.org
Sat Mar 12 08:44:13 UTC 2011
Author: nthykier
Date: 2011-03-12 08:44:05 +0000 (Sat, 12 Mar 2011)
New Revision: 13411
Added:
trunk/libsaxon-java/debian/javadoc-args
trunk/libsaxon-java/debian/libsaxon-java-doc.examples
trunk/libsaxon-java/debian/libsaxon-java-doc.javadoc
trunk/libsaxon-java/debian/libsaxon-java-doc.lintian-overrides
trunk/libsaxon-java/debian/libsaxon-java.jlibs
trunk/libsaxon-java/debian/patches/
trunk/libsaxon-java/debian/patches/series
trunk/libsaxon-java/debian/patches/uppercase-encoding-names.patch
trunk/libsaxon-java/debian/source/
trunk/libsaxon-java/debian/source/format
Removed:
trunk/libsaxon-java/debian/dirs
trunk/libsaxon-java/debian/libsaxon-java-doc.javadoc
trunk/libsaxon-java/debian/libsaxon-java-doc.lintian
Modified:
trunk/libsaxon-java/debian/changelog
trunk/libsaxon-java/debian/compat
trunk/libsaxon-java/debian/control
trunk/libsaxon-java/debian/rules
Log:
libsaxon-java (1:6.5.5-7) UNRELEASED; urgency=low
* Team upload.
* Removed unneeded JREs from lib package. Thanks to Brian M.
Carlson for the report. (Closes: #584243)
* Removed Arnaud Vandyck from uploaders. Thanks for your work
on this package.
* Bumped Standards-Versions to 3.9.1
- Moved the packages to the java section
* Use javadoc from default-java instead of openjdk-6.
* Use javahelper to install jar files.
* Rewrote d/rules as dh7 with overrides.
* Replaced default-jdk-builddep with default-jdk and
gcj-native-helper.
* Added missing ${misc:Depends}.
* Linked the javadoc against system javadoc.
* Accepted patch from Brian M. Carlson to make saxon use
uppercase encoding names. (Closes: #568347)
* Converted source package to 3.0 (quilt).
-- Niels Thykier <niels at thykier.net> Sat, 12 Mar 2011 09:07:41 +0100
Modified: trunk/libsaxon-java/debian/changelog
===================================================================
--- trunk/libsaxon-java/debian/changelog 2011-03-12 01:13:41 UTC (rev 13410)
+++ trunk/libsaxon-java/debian/changelog 2011-03-12 08:44:05 UTC (rev 13411)
@@ -1,3 +1,25 @@
+libsaxon-java (1:6.5.5-7) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Removed unneeded JREs from lib package. Thanks to Brian M.
+ Carlson for the report. (Closes: #584243)
+ * Removed Arnaud Vandyck from uploaders. Thanks for your work
+ on this package.
+ * Bumped Standards-Versions to 3.9.1
+ - Moved the packages to the java section
+ * Use javadoc from default-java instead of openjdk-6.
+ * Use javahelper to install jar files.
+ * Rewrote d/rules as dh7 with overrides.
+ * Replaced default-jdk-builddep with default-jdk and
+ gcj-native-helper.
+ * Added missing ${misc:Depends}.
+ * Linked the javadoc against system javadoc.
+ * Accepted patch from Brian M. Carlson to make saxon use
+ uppercase encoding names. (Closes: #568347)
+ * Converted source package to 3.0 (quilt).
+
+ -- Niels Thykier <niels at thykier.net> Sat, 12 Mar 2011 09:07:41 +0100
+
libsaxon-java (1:6.5.5-6) unstable; urgency=low
* Fix last fix to only use javadoc from openjdk-6. (Closes: #559966)
Modified: trunk/libsaxon-java/debian/compat
===================================================================
--- trunk/libsaxon-java/debian/compat 2011-03-12 01:13:41 UTC (rev 13410)
+++ trunk/libsaxon-java/debian/compat 2011-03-12 08:44:05 UTC (rev 13411)
@@ -1 +1 @@
-4
+7
Modified: trunk/libsaxon-java/debian/control
===================================================================
--- trunk/libsaxon-java/debian/control 2011-03-12 01:13:41 UTC (rev 13410)
+++ trunk/libsaxon-java/debian/control 2011-03-12 08:44:05 UTC (rev 13411)
@@ -1,17 +1,19 @@
Source: libsaxon-java
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), default-jdk-builddep, libjdom1-java
-Standards-Version: 3.7.3
+Uploaders: Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper (>= 0.32~),
+ libjdom1-java, gcj-native-helper, default-jdk-doc, libjdom1-java-doc
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libsaxon-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libsaxon-java
Homepage: http://saxon.sourceforge.net/
Package: libsaxon-java
Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
+Depends: ${misc:Depends}, ${java:Depends}
+Recommends: ${java:Recommends}
Suggests: libjdom1-java, libsaxon-java-doc
Description: The Saxon XSLT Processor
The saxon package is a collection of tools for processing XML documents and
@@ -23,7 +25,9 @@
Package: libsaxon-java-gcj
Architecture: any
-Depends: libsaxon-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libsaxon-java (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends},
+ ${java:Depends}
+Recommends: ${java:Recommends}
Description: The Saxon XSLT Processor (native code)
The saxon package is a collection of tools for processing XML documents and
implements the XSLT 1.0 recommendation, including XPath 1.0, in its entirety.
@@ -35,6 +39,8 @@
Package: libsaxon-java-doc
Section: doc
Architecture: all
+Depends: ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
Description: The Saxon XSLT Processor's documentation and javadoc
The saxon package is a collection of tools for processing XML documents and
implements the XSLT 1.0 recommendation, including XPath 1.0, in its entirety.
Deleted: trunk/libsaxon-java/debian/dirs
===================================================================
--- trunk/libsaxon-java/debian/dirs 2011-03-12 01:13:41 UTC (rev 13410)
+++ trunk/libsaxon-java/debian/dirs 2011-03-12 08:44:05 UTC (rev 13411)
@@ -1 +0,0 @@
-usr/share/java
Copied: trunk/libsaxon-java/debian/javadoc-args (from rev 13410, trunk/libsaxon-java/debian/libsaxon-java-doc.javadoc)
===================================================================
--- trunk/libsaxon-java/debian/javadoc-args (rev 0)
+++ trunk/libsaxon-java/debian/javadoc-args 2011-03-12 08:44:05 UTC (rev 13411)
@@ -0,0 +1,19 @@
+com.icl.saxon
+com.icl.saxon.aelfred
+com.icl.saxon.charcode
+com.icl.saxon.expr
+com.icl.saxon.exslt
+com.icl.saxon.functions
+com.icl.saxon.handlers
+com.icl.saxon.jdom
+com.icl.saxon.number
+com.icl.saxon.om
+com.icl.saxon.output
+com.icl.saxon.pattern
+com.icl.saxon.sort
+com.icl.saxon.sql
+com.icl.saxon.style
+com.icl.saxon.tinytree
+com.icl.saxon.trace
+com.icl.saxon.tree
+org.w3c.xsl
Added: trunk/libsaxon-java/debian/libsaxon-java-doc.examples
===================================================================
--- trunk/libsaxon-java/debian/libsaxon-java-doc.examples (rev 0)
+++ trunk/libsaxon-java/debian/libsaxon-java-doc.examples 2011-03-12 08:44:05 UTC (rev 13411)
@@ -0,0 +1 @@
+samples/*
Deleted: trunk/libsaxon-java/debian/libsaxon-java-doc.javadoc
===================================================================
--- trunk/libsaxon-java/debian/libsaxon-java-doc.javadoc 2011-03-12 01:13:41 UTC (rev 13410)
+++ trunk/libsaxon-java/debian/libsaxon-java-doc.javadoc 2011-03-12 08:44:05 UTC (rev 13411)
@@ -1,19 +0,0 @@
-com.icl.saxon
-com.icl.saxon.aelfred
-com.icl.saxon.charcode
-com.icl.saxon.expr
-com.icl.saxon.exslt
-com.icl.saxon.functions
-com.icl.saxon.handlers
-com.icl.saxon.jdom
-com.icl.saxon.number
-com.icl.saxon.om
-com.icl.saxon.output
-com.icl.saxon.pattern
-com.icl.saxon.sort
-com.icl.saxon.sql
-com.icl.saxon.style
-com.icl.saxon.tinytree
-com.icl.saxon.trace
-com.icl.saxon.tree
-org.w3c.xsl
Added: trunk/libsaxon-java/debian/libsaxon-java-doc.javadoc
===================================================================
--- trunk/libsaxon-java/debian/libsaxon-java-doc.javadoc (rev 0)
+++ trunk/libsaxon-java/debian/libsaxon-java-doc.javadoc 2011-03-12 08:44:05 UTC (rev 13411)
@@ -0,0 +1 @@
+build/api/
Deleted: trunk/libsaxon-java/debian/libsaxon-java-doc.lintian
===================================================================
--- trunk/libsaxon-java/debian/libsaxon-java-doc.lintian 2011-03-12 01:13:41 UTC (rev 13410)
+++ trunk/libsaxon-java/debian/libsaxon-java-doc.lintian 2011-03-12 08:44:05 UTC (rev 13411)
@@ -1 +0,0 @@
-libsaxon-java-doc: wrong-name-for-upstream-changelog
Copied: trunk/libsaxon-java/debian/libsaxon-java-doc.lintian-overrides (from rev 13410, trunk/libsaxon-java/debian/libsaxon-java-doc.lintian)
===================================================================
--- trunk/libsaxon-java/debian/libsaxon-java-doc.lintian-overrides (rev 0)
+++ trunk/libsaxon-java/debian/libsaxon-java-doc.lintian-overrides 2011-03-12 08:44:05 UTC (rev 13411)
@@ -0,0 +1 @@
+libsaxon-java-doc: wrong-name-for-upstream-changelog
Added: trunk/libsaxon-java/debian/libsaxon-java.jlibs
===================================================================
--- trunk/libsaxon-java/debian/libsaxon-java.jlibs (rev 0)
+++ trunk/libsaxon-java/debian/libsaxon-java.jlibs 2011-03-12 08:44:05 UTC (rev 13411)
@@ -0,0 +1,2 @@
+saxon.jar
+saxon-jdom.jar
Added: trunk/libsaxon-java/debian/patches/series
===================================================================
--- trunk/libsaxon-java/debian/patches/series (rev 0)
+++ trunk/libsaxon-java/debian/patches/series 2011-03-12 08:44:05 UTC (rev 13411)
@@ -0,0 +1 @@
+uppercase-encoding-names.patch
Added: trunk/libsaxon-java/debian/patches/uppercase-encoding-names.patch
===================================================================
--- trunk/libsaxon-java/debian/patches/uppercase-encoding-names.patch (rev 0)
+++ trunk/libsaxon-java/debian/patches/uppercase-encoding-names.patch 2011-03-12 08:44:05 UTC (rev 13411)
@@ -0,0 +1,29 @@
+Description: Use uppercase encoding names since these are preferred to
+ the lowercase variants.
+Origin: "brian m. carlson" <sandals at crustytoothpaste.ath.cx>
+Bug-Debian: http://bugs.debian.org/568347
+
+diff -ur libsaxon-java.old/src/com/icl/saxon/output/HTMLEmitter.java libsaxon-java-6.5.5/src/com/icl/saxon/output/HTMLEmitter.java
+--- a/src/com/icl/saxon/output/HTMLEmitter.java 2010-12-01 01:00:41.000000000 +0000
++++ b/src/com/icl/saxon/output/HTMLEmitter.java 2010-12-01 01:02:35.000000000 +0000
+@@ -246,7 +246,7 @@
+ if (!("yes".equals(omitMeta))) {
+
+ String encoding = outputProperties.getProperty(OutputKeys.ENCODING);
+- if (encoding==null) encoding = "utf-8";
++ if (encoding==null) encoding = "UTF-8";
+
+ AttributeCollection metaatts = new AttributeCollection(namePool);
+ metaatts.addAttribute("", "", "http-equiv", "CDATA", "Content-Type");
+diff -ur libsaxon-java.old/src/com/icl/saxon/output/XMLEmitter.java libsaxon-java-6.5.5/src/com/icl/saxon/output/XMLEmitter.java
+--- a/src/com/icl/saxon/output/XMLEmitter.java 2010-12-01 01:00:41.000000000 +0000
++++ b/src/com/icl/saxon/output/XMLEmitter.java 2010-12-01 01:02:29.000000000 +0000
+@@ -95,7 +95,7 @@
+
+ String encoding = outputProperties.getProperty(OutputKeys.ENCODING);
+ if (encoding==null || encoding.equalsIgnoreCase("utf8")) {
+- encoding = "utf-8";
++ encoding = "UTF-8";
+ }
+
+ if (!(encoding.equalsIgnoreCase("utf-8"))) {
Modified: trunk/libsaxon-java/debian/rules
===================================================================
--- trunk/libsaxon-java/debian/rules 2011-03-12 01:13:41 UTC (rev 13410)
+++ trunk/libsaxon-java/debian/rules 2011-03-12 08:44:05 UTC (rev 13411)
@@ -5,96 +5,43 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-PACKAGE=libsaxon-java
JAVA_HOME=/usr/lib/jvm/default-java
-BASE=debian/$(PACKAGE)
-JAVASHARE=usr/share/java
SOURCES=src
BUILD=build
APIDOC=build/api
JDOM=com/icl/saxon/jdom
-UPSTREAM_VERSION = 6.5.5
CLASSPATH = /usr/share/java/jdom1.jar
-JAVADOC = /usr/lib/jvm/java-6-openjdk/bin/javadoc
+JAVADOC = $(JAVA_HOME)/bin/javadoc
include /usr/share/gcj/debian_defaults
ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
with_gcj_native := yes
endif
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- if [ ! -d $(BUILD) ]; then mkdir $(BUILD); mkdir $(APIDOC); fi
- touch configure-stamp
+%:
+ dh $@ --with javahelper
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
+override_dh_auto_build:
+ if [ ! -d $(BUILD) ]; then mkdir $(BUILD); mkdir $(APIDOC); fi
$(JAVA_HOME)/bin/javac -nowarn -sourcepath $(SOURCES) -classpath $(CLASSPATH) -d $(BUILD) `find $(SOURCES) -name \*.java`
cp -r $(SOURCES)/META-INF $(BUILD)
cp debian/MANIFEST.MF $(BUILD)/META-INF
# split off jdom classes, everything else into saxon.jar
(cd $(BUILD); $(JAVA_HOME)/bin/jar -cfM ../saxon.jar META-INF `find . -name \*.class | egrep -v $(JDOM)`; \
$(JAVA_HOME)/bin/jar -cfM ../saxon-jdom.jar $(JDOM)/*.class )
- (cd $(APIDOC) ; if [ -x $(JAVADOC) ]; then $(JAVADOC) -sourcepath ../../$(SOURCES) @../../debian/libsaxon-java-doc.javadoc; fi)
+ (cd $(APIDOC) ; $(JAVADOC) -sourcepath ../../$(SOURCES) -link /usr/share/doc/default-jdk-doc/api \
+ -link /usr/share/doc/libjdom1-java/api @../../debian/javadoc-args )
touch build-stamp
-clean:
- dh_testdir
- dh_testroot
+override_dh_auto_clean:
rm -f build-stamp configure-stamp saxon*.jar
rm -rf $(BUILD)
- dh_clean
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- install -m 644 saxon.jar $(BASE)/$(JAVASHARE)/saxon-$(UPSTREAM_VERSION).jar
- install -m 644 saxon-jdom.jar $(BASE)/$(JAVASHARE)/saxon-jdom-$(UPSTREAM_VERSION).jar
-
- # install lintian overrides
- install -d $(CURDIR)/debian/libsaxon-java-doc/usr/share/lintian/overrides/
- install -m 644 $(CURDIR)/debian/libsaxon-java-doc.lintian $(CURDIR)/debian/libsaxon-java-doc/usr/share/lintian/overrides/libsaxon-java-doc
-
-binary-indep: build install
- dh_testdir -i
- dh_testroot -i
- dh_install -i
- dh_installchangelogs -i
- dh_installdocs -i
- dh_installexamples -plibsaxon-java-doc samples/*
- dh_link -plibsaxon-java $(JAVASHARE)/saxon-$(UPSTREAM_VERSION).jar $(JAVASHARE)/saxon.jar \
- $(JAVASHARE)/saxon-jdom-$(UPSTREAM_VERSION).jar $(JAVASHARE)/saxon-jdom.jar
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch: build install
- dh_testdir -a
- dh_testroot -a
- dh_install -a
- dh_installchangelogs -a
- dh_installdocs -a
+override_dh_strip:
ifeq ($(with_gcj_native),yes)
- [ -d debian/libsaxon-ava/usr/share/java ] || dh_install -plibsaxon-java
dh_nativejava -plibsaxon-java-gcj
endif
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
+ dh_strip
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
Added: trunk/libsaxon-java/debian/source/format
===================================================================
--- trunk/libsaxon-java/debian/source/format (rev 0)
+++ trunk/libsaxon-java/debian/source/format 2011-03-12 08:44:05 UTC (rev 13411)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the pkg-java-commits
mailing list