[xml/sgml-commit] r1995 - in /packages/docbook-xsl-saxon/trunk/debian: ./ patches/ source/
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Thu May 17 21:55:51 UTC 2012
Author: dleidert-guest
Date: Thu May 17 21:55:49 2012
New Revision: 1995
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1995
Log:
* debian/ant.properties: Removed.
* debian/compat: Increased dh compatibility level to 7.
* debian/control (Standards-Version): Bumped to 3.9.3.
(Build-Depends): Added default-jdk and javahelper. Increased debhelper
version. Replaced default-jdk-builddep by gcj-native-helper.
(Conflicts): Turned into Breaks.
* debian/copyright: Fixed minor issues.
* debian/docbook-xsl-saxon.doc-base: Removed.
* debian/docbook-xsl-saxon.docs: Removed api directory.
* debian/docbook-xsl-saxon.javadoc: Added.
* debian/docbook-xsl-saxon.jlibs: Added.
* debian/get-orig-source.sh: Added.
* debian/rules: Rewritten for dh 7 using javahelper.
* debian/watch: Adjusted to use get-orig-source.sh.
* debian/README.Debian-source: Renamed to debian/README.source.
* debian/patches/debian_build_fixes.patch: Added.
- Don't hardcode filenames in clean target.
* debian/patches/series: Added.
* debian/source/format: Added.
Added:
packages/docbook-xsl-saxon/trunk/debian/README.source
- copied unchanged from r1991, packages/docbook-xsl-saxon/trunk/debian/README.Debian-source
packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.javadoc
packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.jlibs
packages/docbook-xsl-saxon/trunk/debian/get-orig-source.sh (with props)
packages/docbook-xsl-saxon/trunk/debian/patches/
packages/docbook-xsl-saxon/trunk/debian/patches/debian_build_fixes.patch
packages/docbook-xsl-saxon/trunk/debian/patches/series
packages/docbook-xsl-saxon/trunk/debian/source/
packages/docbook-xsl-saxon/trunk/debian/source/format
Removed:
packages/docbook-xsl-saxon/trunk/debian/README.Debian-source
packages/docbook-xsl-saxon/trunk/debian/ant.properties
packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.doc-base
Modified:
packages/docbook-xsl-saxon/trunk/debian/changelog
packages/docbook-xsl-saxon/trunk/debian/compat
packages/docbook-xsl-saxon/trunk/debian/control
packages/docbook-xsl-saxon/trunk/debian/copyright
packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.docs
packages/docbook-xsl-saxon/trunk/debian/rules
packages/docbook-xsl-saxon/trunk/debian/watch
Modified: packages/docbook-xsl-saxon/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/changelog?rev=1995&op=diff
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/changelog (original)
+++ packages/docbook-xsl-saxon/trunk/debian/changelog Thu May 17 21:55:49 2012
@@ -1,13 +1,27 @@
docbook-xsl-saxon (1.00.dfsg.1-5) UNRELEASED; urgency=low
* NOT RELEASED YET
- * debian/control (Standards-Version): Bumped to 3.8.3.
- (Build-Depends): Added default-jdk-doc.
+ * debian/ant.properties: Removed.
+ * debian/compat: Increased dh compatibility level to 7.
+ * debian/control (Standards-Version): Bumped to 3.9.3.
+ (Build-Depends): Added default-jdk, default-jdk-doc and javahelper.
+ Increased debhelper version. Replaced default-jdk-builddep by
+ gcj-native-helper.
(Depends): Added ${misc:Depends} to fix debhelper-but-no-misc-depends.
- * debian/copyright: Fixed copyright-refers-to-versionless-license-file by
- clarifying Debian packaging files license. Fixed
- copyright-with-old-dh-make-debian-copyright too.
+ (Conflicts): Turned into Breaks.
+ * debian/copyright: Fixed minor issues.
* debian/docbook-xsl-saxon.doc-base: Added to register API documentation.
+ * debian/docbook-xsl-saxon.docs: Removed api directory.
+ * debian/docbook-xsl-saxon.javadoc: Added.
+ * debian/docbook-xsl-saxon.jlibs: Added.
+ * debian/get-orig-source.sh: Added.
+ * debian/rules: Rewritten for dh 7 using javahelper.
+ * debian/watch: Adjusted to use get-orig-source.sh.
+ * debian/README.Debian-source: Renamed to debian/README.source.
+ * debian/patches/debian_build_fixes.patch: Added.
+ - Don't hardcode filenames in clean target.
+ * debian/patches/series: Added.
+ * debian/source/format: Added.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Thu, 01 May 2008 03:16:48 +0200
Modified: packages/docbook-xsl-saxon/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/compat?rev=1995&op=diff
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/compat (original)
+++ packages/docbook-xsl-saxon/trunk/debian/compat Thu May 17 21:55:49 2012
@@ -1,1 +1,1 @@
-5
+7
Modified: packages/docbook-xsl-saxon/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/control?rev=1995&op=diff
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/control (original)
+++ packages/docbook-xsl-saxon/trunk/debian/control Thu May 17 21:55:49 2012
@@ -3,8 +3,14 @@
Priority: extra
Maintainer: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
Uploaders: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Build-Depends: debhelper (>= 5), cdbs, ant, default-jdk-builddep, default-jdk-doc, libsaxon-java (>> 1:6.5)
-Standards-Version: 3.8.3
+Build-Depends: ant,
+ debhelper (>> 7.0.50~),
+ default-jdk,
+ default-jdk-doc,
+ gcj-native-helper,
+ javahelper,
+ libsaxon-java (>> 1:6.5)
+Standards-Version: 3.9.3
Homepage: http://wiki.docbook.org/topic/DocBookXsltExtensions
Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/
Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/
@@ -12,8 +18,9 @@
Package: docbook-xsl-saxon
Architecture: all
-Depends: ${misc:Depends}, java-gcj-compat | java1-runtime | java2-runtime, libsaxon-java (>> 1:6.5)
-Conflicts: docbook-xsl (<< 1.68.1.dfsg.1-0.1)
+Depends: libsaxon-java (>> 1:6.5), ${java:Depends}, ${misc:Depends}
+Recommends: ${java:Recommends}
+Breaks: docbook-xsl (<< 1.68.1.dfsg.1-0.1)
Enhances: docbook-xsl
Description: Java extensions for use with DocBook XML stylesheets (Saxon)
These are Java extensions for use with the DocBook XML stylesheets
@@ -25,7 +32,10 @@
Package: docbook-xsl-saxon-gcj
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, docbook-xsl-saxon (>= ${source:Version}), libsaxon-java-gcj (>> 1:6.5)
+Depends: docbook-xsl-saxon (>= ${source:Version}),
+ libsaxon-java-gcj (>> 1:6.5),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: Java extensions for use with DocBook XML stylesheets (native code)
These are Java extensions for use with the DocBook XML stylesheets
and the Saxon XSLT engine. You need these extensions to enable e.g.
Modified: packages/docbook-xsl-saxon/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/copyright?rev=1995&op=diff
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/copyright (original)
+++ packages/docbook-xsl-saxon/trunk/debian/copyright Thu May 17 21:55:49 2012
@@ -68,4 +68,4 @@
The Debian packaging is Copyright (C) 2007-2009 Daniel Leidert
<daniel.leidert at wgdd.de> and is licensed under the GPL, either version 2 of
the License, or (at your option) any later version. See the file
-`/usr/share/common-licenses/GPL'.
+`/usr/share/common-licenses/GPL-2'.
Modified: packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.docs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.docs?rev=1995&op=diff
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.docs (original)
+++ packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.docs Thu May 17 21:55:49 2012
@@ -1,3 +1,2 @@
BUGS
-api
debian/tdg_examples_permission.eml
Added: packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.javadoc
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.javadoc?rev=1995&op=file
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.javadoc (added)
+++ packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.javadoc Thu May 17 21:55:49 2012
@@ -1,0 +1,1 @@
+api
Added: packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.jlibs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.jlibs?rev=1995&op=file
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.jlibs (added)
+++ packages/docbook-xsl-saxon/trunk/debian/docbook-xsl-saxon.jlibs Thu May 17 21:55:49 2012
@@ -1,0 +1,1 @@
+docbook-xsl-saxon.jar
Added: packages/docbook-xsl-saxon/trunk/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/get-orig-source.sh?rev=1995&op=file
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/get-orig-source.sh (added)
+++ packages/docbook-xsl-saxon/trunk/debian/get-orig-source.sh Thu May 17 21:55:49 2012
@@ -1,0 +1,25 @@
+#!/bin/sh
+
+set -ex
+
+UPSTREAM_VERSION=$2
+ORIG_TARBALL=$3
+
+REAL_TARBALL=`readlink -f ${ORIG_TARBALL}`
+
+WORKING_DIR=`dirname ${ORIG_TARBALL}`
+
+ORIG_TARBALL_DFSG=`echo ${ORIG_TARBALL} | sed -e "s/\(${UPSTREAM_VERSION}\)\(\.orig\)/\1+dfsg\2/g"`
+ORIG_TARBALL_DIR=`echo ${ORIG_TARBALL_DFSG} | sed -e "s/_\(${UPSTREAM_VERSION}\)/-\1/g" -e "s/\.tar\.gz//g"`
+ORIG_TARBALL_DIR_STRIP=`basename ${ORIG_TARBALL_DIR}`
+
+mkdir -p ${ORIG_TARBALL_DIR}
+tar --directory=${ORIG_TARBALL_DIR} --strip 1 -xzf ${REAL_TARBALL} || exit 1
+rm -f ${ORIG_TARBALL} ${REAL_TARBALL}
+ant -f ${ORIG_TARBALL_DIR}/build.xml \
+ -Dplatform.active=debian \
+ -Dplatforms.debian.home=/usr/lib/jvm/default-java \
+ clean
+GZIP=-9 tar --remove-files --directory ${WORKING_DIR} -czf ${ORIG_TARBALL_DFSG} ${ORIG_TARBALL_DIR_STRIP} || exit 1
+
+exit 0
Propchange: packages/docbook-xsl-saxon/trunk/debian/get-orig-source.sh
------------------------------------------------------------------------------
svn:executable = *
Added: packages/docbook-xsl-saxon/trunk/debian/patches/debian_build_fixes.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/patches/debian_build_fixes.patch?rev=1995&op=file
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/patches/debian_build_fixes.patch (added)
+++ packages/docbook-xsl-saxon/trunk/debian/patches/debian_build_fixes.patch Thu May 17 21:55:49 2012
@@ -1,0 +1,21 @@
+Author: Daniel Leidert <daniel.leidert at wgdd.de>
+Description: Changed hard-coded file references in "clean" target.
+Bug: http://sourceforge.net/tracker/?func=detail&aid=1792043&group_id=21935&atid=373747
+Origin: http://docbook.svn.sourceforge.net/viewvc/docbook?view=revision&revision=7438
+Forwarded: yes
+
+--- a/nbproject/build-impl.xml
++++ b/nbproject/build-impl.xml
+@@ -563,9 +563,9 @@
+ -->
+ <target name="deps-clean" depends="init" unless="no.deps"/>
+ <target name="-do-clean" depends="init">
+- <delete file="${dist.dir}/saxon65.jar"/>
+- <delete dir="${dist.dir}/javadoc"/>
+- <delete dir="${dist.dir}/classes"/>
++ <delete file="${dist.jar}"/>
++ <delete dir="${dist.javadoc.dir}"/>
++ <delete dir="${build.classes.dir}"/>
+ </target>
+ <target name="-post-clean">
+ <!-- Empty placeholder for easier customization. -->
Added: packages/docbook-xsl-saxon/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/patches/series?rev=1995&op=file
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/patches/series (added)
+++ packages/docbook-xsl-saxon/trunk/debian/patches/series Thu May 17 21:55:49 2012
@@ -1,0 +1,1 @@
+debian_build_fixes.patch
Modified: packages/docbook-xsl-saxon/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/rules?rev=1995&op=diff
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/rules (original)
+++ packages/docbook-xsl-saxon/trunk/debian/rules Thu May 17 21:55:49 2012
@@ -1,54 +1,44 @@
#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+
+#export DH_VERBOSE=1
+
+PACKAGE = docbook-xsl-saxon
include /usr/share/gcj/debian_defaults
ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
with_gcj_native := yes
endif
-JAVA_HOME := /usr/lib/jvm/default-java
-PACKAGE := docbook-xsl-saxon
+export JAVA_HOME = /usr/lib/jvm/default-java
+export CLASSPATH = /usr/share/java/saxon.jar
-version = $(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$$/\1/p' )
uversion = $(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)\.dfsg.*$$/\1/p' )
-DEB_JARS += saxon
-ANT_ARGS += -Dplatform.active=debian \
+ANT_ARGS += -lib /usr/share/java \
+ -Dplatform.active=debian \
-Dplatforms.debian.home=$(JAVA_HOME) \
- -Djavac.classpath=$(DEB_CLASSPATH) \
- -Ddist.jar=$(PACKAGE)_$(uversion).jar
+ -Djavac.classpath=$(CLASSPATH) \
+ -Ddist.javadoc.dir=api \
+ -Ddist.jar=$(PACKAGE).jar
-DEB_DH_COMPRESS_ARGS = -Xusr/share/doc/docbook-xsl-saxon/examples
+%:
+ dh $@ --buildsystem=ant --with=javahelper --parallel
-clean::
- # workaround a bug, see sf.net #1792043
- rm -rf $(PACKAGE)_$(uversion).jar api/
+override_dh_auto_clean:
+ dh_auto_clean -- $(ANT_ARGS)
$(MAKE) -C debian/examples/ clean
-install/docbook-xsl-saxon::
- dh_install -pdocbook-xsl-saxon $(PACKAGE)_$(uversion).jar usr/share/java
- dh_link -pdocbook-xsl-saxon usr/share/java/$(PACKAGE)_$(uversion).jar usr/share/java/$(PACKAGE).jar
+override_dh_auto_build:
+ dh_auto_build -- $(ANT_ARGS)
+override_jh_installlibs:
+ jh_installlibs -pdocbook-xsl-saxon --upstream-version=$(uversion)
ifeq ($(with_gcj_native),yes)
-install/docbook-xsl-saxon-gcj:: install/docbook-xsl-saxon
dh_nativejava -pdocbook-xsl-saxon-gcj
endif
-# The following code is used to create the .orig.tar.gz tarball.
-# Use it to prepare a .orig tarball for a release.
-#
-.PHONY: get-orig-source
-get-orig-source:
- set -ex ; \
- TMPDIR=`mktemp -d $(PACKAGE)-$(version).orig` ; \
- wget -P "$$TMPDIR" \
- http://downloads.sourceforge.net/docbook/$(PACKAGE)-$(uversion).tar.bz2 ; \
- tar --directory="$$TMPDIR" -xjf "$$TMPDIR"/$(PACKAGE)-$(uversion).tar.bz2 ; \
- $(DEB_ANT_INVOKE) -f "$$TMPDIR"/$(PACKAGE)-$(uversion)/build.xml/ $(DEB_ANT_CLEAN_TARGET) ; \
- mv "$$TMPDIR"/$(PACKAGE)-$(uversion) "$$TMPDIR"/$(PACKAGE)-$(version).orig ; \
- GZIP=-9 tar --directory="$$TMPDIR" -czf \
- $(CURDIR)/$(PACKAGE)_$(version).orig.tar.gz \
- $(PACKAGE)-$(version).orig ; \
- rm -rf "$$TMPDIR"
+#override_dh_link:
+# dh_link -pdocbook-xsl-saxon usr/share/java/$(PACKAGE)_$(uversion).jar usr/share/java/$(PACKAGE).jar
+
+override_dh_compress:
+ dh_compress -Xusr/share/doc/docbook-xsl-saxon/examples
Added: packages/docbook-xsl-saxon/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/source/format?rev=1995&op=file
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/source/format (added)
+++ packages/docbook-xsl-saxon/trunk/debian/source/format Thu May 17 21:55:49 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: packages/docbook-xsl-saxon/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl-saxon/trunk/debian/watch?rev=1995&op=diff
==============================================================================
--- packages/docbook-xsl-saxon/trunk/debian/watch (original)
+++ packages/docbook-xsl-saxon/trunk/debian/watch Thu May 17 21:55:49 2012
@@ -2,4 +2,5 @@
version=3
opts=dversionmangle=s/\.dfsg\.\d+$// \
- http://sf.net/docbook/docbook-xsl-saxon-([\d\.]+)\.tar\.gz
+ http://sf.net/docbook/docbook-xsl-saxon-([\d\.]+)\.tar\.gz \
+ debian /bin/sh debian/get-orig-source.sh
More information about the debian-xml-sgml-commit
mailing list