[xml/sgml-commit] r1142 - in /packages/docbook-xsl/branches/experimental/debian: ./ examples/ patches/
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Tue Aug 26 20:02:19 UTC 2008
Author: dleidert-guest
Date: Tue Aug 26 20:02:18 2008
New Revision: 1142
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1142
Log:
* debian/control: Removed docbook-xsl-doc* binary package fields.
(Standards-Version): Bumped to 3.8.0.
(Recommends): Adjusted for doc-packages without .dfsg version part.
* debian/docbook-xsl-doc*: Removed docbook-xsl-doc* related debhelper files.
* debian/rules (binary-indep): Removed doc-packages related debhelper calls.
Further exclude .gitignore files.
(get-orig-source): Adjusted for source split. The doc-tarball is not
longer necessary.
* debian/examples/foo.1.example_manpage.xml: Fixed encoding declaration.
* debian/patches/02_use_global_papersize_conf.dpatch: Adjusted. Don't try
to patch files now in docbook-xsl-doc. Further fixed reference to
README.Debian (closes: #495644).
* debian/patches/7436_html_fo_fix_empty_index_entries.dpatch: Removed.
Applied upstream.
* debian/patches/7440_fo_normalize_space.dpatch: Ditto.
* debian/patches/7441_html_fix_legalnotice_filename_creation.dpatch: Ditto.
* debian/patches/7528_common_fix_too_many_nested_elements.dpatch: Ditto.
* debian/patches/7564_fo_fix_typo.dpatch: Ditto.
* debian/patches/7623_man_support_for_processing_structfield.dpatch: Ditto.
* debian/patches/7629_man_fix_escaped_dots_in_filenames.dpatch: Ditto.
* debian/patches/7656_html_component_title_in_info_elements.dpatch: Ditto.
* debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch: Ditto.
* debian/patches/7674_man_fix_unescaped_dash_in_whatis_entry.dpatch: Ditto.
* debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch: Ditto.
* debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch: Ditto.
* debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch: Ditto.
* debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch:
Ditto.
* debian/patches/7806_man_fix_non_breaking_space_output.dpatch: Ditto.
* debian/patches/7901_fo_fix_inline_or_block_template.dpatch: Ditto.
* debian/patches/7939_html_add_exslt_ns_for_pi.dpatch: Ditto.
* debian/patches/00list: Adjusted.
Removed:
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-html.copyright
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-html.doc-base
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-html.docs
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-html.install
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-html.links
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-pdf.copyright
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-pdf.doc-base
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-pdf.docs
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-pdf.install
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-pdf.links
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-pdf.preinst
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-text.copyright
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-text.doc-base
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-text.docs
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-text.install
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-text.links
packages/docbook-xsl/branches/experimental/debian/docbook-xsl-doc-text.preinst
packages/docbook-xsl/branches/experimental/debian/patches/7436_html_fo_fix_empty_index_entries.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7440_fo_normalize_space.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7441_html_fix_legalnotice_filename_creation.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7528_common_fix_too_many_nested_elements.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7564_fo_fix_typo.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7623_man_support_for_processing_structfield.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7629_man_fix_escaped_dots_in_filenames.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7656_html_component_title_in_info_elements.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7674_man_fix_unescaped_dash_in_whatis_entry.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7806_man_fix_non_breaking_space_output.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7901_fo_fix_inline_or_block_template.dpatch
packages/docbook-xsl/branches/experimental/debian/patches/7939_html_add_exslt_ns_for_pi.dpatch
Modified:
packages/docbook-xsl/branches/experimental/debian/changelog
packages/docbook-xsl/branches/experimental/debian/control
packages/docbook-xsl/branches/experimental/debian/examples/foo.1.example_manpage.xml
packages/docbook-xsl/branches/experimental/debian/patches/00list
packages/docbook-xsl/branches/experimental/debian/patches/02_use_global_papersize_conf.dpatch
packages/docbook-xsl/branches/experimental/debian/rules
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=1142&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/changelog (original)
+++ packages/docbook-xsl/branches/experimental/debian/changelog Tue Aug 26 20:02:18 2008
@@ -2,8 +2,42 @@
* NOT RELEASED YET
* New upstream release 1.74.0.
+ - Ships new and fixed localizations (closes: #492608).
* Source split into the docbook-xsl and docbook-xsl-doc (because
docbook-xsl-ns needs the same documentation files).
+
+ * debian/control: Removed docbook-xsl-doc* binary package fields.
+ (Standards-Version): Bumped to 3.8.0.
+ (Recommends): Adjusted for doc-packages without .dfsg version part.
+ * debian/docbook-xsl-doc*: Removed docbook-xsl-doc* related debhelper files.
+ * debian/rules (binary-indep): Removed doc-packages related debhelper calls.
+ Further exclude .gitignore files.
+ (get-orig-source): Adjusted for source split. The doc-tarball is not
+ longer necessary.
+ * debian/examples/foo.1.example_manpage.xml: Fixed encoding declaration.
+ * debian/patches/02_use_global_papersize_conf.dpatch: Adjusted. Don't try
+ to patch files now in docbook-xsl-doc. Further fixed reference to
+ README.Debian (closes: #495644).
+ * debian/patches/7436_html_fo_fix_empty_index_entries.dpatch: Removed.
+ Applied upstream.
+ * debian/patches/7440_fo_normalize_space.dpatch: Ditto.
+ * debian/patches/7441_html_fix_legalnotice_filename_creation.dpatch: Ditto.
+ * debian/patches/7528_common_fix_too_many_nested_elements.dpatch: Ditto.
+ * debian/patches/7564_fo_fix_typo.dpatch: Ditto.
+ * debian/patches/7623_man_support_for_processing_structfield.dpatch: Ditto.
+ * debian/patches/7629_man_fix_escaped_dots_in_filenames.dpatch: Ditto.
+ * debian/patches/7656_html_component_title_in_info_elements.dpatch: Ditto.
+ * debian/patches/7668_locale_update_and_fix_norwegian_bokmal.dpatch: Ditto.
+ * debian/patches/7674_man_fix_unescaped_dash_in_whatis_entry.dpatch: Ditto.
+ * debian/patches/7681_fo_fix_colsep_in_entrytbl.dpatch: Ditto.
+ * debian/patches/7698_html_fix_rowsep_in_entrytbl.dpatch: Ditto.
+ * debian/patches/7731_man_prepend_dots_with_zero_width_char.dpatch: Ditto.
+ * debian/patches/7740_man_replace_spaces_in_refname_with_underscores.dpatch:
+ Ditto.
+ * debian/patches/7806_man_fix_non_breaking_space_output.dpatch: Ditto.
+ * debian/patches/7901_fo_fix_inline_or_block_template.dpatch: Ditto.
+ * debian/patches/7939_html_add_exslt_ns_for_pi.dpatch: Ditto.
+ * debian/patches/00list: Adjusted.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Sun, 30 Mar 2008 22:08:26 +0200
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=1142&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/control (original)
+++ packages/docbook-xsl/branches/experimental/debian/control Tue Aug 26 20:02:18 2008
@@ -5,17 +5,16 @@
Uploaders: Debian XML/SGML Group <debian-xml-sgml-pkgs at lists.alioth.debian.org>
Build-Depends: debhelper (>= 5), dpatch
Build-Depends-Indep: xml-core
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Homepage: http://wiki.docbook.org/topic/DocBookXslStylesheets
Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/
Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-xsl/trunk/
DM-Upload-Allowed: yes
Package: docbook-xsl
-Section: text
Architecture: all
Depends: ${misc:Depends}
-Recommends: docbook-xml (>= 4.1.2-4), docbook-xsl-doc-html (= ${source:Version}) | docbook-xsl-doc-pdf (= ${source:Version}) | docbook-xsl-doc-text (= ${source:Version}) | docbook-xsl-doc
+Recommends: docbook-xml (>= 4.1.2-4), docbook-xsl-doc-html | docbook-xsl-doc-pdf | docbook-xsl-doc-text | docbook-xsl-doc
Suggests: xsltproc, xalan, fop, libsaxon-java, libxalan2-java
Description: stylesheets for processing DocBook XML files to various output formats
These are modular XSL stylesheets for processing documents composed
@@ -30,34 +29,3 @@
The stylesheets are modular in the sense that you can extend and, to some
extent, customize them. The documentation is included in a separate package.
-Package: docbook-xsl-doc-html
-Section: doc
-Architecture: all
-Recommends: lynx | www-browser
-Provides: docbook-xsl-doc
-Conflicts: docbook-xsl (<< 1.70.0), docbook-xsl-doc (<< 1.72.0)
-Replaces: docbook-xsl (<< 1.70.0), docbook-xsl-doc (<< 1.72.0)
-Enhances: docbook-xsl (= ${source:Version})
-Description: stylesheets for processing DocBook XML files (HTML documentation)
- The package contains the documentation for the DocBook XSL stylesheets and
- explanations for the parameters you can use in HTML format.
-
-Package: docbook-xsl-doc-pdf
-Section: doc
-Architecture: all
-Recommends: gv | xpdf-reader| pdf-viewer
-Provides: docbook-xsl-doc
-Enhances: docbook-xsl (= ${source:Version})
-Description: stylesheets for processing DocBook XML files (PDF documentation)
- The package contains the documentation for the DocBook XSL stylesheets and
- explanations for the parameters you can use in PDF format.
-
-Package: docbook-xsl-doc-text
-Section: doc
-Architecture: all
-Recommends: less
-Provides: docbook-xsl-doc
-Enhances: docbook-xsl (= ${source:Version})
-Description: stylesheets for processing DocBook XML files (ASCII documentation)
- The package contains the documentation for the DocBook XSL stylesheets and
- explanations for the parameters you can use in simple ASCII text format.
Modified: packages/docbook-xsl/branches/experimental/debian/examples/foo.1.example_manpage.xml
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/examples/foo.1.example_manpage.xml?rev=1142&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/examples/foo.1.example_manpage.xml (original)
+++ packages/docbook-xsl/branches/experimental/debian/examples/foo.1.example_manpage.xml Tue Aug 26 20:02:18 2008
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='UTF-8'?>
<?xml-stylesheet type="text/xsl"
href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"?>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
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=1142&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/patches/00list (original)
+++ packages/docbook-xsl/branches/experimental/debian/patches/00list Tue Aug 26 20:02:18 2008
@@ -1,18 +1,1 @@
02_use_global_papersize_conf
-7436_html_fo_fix_empty_index_entries
-7440_fo_normalize_space
-7441_html_fix_legalnotice_filename_creation
-7528_common_fix_too_many_nested_elements
-7564_fo_fix_typo
-7623_man_support_for_processing_structfield
-7629_man_fix_escaped_dots_in_filenames
-7656_html_component_title_in_info_elements
-7668_locale_update_and_fix_norwegian_bokmal
-7674_man_fix_unescaped_dash_in_whatis_entry
-7681_fo_fix_colsep_in_entrytbl
-7698_html_fix_rowsep_in_entrytbl
-7731_man_prepend_dots_with_zero_width_char
-7740_man_replace_spaces_in_refname_with_underscores
-7806_man_fix_non_breaking_space_output
-7901_fo_fix_inline_or_block_template
-7939_html_add_exslt_ns_for_pi
Modified: packages/docbook-xsl/branches/experimental/debian/patches/02_use_global_papersize_conf.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/patches/02_use_global_papersize_conf.dpatch?rev=1142&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/patches/02_use_global_papersize_conf.dpatch (original)
+++ packages/docbook-xsl/branches/experimental/debian/patches/02_use_global_papersize_conf.dpatch Tue Aug 26 20:02:18 2008
@@ -10,7 +10,8 @@
## DP:
## DP: NOTE: The patch consists of 3 parts:
## DP: (1) The page.type parameter fix.
-## DP: (2) The update of the documentation for the page.type parameter.
+## DP: (2) The update of the documentation for the page.type parameter
+## DP: (docbook-xsl-doc).
## DP: (3) The verbose output to make sure, the user understands, what's
## DP: going on.
## DP:
@@ -18,37 +19,21 @@
## DP: <URL:http://bugs.debian.org/382505>
@DPATCH@
-diff -urNad trunk~/doc/fo/paper.type.html trunk/doc/fo/paper.type.html
---- trunk~/doc/fo/paper.type.html 2007-08-30 15:44:38.000000000 +0200
-+++ trunk/doc/fo/paper.type.html 2007-10-25 02:08:44.000000000 +0200
-@@ -17,6 +17,12 @@
- The list of known paper sizes includes USletter and most of the A,
- B, and C sizes. See <a href="../fo/page.width.portrait.html"><em class="parameter"><code>page.width.portrait</code></em></a>, for example.
-
-+<p><b>Important note for Debian users:</b> Because of the Debian bugs
-+<a href="http://bugs.debian.org/173093">#173093</a>
-+and <a href="http://bugs.debian.org/382505">#382505</a> the default value is read
-+from <tt>/etc/papersize</tt>. only the a{0..10}, b{0..4} and letter values of
-+<b>papersize</b>(5) are currently supported.
-+</p>
-
- </p>
-
-diff -urNad trunk~/fo/docbook.xsl trunk/fo/docbook.xsl
---- trunk~/fo/docbook.xsl 2007-06-29 01:23:31.000000000 +0200
-+++ trunk/fo/docbook.xsl 2007-10-25 02:12:53.000000000 +0200
-@@ -324,6 +324,8 @@
+diff -urNad experimental~/fo/docbook.xsl experimental/fo/docbook.xsl
+--- experimental~/fo/docbook.xsl 2008-06-01 23:36:39.000000000 +0200
++++ experimental/fo/docbook.xsl 2008-08-26 21:33:57.000000000 +0200
+@@ -328,6 +328,8 @@
<xsl:value-of select="$page.height"/>
<xsl:text>)</xsl:text>
</xsl:message>
+ <!-- Tell users about solution of bugs #173093 and #382505. -->
-+ <xsl:message>Read /usr/share/doc/docbook-xsl/README.Debian section 5(a).</xsl:message>
++ <xsl:message>Read /usr/share/doc/docbook-xsl/README.Debian.gz section 5(a).</xsl:message>
</xsl:template>
<!-- ==================================================================== -->
-diff -urNad trunk~/fo/param.xsl trunk/fo/param.xsl
---- trunk~/fo/param.xsl 2007-08-30 15:43:12.000000000 +0200
-+++ trunk/fo/param.xsl 2007-10-25 02:08:44.000000000 +0200
+diff -urNad experimental~/fo/param.xsl experimental/fo/param.xsl
+--- experimental~/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200
++++ experimental/fo/param.xsl 2008-08-26 21:35:02.000000000 +0200
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
+<!DOCTYPE xsl:stylesheet [
@@ -57,7 +42,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!-- This file is generated from param.xweb -->
-@@ -547,7 +550,31 @@
+@@ -550,7 +553,31 @@
<xsl:otherwise>8.5in</xsl:otherwise>
</xsl:choose>
</xsl:param>
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=1142&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/rules (original)
+++ packages/docbook-xsl/branches/experimental/debian/rules Tue Aug 26 20:02:18 2008
@@ -2,15 +2,14 @@
#
# export DH_VERBOSE=1
+PACKAGE = docbook-xsl
+
include /usr/share/dpatch/dpatch.make
-PACKAGE = docbook-xsl
-
build: build-stamp
-
build-stamp: patch-stamp
dh_testdir
- touch build-stamp
+ touch $@
clean: unpatch
dh_testdir
@@ -24,7 +23,7 @@
dh_clean -k
dh_installdirs
-# Build architecture-independent files here.
+binary-arch: build
binary-indep: build
dh_testdir
dh_testroot
@@ -35,8 +34,7 @@
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 -Ndocbook-xsl-doc-html -Xparam.xml -Xpi.xml -Xtable.xml -XChangeLog* -X.param.* -X.lib.*
- dh_install -pdocbook-xsl-doc-html -Xreference.pdf.gz -Xreference.txt.gz -XAUTHORS -XCOPYING -XREADME
+ dh_install -Xparam.xml -Xpi.xml -Xtable.xml -XChangeLog* -X.param.* -X.lib.* -X.gitignore
dh_link
dh_compress
dh_fixperms
@@ -44,10 +42,6 @@
dh_gencontrol
dh_md5sums
dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build
-# We have nothing to do.
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary
@@ -63,10 +57,8 @@
set -ex ; \
TMPDIR=`mktemp -d docbook-xsl-$(version).orig` ; \
wget -P "$$TMPDIR" \
- http://downloads.sourceforge.net/docbook/docbook-xsl-$(uversion).tar.bz2 \
- http://downloads.sourceforge.net/docbook/docbook-xsl-doc-$(uversion).tar.bz2 ; \
+ http://downloads.sourceforge.net/docbook/docbook-xsl-$(uversion).tar.bz2 ; \
tar --directory="$$TMPDIR" -xjf "$$TMPDIR"/docbook-xsl-$(uversion).tar.bz2 ; \
- tar --directory="$$TMPDIR" -xjf "$$TMPDIR"/docbook-xsl-doc-$(uversion).tar.bz2 ; \
rm -rf "$$TMPDIR"/docbook-xsl-$(uversion)/extensions/ ; \
mv "$$TMPDIR"/docbook-xsl-$(uversion) "$$TMPDIR"/docbook-xsl-$(version).orig ; \
GZIP=-9 tar --directory="$$TMPDIR" -czf \
More information about the debian-xml-sgml-commit
mailing list