[xml/sgml-commit] r1784 - in /packages/docbook-xsl/branches/experimental/debian: ./ patches/

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Tue Aug 31 20:52:24 UTC 2010 

Author: dleidert-guest
Date: Tue Aug 31 20:52:14 2010
New Revision: 1784

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1784
Log:
* First release candidate of the upcoming 1.76.0 release based on r8900.
  - Apostroph fix applied at all places (closes: #507673).
  - Refer to local image path (closes: #561590).
  - Handles simpara in footnote for manpages correctly (closes: #580305).
  - Improved French translation (closes: #594649).
* debian/compat: Increased to 7.
* debian/control (Vcs-Browser, Vcs-Svn): Adjusted for experimental.
  (Build-Depends): Increased dh version to >7.
  (Standards-Version): Bumped to 3.9.1.
  (Suggests): Added libxslthl-java (closes: #576831).
* debian/rules: Rewritten for dh 7.
* debian/get-orig-source.sh: Also remove newly released webhelp directory.
* debian/README.source: Added note about webhelp.
* debian/patches/561590_param_local_draft_image.dpatch: Dropped (r8810).
* debian/patches/562227_xhtml_fix_saxon_ns_leakage.dpatch: Ditto (r8808).
* debian/patches/8530_manpages_lists_indentation_fix.dpatch: Ditto.
* debian/patches/8539_554441_xhtml11_fix_ulink_param_target.dpatch: Ditto.
* debian/patches/8563_562816_german_translation_fix.dpatch: Ditto.
* debian/patches/portable_apostrophe_fix.dpatch: Ditto (r8841).
* debian/patches/00list: Adjusted.

Removed:
    packages/docbook-xsl/branches/experimental/debian/patches/561590_param_local_draft_image.dpatch
    packages/docbook-xsl/branches/experimental/debian/patches/562227_xhtml_fix_saxon_ns_leakage.dpatch
    packages/docbook-xsl/branches/experimental/debian/patches/8530_manpages_lists_indentation_fix.dpatch
    packages/docbook-xsl/branches/experimental/debian/patches/8539_554441_xhtml11_fix_ulink_param_target.dpatch
    packages/docbook-xsl/branches/experimental/debian/patches/8563_562816_german_translation_fix.dpatch
    packages/docbook-xsl/branches/experimental/debian/patches/portable_apostrophe_fix.dpatch
Modified:
    packages/docbook-xsl/branches/experimental/debian/NEWS
    packages/docbook-xsl/branches/experimental/debian/README.source
    packages/docbook-xsl/branches/experimental/debian/changelog
    packages/docbook-xsl/branches/experimental/debian/compat
    packages/docbook-xsl/branches/experimental/debian/control
    packages/docbook-xsl/branches/experimental/debian/docbook-xsl.install
    packages/docbook-xsl/branches/experimental/debian/get-orig-source.sh
    packages/docbook-xsl/branches/experimental/debian/patches/00list
    packages/docbook-xsl/branches/experimental/debian/rules

Modified: packages/docbook-xsl/branches/experimental/debian/NEWS
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/NEWS?rev=1784&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/NEWS (original)
+++ packages/docbook-xsl/branches/experimental/debian/NEWS Tue Aug 31 20:52:14 2010
@@ -1,3 +1,10 @@
+docbook-xsl (1.76.0~RC1+dfsg-1) UNRELEASED; urgency=low
+
+  The webhelp (output) support, added in 1.76.0, will be packaged in a
+  separate package later.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Tue, 31 Aug 2010 22:20:51 +0200
+
 docbook-xsl (1.75.2+dfsg-2) unstable; urgency=low
 
   dbtoepub is now shipped in its own package (#525808).

Modified: packages/docbook-xsl/branches/experimental/debian/README.source
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/README.source?rev=1784&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/README.source (original)
+++ packages/docbook-xsl/branches/experimental/debian/README.source Tue Aug 31 20:52:14 2010
@@ -9,8 +9,11 @@
     JFTR: There are separate (source) packages docbook-xsl-saxon and
     docbook-xsl-xalan which provide the extensions and their source.
 
+  - removal of the webhelp/ directory - source is missing, separate package
+
+    The will be a separate package soon.
 
 The package uses the dpatch management solution. See
 /usr/share/doc/dpatch/README.source.gz.
 
- -- Daniel Leidert <daniel.leidert at wgdd.de>, March 2009
+ -- Daniel Leidert <daniel.leidert at wgdd.de>, August 2010

Modified: packages/docbook-xsl/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/changelog?rev=1784&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/changelog (original)
+++ packages/docbook-xsl/branches/experimental/debian/changelog Tue Aug 31 20:52:14 2010
@@ -1,6 +1,27 @@
-docbook-xsl (1.75.2+dfsg-6) UNRELEASED; urgency=low
+docbook-xsl (1.76.0~RC1+dfsg-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * First release candidate of the upcoming 1.76.0 release based on r8900.
+    - Apostroph fix applied at all places (closes: #507673).
+    - Refer to local image path (closes: #561590).
+    - Handles simpara in footnote for manpages correctly (closes: #580305).
+    - Improved French translation (closes: #594649).
+
+  * debian/compat: Increased to 7.
+  * debian/control (Vcs-Browser, Vcs-Svn): Adjusted for experimental.
+    (Build-Depends): Increased dh version to >7.
+    (Standards-Version): Bumped to 3.9.1.
+    (Suggests): Added libxslthl-java (closes: #576831).
+  * debian/rules: Rewritten for dh 7.
+  * debian/get-orig-source.sh: Also remove newly released webhelp directory.
+  * debian/README.source: Added note about webhelp.
+  * debian/patches/561590_param_local_draft_image.dpatch: Dropped (r8810).
+  * debian/patches/562227_xhtml_fix_saxon_ns_leakage.dpatch: Ditto (r8808).
+  * debian/patches/8530_manpages_lists_indentation_fix.dpatch: Ditto.
+  * debian/patches/8539_554441_xhtml11_fix_ulink_param_target.dpatch: Ditto.
+  * debian/patches/8563_562816_german_translation_fix.dpatch: Ditto.
+  * debian/patches/portable_apostrophe_fix.dpatch: Ditto (r8841).
+  * debian/patches/00list: Adjusted.
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 31 Jan 2010 22:51:42 +0100
 

Modified: packages/docbook-xsl/branches/experimental/debian/compat
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/compat?rev=1784&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/compat (original)
+++ packages/docbook-xsl/branches/experimental/debian/compat Tue Aug 31 20:52:14 2010
@@ -1,1 +1,1 @@
-5
+7

Modified: packages/docbook-xsl/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/control?rev=1784&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/control (original)
+++ packages/docbook-xsl/branches/experimental/debian/control Tue Aug 31 20:52:14 2010
@@ -3,19 +3,19 @@
 Priority: optional
 Maintainer: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
 Uploaders: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>> 7.0.50~), dpatch
 Build-Depends-Indep: xml-core
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 Homepage: http://wiki.docbook.org/topic/DocBookXslStylesheets
-Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/
-Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xsl/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/
+Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xsl/branches/experimental
 DM-Upload-Allowed: yes
 
 Package: docbook-xsl
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: docbook-xml (>= 4.1.2-4), docbook-xsl-doc-html | docbook-xsl-doc-pdf | docbook-xsl-doc-text | docbook-xsl-doc
-Suggests: libsaxon-java, libxalan2-java, docbook-xsl-saxon, fop, xalan, dbtoepub
+Suggests: libsaxon-java, libxalan2-java, docbook-xsl-saxon, fop, xalan, dbtoepub, libxslthl-java
 Description: stylesheets for processing DocBook XML to various output formats
  These are modular XSL stylesheets for processing documents composed
  with the DocBook XML DTD and its derivatives ("Simplified" DocBook

Modified: packages/docbook-xsl/branches/experimental/debian/docbook-xsl.install
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/docbook-xsl.install?rev=1784&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/docbook-xsl.install (original)
+++ packages/docbook-xsl/branches/experimental/debian/docbook-xsl.install Tue Aug 31 20:52:14 2010
@@ -2,6 +2,7 @@
 
 common          usr/share/xml/docbook/stylesheet/docbook-xsl/
 eclipse         usr/share/xml/docbook/stylesheet/docbook-xsl/
+epub/*.xsl      usr/share/xml/docbook/stylesheet/docbook-xsl/epub/
 fo              usr/share/xml/docbook/stylesheet/docbook-xsl/
 highlighting    usr/share/xml/docbook/stylesheet/docbook-xsl/
 html            usr/share/xml/docbook/stylesheet/docbook-xsl/
@@ -17,6 +18,4 @@
 website         usr/share/xml/docbook/stylesheet/docbook-xsl/
 xhtml*          usr/share/xml/docbook/stylesheet/docbook-xsl/
 
-epub/*.xsl      usr/share/xml/docbook/stylesheet/docbook-xsl/epub/
-
 debian/presubj  usr/share/bug/docbook-xsl

Modified: packages/docbook-xsl/branches/experimental/debian/get-orig-source.sh
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/get-orig-source.sh?rev=1784&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/get-orig-source.sh (original)
+++ packages/docbook-xsl/branches/experimental/debian/get-orig-source.sh Tue Aug 31 20:52:14 2010
@@ -19,7 +19,7 @@
 mkdir -p ${ORIG_TARBALL_DIR}
 tar --directory=${ORIG_TARBALL_DIR} --strip 1 -xzf ${REAL_TARBALL} || exit 1 
 rm -f ${ORIG_TARBALL} ${REAL_TARBALL}
-rm -rf ${ORIG_TARBALL_DIR}/extensions/
+rm -rf ${ORIG_TARBALL_DIR}/extensions/ ${ORIG_TARBALL_DIR}/webhelp/
 GZIP=-9 tar --remove-files --directory ${WORKING_DIR} -czf ${ORIG_TARBALL_DFSG} ${ORIG_TARBALL_DIR_STRIP} || exit 1
 
 exit 0

Modified: packages/docbook-xsl/branches/experimental/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/patches/00list?rev=1784&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/patches/00list (original)
+++ packages/docbook-xsl/branches/experimental/debian/patches/00list Tue Aug 31 20:52:14 2010
@@ -1,6 +1,2 @@
-8530_manpages_lists_indentation_fix
-portable_apostrophe_fix
-8539_554441_xhtml11_fix_ulink_param_target
-561590_param_local_draft_image
-562227_xhtml_fix_saxon_ns_leakage
-8563_562816_german_translation_fix
+
+

Modified: packages/docbook-xsl/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/rules?rev=1784&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/rules (original)
+++ packages/docbook-xsl/branches/experimental/debian/rules Tue Aug 31 20:52:14 2010
@@ -6,43 +6,24 @@
 
 include /usr/share/dpatch/dpatch.make
 
-build: build-stamp
-build-stamp: patch-stamp
-	dh_testdir
-	touch $@
+build:: patch-stamp
+clean:: unpatch
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp patch-stamp
-	dh_clean
+%::
+	dh $@ --parallel
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
+override_dh_auto_build:
+override_dh_auto_test:
+	# nothing to do
 
-binary-arch: install
-binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs RELEASE-NOTES.txt
-	dh_installdocs
-	dh_installexamples
+override_dh_install:
 	dh_installxmlcatalogs
 	# upstream ships {param,pi,table}.xml as example for DocBook
 	# because we don't need them inside docbook-xsl, we exclude them
 	dh_install -Xparam.xml -Xpi.xml -Xtable.xml -XChangeLog* -X.param.* -X.lib.* -X.gitignore
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
+override_dh_installchangelogs:	
+	dh_installchangelogs RELEASE-NOTES.txt
 
 check-xml:
 	xmllint --noout --noent \
@@ -51,4 +32,4 @@
 get-orig-source:
 	uscan --force-download
 
-.PHONY: build clean binary-indep binary-arch binary get-orig-source
+.PHONY: get-orig-source

More information about the debian-xml-sgml-commit mailing list