[xml/sgml-commit] r1885 - in /packages/docbook-xsl/trunk/debian: ./ bugs/ bugs/docbook-xsl-ns/ bugs/docbook-xsl/ examples/ examples/docbook-xsl-ns/ examples/docbook-xsl/

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Mon May 16 19:18:31 UTC 2011


Author: dleidert-guest
Date: Mon May 16 19:18:11 2011
New Revision: 1885

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1885
Log:
* Copied some files from docbook-xsl-ns.
* debian/control: Added docbook-xsl-ns.
  (Build-Depends): Added docbook5-xml for docbook-xsl-ns.
* debian/copyright: Renamed to debian/docbook-xsl.copyright.
* debian/docbook-xsl.docs: Adjusted source paths.
* debian/docbook-xsl.examples: Ditto.
* debian/docbook-xsl.install: Ditto.
* debian/docbook-xsl.xmlcatalogs: Ditto.
* debian/docbook-xsl-ns.copyright: Copied and adjusted source paths.
* debian/docbook-xsl-ns.docs: Ditto.
* debian/docbook-xsl-ns.examples: Ditto.
* debian/docbook-xsl-ns.install: Ditto.
* debian/docbook-xsl-ns.xmlcatalogs: Ditto.
* debian/docbook-xsl-ns.README.Debian: Copied.
* debian/presubj: Renamed to debian/bugs/docbook-xsl/presubj.
* debian/rules (check-xml): Added check of DocBook 5 example (copied from
  docbook-xsl-ns).
  (override_dh_installchangelogs): Adjusted source paths.
* debian/README.Debian: Renamed to debian/docbook-xsl.README.Debian.
* debian/README.source: Adjusted after dropping dpatch and after merging
  docbook-xsl and docbook-xsl-ns.
* debian/bugs/docbook-xsl-ns/presubj: Copied and renamed. Typo fix.
* debian/examples/foo.1.example_manpage.xml: Renamed to
  debian/examples/docbook-xsl/foo.1.example_manpage.xml.
* debian/examples/docbook-xsl-ns/foo.1.example_manpage.xml: Copied.

Added:
    packages/docbook-xsl/trunk/debian/bugs/
    packages/docbook-xsl/trunk/debian/bugs/docbook-xsl/
    packages/docbook-xsl/trunk/debian/bugs/docbook-xsl-ns/
    packages/docbook-xsl/trunk/debian/bugs/docbook-xsl-ns/presubj
      - copied, changed from r1883, packages/docbook-xsl-ns/branches/experimental/debian/presubj
    packages/docbook-xsl/trunk/debian/bugs/docbook-xsl/presubj
      - copied unchanged from r1883, packages/docbook-xsl/trunk/debian/presubj
    packages/docbook-xsl/trunk/debian/docbook-xsl-ns.README.Debian
      - copied unchanged from r1883, packages/docbook-xsl-ns/branches/experimental/debian/README.Debian
    packages/docbook-xsl/trunk/debian/docbook-xsl-ns.copyright
      - copied unchanged from r1883, packages/docbook-xsl-ns/branches/experimental/debian/copyright
    packages/docbook-xsl/trunk/debian/docbook-xsl-ns.docs
      - copied, changed from r1883, packages/docbook-xsl-ns/branches/experimental/debian/docbook-xsl-ns.docs
    packages/docbook-xsl/trunk/debian/docbook-xsl-ns.examples
      - copied, changed from r1883, packages/docbook-xsl-ns/branches/experimental/debian/docbook-xsl-ns.examples
    packages/docbook-xsl/trunk/debian/docbook-xsl-ns.install
      - copied, changed from r1883, packages/docbook-xsl-ns/branches/experimental/debian/docbook-xsl-ns.install
    packages/docbook-xsl/trunk/debian/docbook-xsl-ns.xmlcatalogs
      - copied, changed from r1883, packages/docbook-xsl-ns/branches/experimental/debian/docbook-xsl-ns.xmlcatalogs
    packages/docbook-xsl/trunk/debian/docbook-xsl.README.Debian
      - copied unchanged from r1883, packages/docbook-xsl/trunk/debian/README.Debian
    packages/docbook-xsl/trunk/debian/docbook-xsl.copyright
      - copied unchanged from r1883, packages/docbook-xsl/trunk/debian/copyright
    packages/docbook-xsl/trunk/debian/examples/docbook-xsl/
    packages/docbook-xsl/trunk/debian/examples/docbook-xsl-ns/
    packages/docbook-xsl/trunk/debian/examples/docbook-xsl-ns/foo.1.example_manpage.xml
      - copied unchanged from r1883, packages/docbook-xsl-ns/branches/experimental/debian/examples/foo.1.example_manpage.xml
    packages/docbook-xsl/trunk/debian/examples/docbook-xsl/foo.1.example_manpage.xml
Removed:
    packages/docbook-xsl/trunk/debian/README.Debian
    packages/docbook-xsl/trunk/debian/copyright
    packages/docbook-xsl/trunk/debian/examples/foo.1.example_manpage.xml
    packages/docbook-xsl/trunk/debian/presubj
Modified:
    packages/docbook-xsl/trunk/debian/README.source
    packages/docbook-xsl/trunk/debian/changelog
    packages/docbook-xsl/trunk/debian/control
    packages/docbook-xsl/trunk/debian/docbook-xsl.docs
    packages/docbook-xsl/trunk/debian/docbook-xsl.examples
    packages/docbook-xsl/trunk/debian/docbook-xsl.install
    packages/docbook-xsl/trunk/debian/docbook-xsl.xmlcatalogs
    packages/docbook-xsl/trunk/debian/rules

Modified: packages/docbook-xsl/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/README.source?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/README.source (original)
+++ packages/docbook-xsl/trunk/debian/README.source Mon May 16 19:18:11 2011
@@ -1,19 +1,17 @@
-docbook-xsl for Debian
-----------------------
+docbook-xsl and docbook-xsl-ns for Debian
+-----------------------------------------
 
-This is the repackaged source of the upstream tarball. The following changes
-are done to the upstream tarball (see also the get-orig-source.sh script):
+This is the repackaged source of the upstream tarballs of docbook-xsl and
+docbook-xsl-ns. The following changes are done to the upstream tarballs
+(see also the get-orig-source.sh script):
 
-  - removal of the extensions/ directory - source is missing
+  - removal of the extensions/ directories - source is missing
 
     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
+  - removal of the webhelp/ directories - 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>, August 2010
+ -- Daniel Leidert <daniel.leidert at wgdd.de>, May 2011

Copied: packages/docbook-xsl/trunk/debian/bugs/docbook-xsl-ns/presubj (from r1883, packages/docbook-xsl-ns/branches/experimental/debian/presubj)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/bugs/docbook-xsl-ns/presubj?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl-ns/branches/experimental/debian/presubj (original)
+++ packages/docbook-xsl/trunk/debian/bugs/docbook-xsl-ns/presubj Mon May 16 19:18:11 2011
@@ -2,4 +2,4 @@
   problem ONLY to the Debian BTS and NEVER to upstream.
 
 For general notes regarding bug-reports against the Debian package, please
-  read section 6 of /usr/share/doc/docbook-xsl-ns/README.Debian.
+  read section 6 of /usr/share/doc/docbook-xsl-ns/README.Debian.gz.

Modified: packages/docbook-xsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/changelog?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Mon May 16 19:18:11 2011
@@ -3,18 +3,43 @@
   * NOT RELEASED YET
   * New upstream release.
     - Fixed bug when context was lost (closes: #602537).
-  * debian/control (Vcs-Browser, Vcs-Svn): Adjusted for unstable.
+  * Copied some files from docbook-xsl-ns.
+
+  * debian/control: Added docbook-xsl-ns.
+    (Vcs-Browser, Vcs-Svn): Adjusted for unstable.
     (Build-Depends): Dropped dpatch in favour of source format 3.0 (quilt).
+    Added docbook5-xml for docbook-xsl-ns.
     (Standards-Version): Bumped to 3.9.2.
     (Description): Mention XSL-FO (closes: #604004, #623977).
     (Recommends): Downgrade docbook-xsl-doc* packages to Suggests (closes:
     #610726, #623976).
+  * debian/copyright: Renamed to debian/docbook-xsl.copyright.
+  * debian/docbook-xsl.docs: Adjusted source paths.
+  * debian/docbook-xsl.examples: Ditto.
+  * debian/docbook-xsl.install: Ditto.
+  * debian/docbook-xsl.xmlcatalogs: Ditto.
+  * debian/docbook-xsl-ns.copyright: Copied and adjusted source paths.
+  * debian/docbook-xsl-ns.docs: Ditto.
+  * debian/docbook-xsl-ns.examples: Ditto.
+  * debian/docbook-xsl-ns.install: Ditto.
+  * debian/docbook-xsl-ns.xmlcatalogs: Ditto.
+  * debian/docbook-xsl-ns.README.Debian: Copied.
+  * debian/get-orig-source.sh: Create one source package for docbook-xsl and
+    docbook-xsl-ns.
+  * debian/presubj: Renamed to debian/bugs/docbook-xsl/presubj.
   * debian/rules: Dropped dpatch and useless get-orig-source target.
     (override_dh_auto_test): Run the check-xml target.
-    (check-xml): Added the --nonet switch to avoid internet access.
+    (check-xml): Added the --nonet switch to avoid internet access. Added
+    check of DocBook 5 example (copied from docbook-xsl-ns).
+    (override_dh_installchangelogs): Adjusted source paths.
     (.PHONY): Added the check-xml target.
-  * debian/get-orig-source.sh: Create one source package for docbook-xsl and
-    docbook-xsl-ns.
+  * debian/README.Debian: Renamed to debian/docbook-xsl.README.Debian.
+  * debian/README.source: Adjusted after dropping dpatch and after merging
+    docbook-xsl and docbook-xsl-ns.
+  * debian/bugs/docbook-xsl-ns/presubj: Copied and renamed. Typo fix.
+  * debian/examples/foo.1.example_manpage.xml: Renamed to
+    debian/examples/docbook-xsl/foo.1.example_manpage.xml.
+  * debian/examples/docbook-xsl-ns/foo.1.example_manpage.xml: Copied.
   * debian/source/format: Changed to 3.0 (quilt).
   * debian/patches/605696_fix_section_name_for_lexgrog.patch: Added.
     - */common/es.xml: Fix Spanish translation for RefName to make it being

Modified: packages/docbook-xsl/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/control?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/control (original)
+++ packages/docbook-xsl/trunk/debian/control Mon May 16 19:18:11 2011
@@ -3,7 +3,7 @@
 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 (>> 7.0.50~), libxml2-utils, docbook-xml (>> 4.4)
+Build-Depends: debhelper (>> 7.0.50~), libxml2-utils, docbook-xml (>> 4.4), docbook5-xml
 Build-Depends-Indep: xml-core
 Standards-Version: 3.9.2
 Homepage: http://wiki.docbook.org/topic/DocBookXslStylesheets
@@ -16,7 +16,7 @@
 Depends: ${misc:Depends}
 Recommends: docbook-xml (>= 4.1.2-4)
 Suggests: docbook-xsl-doc-html | docbook-xsl-doc-pdf | docbook-xsl-doc-text | docbook-xsl-doc,
- libsaxon-java, libxalan2-java, docbook-xsl-saxon, fop, xalan, dbtoepub, libxslthl-java
+ libsaxon-java, libxalan2-java, libxslthl-java, docbook-xsl-saxon, fop, xalan, dbtoepub
 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
@@ -29,3 +29,25 @@
  .
  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-ns
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: docbook5-xml (>> 5)
+Suggests: docbook-xsl-doc-html | docbook-xsl-doc-pdf | docbook-xsl-doc-text | docbook-xsl-doc,
+ libsaxon-java, libxalan2-java, libxslthl-java, docbook-xsl-saxon, fop, xalan, dbtoepub
+Description: stylesheets for processing DocBook 5 XML to various output formats
+ These are modular XSL stylesheets for processing documents composed
+ with DocBook 5 XML and its derivatives. Unlike in docbook-xsl the DocBook
+ namespace prefix has been added to element names in pattern matches and
+ expressions. However processing of DocBook 4 documents is also possible
+ with these stylesheets. For a more detailed explanation read
+ http://www.sagehill.net/docbookxsl/ProcesingDb5.html.
+ .
+ The stylesheets provide XSLT transformations for (X)HTML, WordML, HTML Help,
+ JavaHelp, Man page (nroff), Website, Eclipse Platform Help file and XSL
+ Formatting Object (XSL-FO) output. The latter can be further processed to
+ a number of print formats using FOP or TeX-based tools.
+ .
+ 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.

Copied: packages/docbook-xsl/trunk/debian/docbook-xsl-ns.docs (from r1883, packages/docbook-xsl-ns/branches/experimental/debian/docbook-xsl-ns.docs)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/docbook-xsl-ns.docs?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl-ns/branches/experimental/debian/docbook-xsl-ns.docs (original)
+++ packages/docbook-xsl/trunk/debian/docbook-xsl-ns.docs Mon May 16 19:18:11 2011
@@ -1,3 +1,3 @@
-BUGS
-README
-TODO
+docbook-xsl-ns/BUGS
+docbook-xsl-ns/README
+docbook-xsl-ns/TODO

Copied: packages/docbook-xsl/trunk/debian/docbook-xsl-ns.examples (from r1883, packages/docbook-xsl-ns/branches/experimental/debian/docbook-xsl-ns.examples)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/docbook-xsl-ns.examples?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl-ns/branches/experimental/debian/docbook-xsl-ns.examples (original)
+++ packages/docbook-xsl/trunk/debian/docbook-xsl-ns.examples Mon May 16 19:18:11 2011
@@ -1,1 +1,1 @@
-debian/examples/foo.1.example_manpage.xml
+debian/examples/docbook-xsl-ns/foo.1.example_manpage.xml

Copied: packages/docbook-xsl/trunk/debian/docbook-xsl-ns.install (from r1883, packages/docbook-xsl-ns/branches/experimental/debian/docbook-xsl-ns.install)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/docbook-xsl-ns.install?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl-ns/branches/experimental/debian/docbook-xsl-ns.install (original)
+++ packages/docbook-xsl/trunk/debian/docbook-xsl-ns.install Mon May 16 19:18:11 2011
@@ -1,21 +1,21 @@
-VERSION         usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/VERSION         usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
 
-common          usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-eclipse         usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-epub/*.xsl      usr/share/xml/docbook/stylesheet/docbook-xsl-ns/epub/
-fo              usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-highlighting    usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-html            usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-htmlhelp        usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-images          usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-javahelp        usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-lib             usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-manpages        usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-profiling       usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-roundtrip       usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-slides          usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-template        usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-website         usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
-xhtml*          usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/common          usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/eclipse         usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/epub/*.xsl      usr/share/xml/docbook/stylesheet/docbook-xsl-ns/epub/
+docbook-xsl-ns/fo              usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/highlighting    usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/html            usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/htmlhelp        usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/images          usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/javahelp        usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/lib             usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/manpages        usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/profiling       usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/roundtrip       usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/slides          usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/template        usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/website         usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
+docbook-xsl-ns/xhtml*          usr/share/xml/docbook/stylesheet/docbook-xsl-ns/
 
-debian/presubj  usr/share/bug/docbook-xsl-ns
+debian/bugs/docbook-xsl-ns/presubj  usr/share/bug/docbook-xsl-ns

Copied: packages/docbook-xsl/trunk/debian/docbook-xsl-ns.xmlcatalogs (from r1883, packages/docbook-xsl-ns/branches/experimental/debian/docbook-xsl-ns.xmlcatalogs)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/docbook-xsl-ns.xmlcatalogs?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl-ns/branches/experimental/debian/docbook-xsl-ns.xmlcatalogs (original)
+++ packages/docbook-xsl/trunk/debian/docbook-xsl-ns.xmlcatalogs Mon May 16 19:18:11 2011
@@ -1,4 +1,4 @@
-local;catalog.xml;/usr/share/xml/docbook/stylesheet/docbook-xsl-ns/catalog.xml
+local;docbook-xsl-ns/catalog.xml;/usr/share/xml/docbook/stylesheet/docbook-xsl-ns/catalog.xml
 
 root;uri;http://docbook.sourceforge.net/release/xsl-ns/
 root;system;http://docbook.sourceforge.net/release/xsl-ns/

Modified: packages/docbook-xsl/trunk/debian/docbook-xsl.docs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/docbook-xsl.docs?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/docbook-xsl.docs (original)
+++ packages/docbook-xsl/trunk/debian/docbook-xsl.docs Mon May 16 19:18:11 2011
@@ -1,3 +1,3 @@
-BUGS
-README
-TODO
+docbook-xsl/BUGS
+docbook-xsl/README
+docbook-xsl/TODO

Modified: packages/docbook-xsl/trunk/debian/docbook-xsl.examples
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/docbook-xsl.examples?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/docbook-xsl.examples (original)
+++ packages/docbook-xsl/trunk/debian/docbook-xsl.examples Mon May 16 19:18:11 2011
@@ -1,1 +1,1 @@
-debian/examples/foo.1.example_manpage.xml
+debian/examples/docbook-xsl/foo.1.example_manpage.xml

Modified: packages/docbook-xsl/trunk/debian/docbook-xsl.install
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/docbook-xsl.install?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/docbook-xsl.install (original)
+++ packages/docbook-xsl/trunk/debian/docbook-xsl.install Mon May 16 19:18:11 2011
@@ -1,21 +1,21 @@
-VERSION         usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/VERSION         usr/share/xml/docbook/stylesheet/docbook-xsl/
 
-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/
-htmlhelp        usr/share/xml/docbook/stylesheet/docbook-xsl/
-images          usr/share/xml/docbook/stylesheet/docbook-xsl/
-javahelp        usr/share/xml/docbook/stylesheet/docbook-xsl/
-lib             usr/share/xml/docbook/stylesheet/docbook-xsl/
-manpages        usr/share/xml/docbook/stylesheet/docbook-xsl/
-profiling       usr/share/xml/docbook/stylesheet/docbook-xsl/
-roundtrip       usr/share/xml/docbook/stylesheet/docbook-xsl/
-slides          usr/share/xml/docbook/stylesheet/docbook-xsl/
-template        usr/share/xml/docbook/stylesheet/docbook-xsl/
-website         usr/share/xml/docbook/stylesheet/docbook-xsl/
-xhtml*          usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/common          usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/eclipse         usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/epub/*.xsl      usr/share/xml/docbook/stylesheet/docbook-xsl/epub/
+docbook-xsl/fo              usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/highlighting    usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/html            usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/htmlhelp        usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/images          usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/javahelp        usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/lib             usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/manpages        usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/profiling       usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/roundtrip       usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/slides          usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/template        usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/website         usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook-xsl/xhtml*          usr/share/xml/docbook/stylesheet/docbook-xsl/
 
-debian/presubj  usr/share/bug/docbook-xsl
+debian/bugs/docbook-xsl/presubj  usr/share/bug/docbook-xsl

Modified: packages/docbook-xsl/trunk/debian/docbook-xsl.xmlcatalogs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/docbook-xsl.xmlcatalogs?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/docbook-xsl.xmlcatalogs (original)
+++ packages/docbook-xsl/trunk/debian/docbook-xsl.xmlcatalogs Mon May 16 19:18:11 2011
@@ -1,4 +1,4 @@
-local;catalog.xml;/usr/share/xml/docbook/stylesheet/docbook-xsl/catalog.xml
+local;docbook-xsl/catalog.xml;/usr/share/xml/docbook/stylesheet/docbook-xsl/catalog.xml
 
 root;uri;http://docbook.sourceforge.net/release/xsl/
 root;system;http://docbook.sourceforge.net/release/xsl/

Added: packages/docbook-xsl/trunk/debian/examples/docbook-xsl/foo.1.example_manpage.xml
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/examples/docbook-xsl/foo.1.example_manpage.xml?rev=1885&op=file
==============================================================================
--- packages/docbook-xsl/trunk/debian/examples/docbook-xsl/foo.1.example_manpage.xml (added)
+++ packages/docbook-xsl/trunk/debian/examples/docbook-xsl/foo.1.example_manpage.xml Mon May 16 19:18:11 2011
@@ -1,0 +1,291 @@
+<?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"
+	"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+
+<!-- Process this file with an XSLT processor, e.g. xsltproc:    -->
+<!-- `xsltproc \
+      -''-nonet \
+      -''-param man.charmap.use.subset "0" \
+      -''-param make.year.ranges "1" \
+      -''-param make.single.year.ranges "1" \
+      manpage.xml'                                               -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME.              -->
+  <!ENTITY dhfirstname "Daniel">
+  <!ENTITY dhsurname   "Leidert">
+  <!ENTITY dhemail     "daniel.leidert at wgdd.de">
+  <!-- dhusername could also be set to "&firstname; &surname;".  -->
+  <!ENTITY dhusername  "&dhfirstname; &dhsurname;">
+
+  <!-- The version information can also be suppressed (just      -->
+  <!-- remove it or comment it out.                              -->
+  <!ENTITY dhrelease   "0.1.2">
+
+  <!-- TITLE should be something like "User commands",           -->
+  <!-- "&dhpackage; command-line reference" or similar (see e.g. -->
+  <!-- http://www.tldp.org/HOWTO/Man-Page/q2.html). But limit    -->
+  <!-- the length to 30 chars.                                   -->
+  <!ENTITY dhtitle     "User Manuals">
+  
+  <!-- This is the application/package name.                     -->
+  <!ENTITY dhucpackage "FOO">
+  <!ENTITY dhpackage   "foo">
+
+  <!-- If the application e.g. belongs to a package like X.org,  -->
+  <!-- this should be set to the package/suite name instead of   -->
+  <!-- dhpackage.                                                -->
+  <!ENTITY dhproduct   "&dhpackage;">
+
+  <!-- SECTION should be 1-8, maybe w/ subsection other          -->
+  <!-- parameters are allowed: see man(7), man(1) and            -->
+  <!-- http://www.tldp.org/HOWTO/Man-Page/q2.html.               -->
+  <!ENTITY dhsection   "1">
+
+]>
+
+<refentry>
+	<refentryinfo>
+		<title>&dhtitle;</title>
+		<!-- Better put a suite name instead of &dhpackage; into productname -->
+		<productname>&dhproduct;</productname>
+		<releaseinfo role="version">&dhrelease;</releaseinfo>
+		<authorgroup>
+			<author>
+				<firstname>Jens</firstname>
+				<surname>Schweikhardt</surname>
+				<contrib>Wrote this example manpage for the &quot;Linux Man Page Howto&quot;, available at <ulink url="http://www.schweikhardt.net/man_page_howto.html"/> or <ulink url="http://www.faqs.org/docs/Linux-mini/Man-Page.html"/>.</contrib>
+				<address>
+					<email>schweikh at schweikhardt.net</email>
+				</address>
+			</author>
+			<author>
+				<firstname>&dhfirstname;</firstname>
+				<surname>&dhsurname;</surname>
+				<contrib>Rewrote and extended the example manpage in DocBook XML for the Debian distribution.</contrib>
+				<address>
+					<email>&dhemail;</email>
+				</address>
+			</author>
+		</authorgroup>
+		<copyright>
+			<year>1995</year>
+			<year>1996</year>
+			<year>1997</year>
+			<year>1998</year>
+			<year>1999</year>
+			<year>2000</year>
+			<year>2001</year>
+			<year>2002</year>
+			<year>2003</year>
+			<holder>Jens Schweikhardt</holder>
+		</copyright>
+		<copyright>
+			<year>2006</year>
+			<holder>&dhusername;</holder>
+		</copyright>
+		<legalnotice>
+			<para>The Howto containing this example, was offered under the following conditions:</para>
+			<para>Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:</para>
+			<orderedlist>
+				<listitem>
+					<para>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</para>
+				</listitem>
+				<listitem>
+					<para>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.</para>
+				</listitem>
+			</orderedlist>
+			<para>THIS SOFTWARE IS PROVIDED BY THE AUTHOR &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para>
+		</legalnotice>
+	</refentryinfo>
+	<refmeta>
+		<refentrytitle>&dhucpackage;</refentrytitle>
+		<manvolnum>&dhsection;</manvolnum>
+	</refmeta>
+	<refnamediv>
+		<refname>&dhpackage;</refname>
+		<refpurpose>frobnicate the bar library</refpurpose>
+	</refnamediv>
+	<refsynopsisdiv>
+		<cmdsynopsis>
+			<command>&dhpackage;</command>
+			<arg choice="opt"><option>-bar</option></arg>
+			<group choice="opt">
+				<arg choice="plain"><option>-b</option></arg>
+				<arg choice="plain"><option>--busy</option></arg>
+			</group>
+			<group choice="opt">
+				<arg choice="plain"><option>-c <replaceable>config-file</replaceable></option></arg>
+				<arg choice="plain"><option>--config=<replaceable>config-file</replaceable></option></arg>
+			</group>
+			<arg choice="opt">
+				<group choice="req">
+					<arg choice="plain"><option>-e</option></arg>
+					<arg choice="plain"><option>--example</option></arg>
+				</group>
+				<replaceable class="option">this</replaceable>
+			</arg>
+			<arg choice="opt">
+				<group choice="req">
+					<arg choice="plain"><option>-e</option></arg>
+					<arg choice="plain"><option>--example</option></arg>
+				</group>
+				<group choice="req">
+					<arg choice="plain"><replaceable>this</replaceable></arg>
+					<arg choice="plain"><replaceable>that</replaceable></arg>
+				</group>
+			</arg>
+			<arg choice="plain" rep="repeat"><replaceable>file(s)</replaceable></arg>
+		</cmdsynopsis>
+		<cmdsynopsis>
+			<command>&dhpackage;</command>
+      <!-- Normally the help and version options make the programs stop
+			     right after outputting the requested information. -->
+			<group choice="opt">
+				<arg choice="plain">
+					<group choice="req">
+						<arg choice="plain"><option>-h</option></arg>
+						<arg choice="plain"><option>--help</option></arg>
+					</group>
+				</arg>
+				<arg choice="plain">
+					<group choice="req">
+						<arg choice="plain"><option>-v</option></arg>
+						<arg choice="plain"><option>--version</option></arg>
+					</group>
+				</arg>
+			</group>
+		</cmdsynopsis>
+	</refsynopsisdiv>
+	<refsect1 id="description">
+		<title>DESCRIPTION</title>
+		<para><command>&dhpackage;</command> frobnicates the <application>bar</application> library by tweaking internal symbol tables. By default it parses all baz segments and rearranges them in reverse order by time for the <citerefentry><refentrytitle>xyzzy</refentrytitle><manvolnum>1</manvolnum></citerefentry> linker to find them. The symdef entry is then compressed using the <abbrev>WBG</abbrev> (Whiz-Bang-Gizmo) algorithm. All files are processed in the order specified.</para>
+	</refsect1>
+	<refsect1 id="options">
+		<title>OPTIONS</title>
+		<variablelist>
+			<!-- Use the variablelist.term.separator and the
+			     variablelist.term.break.after parameters to
+			     control the term elements. -->
+			<varlistentry>
+				<term><option>-b</option></term>
+				<term><option>--busy</option></term>
+				<listitem>
+					<para>Do not write <quote>busy</quote> to <filename class="devicefile">stdout</filename> while processing.</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>-c <replaceable class="parameter">config-file</replaceable></option></term>
+				<term><option>--config=<replaceable class="parameter">config-file</replaceable></option></term>
+				<listitem>
+					<para>Use the alternate system wide <replaceable>config-file</replaceable> instead of the <filename>/etc/foo.conf</filename>. This overrides any <envar>FOOCONF</envar> environment variable.</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>-a</option></term>
+				<listitem>
+					<para>In addition to the baz segments, also parse the <citerefentry><refentrytitle>blurfl</refentrytitle><manvolnum>3</manvolnum></citerefentry> headers.</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><option>-r</option></term>
+				<listitem>
+					<para>Recursive mode. Operates as fast as lightning at the expense of a megabyte of virtual memory.</para>
+				</listitem>
+			</varlistentry>
+		</variablelist>
+	</refsect1>
+	<refsect1 id="files">
+		<title>FILES</title>
+		<variablelist>
+			<varlistentry>
+				<term><filename>/etc/foo.conf</filename></term>
+				<listitem>
+					<para>The system-wide configuration file. See <citerefentry><refentrytitle>foo.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> for further details.</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><filename>${HOME}/.foo.conf</filename></term>
+				<listitem>
+					<para>The per-user configuration file. See <citerefentry><refentrytitle>foo.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> for further details.</para>
+				</listitem>
+			</varlistentry>
+		</variablelist>
+	</refsect1>
+	<refsect1 id="environment">
+		<title>ENVIONMENT</title>
+		<variablelist>
+			<varlistentry>
+			<term><envar>FOOCONF</envar></term>
+				<listitem>
+					<para>The full pathname for an alternate system wide configuration file <citerefentry><refentrytitle>foo.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> (see also <xref linkend="files"/>). Overridden by the <option>-c</option> option.</para>
+				</listitem>
+			</varlistentry>
+		</variablelist>
+	</refsect1>
+	<refsect1 id="diagnostics">
+		<title>DIAGNOSTICS</title>
+		<para>The following diagnostics may be issued on <filename class="devicefile">stderr</filename>:</para>
+		<variablelist>
+			<varlistentry>
+				<term><quote><errortext>Bad magic number.</errortext></quote></term>
+				<listitem>
+					<para>The input file does not look like an archive file.</para>
+				</listitem>
+			</varlistentry>
+			<varlistentry>
+				<term><quote><errortext>Old style baz segments.</errortext></quote></term>
+				<listitem>
+					<para><command>&dhpackage;</command> can only handle new style baz segments. <acronym>COBOL</acronym> object libraries are not supported in this version.</para>
+				</listitem>
+			</varlistentry>
+		</variablelist>
+		<para>The following return codes can be used in scripts:</para>
+		<segmentedlist>
+			<segtitle>Errorcode</segtitle>
+			<segtitle>Errortext</segtitle>
+			<segtitle>Diagnostic</segtitle>
+			<seglistitem>
+				<seg><errorcode>0</errorcode></seg>
+				<seg><errortext>Program exited normally.</errortext></seg>
+				<seg>No error. Program ran successfully.</seg>
+			</seglistitem>
+			<seglistitem>
+				<seg><errorcode>1</errorcode></seg>
+				<seg><errortext>Bad magic number.</errortext></seg>
+				<seg>The input file does not look like an archive file.</seg>
+			</seglistitem>
+			<seglistitem>
+				<seg><errorcode>2</errorcode></seg>
+				<seg><errortext>Old style baz segments.</errortext></seg>
+				<seg><command>&dhpackage;</command> can only handle new style baz segments. <acronym>COBOL</acronym> object libraries are not supported in this version.</seg>
+			</seglistitem>
+		</segmentedlist>
+	</refsect1>
+	<refsect1 id="bugs">
+		<!-- Or use this section to tell about upstream BTS. -->
+		<title>BUGS</title>
+		<para>The command name should have been chosen more carefully to reflect its purpose.</para>
+		<para>The upstreams <acronym>BTS</acronym> can be found at <ulink url="http://bugzilla.foo.tld"/>.</para>
+	</refsect1>
+	<refsect1 id="see_also">
+		<title>SEE ALSO</title>
+		<!-- In alpabetical order. -->
+		<para><citerefentry>
+				<refentrytitle>bar</refentrytitle>
+				<manvolnum>1</manvolnum>
+			</citerefentry>, <citerefentry>
+				<refentrytitle>foo</refentrytitle>
+				<manvolnum>1</manvolnum>
+			</citerefentry>, <citerefentry>
+				<refentrytitle>foo.conf</refentrytitle>
+				<manvolnum>5</manvolnum>
+			</citerefentry>, <citerefentry>
+				<refentrytitle>xyzzy</refentrytitle>
+				<manvolnum>1</manvolnum>
+			</citerefentry></para>
+		<para>The programs are documented fully by <citetitle>The Rise and Fall of a Fooish Bar</citetitle> available via the <application>Info</application> system.</para>
+	</refsect1>
+</refentry>
+

Modified: packages/docbook-xsl/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/rules?rev=1885&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/rules (original)
+++ packages/docbook-xsl/trunk/debian/rules Mon May 16 19:18:11 2011
@@ -7,8 +7,11 @@
 
 override_dh_auto_build:
 override_dh_auto_test:
+	xmllint --noout --noent --nonet --valid \
+	        $(CURDIR)/debian/examples/docbook-xsl/foo.1.example_manpage.xml
 	xmllint --noout --noent --nonet \
-	        --valid $(CURDIR)/debian/examples/foo.1.example_manpage.xml
+                --relaxng http://docbook.org/xml/5.0/rng/docbook.rng \
+	        $(CURDIR)/debian/examples/docbook-xsl-ns/foo.1.example_manpage.xml
 
 override_dh_install:
 	dh_installxmlcatalogs
@@ -17,4 +20,5 @@
 	dh_install -Xparam.xml -Xpi.xml -Xtable.xml -XChangeLog* -X.param.* -X.lib.* -X.gitignore
 
 override_dh_installchangelogs:	
-	dh_installchangelogs RELEASE-NOTES.txt
+	dh_installchangelogs -p docbook-xsl    docbook-xsl/RELEASE-NOTES.txt
+	dh_installchangelogs -p docbook-xsl-ns docbook-xsl-ns/RELEASE-NOTES.txt




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