[xml/sgml-commit] r1782 - 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 19:38:23 UTC 2010 

Author: dleidert-guest
Date: Tue Aug 31 19:38:14 2010
New Revision: 1782

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1782
Log:
Merge with HEAD: docbook-xsl (1.75.2+dfsg-5) unstable


Added:
    packages/docbook-xsl/branches/experimental/debian/README.source
      - copied unchanged from r1781, packages/docbook-xsl/trunk/debian/README.source
    packages/docbook-xsl/branches/experimental/debian/get-orig-source.sh
      - copied unchanged from r1781, packages/docbook-xsl/trunk/debian/get-orig-source.sh
    packages/docbook-xsl/branches/experimental/debian/patches/561590_param_local_draft_image.dpatch
      - copied unchanged from r1781, packages/docbook-xsl/trunk/debian/patches/561590_param_local_draft_image.dpatch
    packages/docbook-xsl/branches/experimental/debian/patches/562227_xhtml_fix_saxon_ns_leakage.dpatch
      - copied unchanged from r1781, packages/docbook-xsl/trunk/debian/patches/562227_xhtml_fix_saxon_ns_leakage.dpatch
    packages/docbook-xsl/branches/experimental/debian/patches/8530_manpages_lists_indentation_fix.dpatch
      - copied unchanged from r1781, packages/docbook-xsl/trunk/debian/patches/8530_manpages_lists_indentation_fix.dpatch
    packages/docbook-xsl/branches/experimental/debian/patches/8539_554441_xhtml11_fix_ulink_param_target.dpatch
      - copied unchanged from r1781, packages/docbook-xsl/trunk/debian/patches/8539_554441_xhtml11_fix_ulink_param_target.dpatch
    packages/docbook-xsl/branches/experimental/debian/patches/8563_562816_german_translation_fix.dpatch
      - copied unchanged from r1781, packages/docbook-xsl/trunk/debian/patches/8563_562816_german_translation_fix.dpatch
    packages/docbook-xsl/branches/experimental/debian/patches/portable_apostrophe_fix.dpatch
      - copied unchanged from r1781, packages/docbook-xsl/trunk/debian/patches/portable_apostrophe_fix.dpatch
Modified:
    packages/docbook-xsl/branches/experimental/debian/NEWS
    packages/docbook-xsl/branches/experimental/debian/README.Debian
    packages/docbook-xsl/branches/experimental/debian/changelog
    packages/docbook-xsl/branches/experimental/debian/control
    packages/docbook-xsl/branches/experimental/debian/copyright
    packages/docbook-xsl/branches/experimental/debian/docbook-xsl.install
    packages/docbook-xsl/branches/experimental/debian/docbook-xsl.links
    packages/docbook-xsl/branches/experimental/debian/docbook-xsl.postinst
    packages/docbook-xsl/branches/experimental/debian/patches/00list
    packages/docbook-xsl/branches/experimental/debian/patches/00template
    packages/docbook-xsl/branches/experimental/debian/rules
    packages/docbook-xsl/branches/experimental/debian/watch

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=1782&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/NEWS (original)
+++ packages/docbook-xsl/branches/experimental/debian/NEWS Tue Aug 31 19:38:14 2010
@@ -1,3 +1,29 @@
+docbook-xsl (1.75.2+dfsg-2) unstable; urgency=low
+
+  dbtoepub is now shipped in its own package (#525808).
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Thu, 23 Jul 2009 15:34:44 +0200
+
+docbook-xsl (1.74.3+dfsg-1) unstable; urgency=low
+
+  IMPORTANT: The stylesheets have been moved from
+  /usr/share/xml/docbook/stylesheet/nwalsh/ to
+  /usr/share/xml/docbook/stylesheet/docbook-xsl/. The old directory is a
+  symlink to the new location for compatibility reasons. Note, that I plan to
+  drop the old location /usr/share/xml/docbook/stylesheet/nwalsh/ in the
+  future. So plese adjust the path in your scripts, XML documents, ... or
+  better: use the WWW resource URI and the catalog system.
+
+  The patch to support reading the default papersize from /etc/papersize
+  (#173093, #382505) has been dropped, because it creates a failure if the
+  configuration file is not present (#511005). So use a frontend, which
+  supports libpaper or set the paper.type parameter in your stylesheet.
+
+  There is now also a new script `dbtoepub' (PoC, alpha state) to create EPUB
+  output from DocBook books and articles. Send your suggestions.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Fri, 20 Feb 2009 16:11:00 +0100
+
 docbook-xsl (1.73.2.dfsg.1-2) unstable; urgency=low
 
   This release fixes the broken legalnotice and revhistory links in (X)HTML
@@ -68,3 +94,15 @@
 
  -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sat, 24 Feb 2007 01:12:26 +0100
 
+docbook-xsl (1.73.2.dfsg.1-2) unstable; urgency=low
+
+  This release fixes the broken legalnotice and revhistory links in (X)HTML
+  output. It further implements a design change made by upstream - you now
+  MUST set the use.id.as.filename to create legalnotice or revhistory
+  filenames from their ID. Otherwise the stylesheets will fall back to use
+  generate-id() and compute a filename from the return value of this XSLT
+  function. In the past, existing IDs were used, even if use.id.as.filename
+  was not set. Alternatively you can also use the dbhtml filename PI to choose
+  a name for your revhistory or legalnotice chunk(s).
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Wed, 26 Sep 2007 22:34:52 +0200

Modified: packages/docbook-xsl/branches/experimental/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/README.Debian?rev=1782&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/README.Debian (original)
+++ packages/docbook-xsl/branches/experimental/debian/README.Debian Tue Aug 31 19:38:14 2010
@@ -6,7 +6,7 @@
  (3) Catalog Support
  (4) Getting Help
  (5) Debian Hacks
- (6) Reposrting bugs
+ (6) Reporting bugs
 
 
 (1) General 
@@ -30,7 +30,7 @@
   If you know one missing above, just let me know.
 
 Instructions for using these stylesheets with some of these XSLT
-processors can be found in the documentation included in docbook-xsl-doc and
+processors can be found in the documentation included in docbook-xsl-doc* and
 in the packages mentioned above. See also "DocBook XSL: The Complete Guide" by
 Bob Stayton; an online html version is available
 at http://www.sagehill.net/docbookxsl.
@@ -60,7 +60,7 @@
 Or use a "real" local system base path in combination with one of the
 pathnames. For example, for "chunked" HTML, output:
 
-  /usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl
+  /usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunk.xsl
 
 Read more in /usr/share/doc/docbook-xsl/README.
 
@@ -82,10 +82,10 @@
 
   http://www.sagehill.net/docbookxsl/
 
-For parameter reference read the documents shipped with the docbook-xsl-doc
-package
+For parameter reference read the documents shipped with the docbook-xsl-doc*
+packages.
 
-  file:///usr/share/doc/docbook-xsl/doc/index.html
+  file:///usr/share/doc/docbook-xsl/reference.html/index.html
 
 If you still have problems or questions concerning these stylesheets, post a
 message to the docbook-apps mailing list. Response time is surprisingly short.
@@ -108,11 +108,15 @@
 (a) In Debian bugs #173093 and #382505 it has been requested, that the default
     value for the paper.type parameter is set accordingly to the system wide
     setting in /etc/papersize.
+
+    NOTE: The patch has been dropped, because /etc/papersize is a
+          configuration file and might not be present at the users system
+          (#511005). A new solution to the original request is not available
+          atm (but several frontends like xmlto support libpaper already).
     
-    Affects: fo/docbook.xsl (template: root.messages).
-
     http://bugs.debian.org/173093
     http://bugs.debian.org/382505
+    http://bugs.debian.org/511005
 
 
 (6) Reporting bugs
@@ -150,4 +154,4 @@
     me/Debian and you help upstream if you are so kind to report your issue to
     both parties. Check the upstream ChangeLog and you'll see it works.
 
- -- Daniel Leidert <daniel.leidert at wgdd.de>, Sat, 20 May 2006 15:37:11 +0200
+ -- Daniel Leidert <daniel.leidert at wgdd.de>, Updated in March 2009

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=1782&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/changelog (original)
+++ packages/docbook-xsl/branches/experimental/debian/changelog Tue Aug 31 19:38:14 2010
@@ -1,7 +1,124 @@
-docbook-xsl (1.74.0.dfsg.1-1) UNRELEASED; urgency=low
+docbook-xsl (1.75.2+dfsg-6) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-  * New upstream release 1.74.0 (closes: #514030).
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 31 Jan 2010 22:51:42 +0100
+
+docbook-xsl (1.75.2+dfsg-5) unstable; urgency=low
+
+  * debian/patches/514030_debianize_dbtoepub.dpatch: Dropped. This patch leads
+    to inclusion of the docbook-xsl stylesheets and misses to match the
+    elements in a DB5 document (closes: #567859).
+  * debian/patches/00list: Adjusted.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 31 Jan 2010 22:44:03 +0100
+
+docbook-xsl (1.75.2+dfsg-4) unstable; urgency=low
+
+  * debian/patches/8539_554441_xhtml11_fix_ulink_param_target.dpatch: Added.
+    - xhtml-1_1/param.xsl: Empty ulink.target to not create target attribute
+      in anchor element (closes: #554441).
+  * debian/patches/561590_param_local_draft_image.dpatch: Added.
+    - */param.xsl: Use a local path for the draft image (closes: #561590).
+  * debian/patches/562227_xhtml_fix_saxon_ns_leakage.dpatch: Added.
+    - xhtml/html.xsl, xhtml-1_1/html.xsl: Fix leakage of xmlns:saxon namespace
+      in XHTML output (closes: #562227).
+  * debian/patches/8563_562816_german_translation_fix.dpatch: Added.
+    - common/de.xml: Fix an incorrect German translation (closes: #562816).
+  * debian/patches/00list: Adjusted.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Fri, 22 Jan 2010 16:24:15 +0100
+
+docbook-xsl (1.75.2+dfsg-3) unstable; urgency=low
+
+  * debian/patches/514030_debianize_dbtoepub.dpatch: Adjusted.
+    - Removed patchset according to scripts. This is stuff for dbtoepub.
+  * debian/patches/8530_manpages_lists_indentation_fix.dpatch: Added.
+    - manpages/lists.xsl: Fix two indentation issues (closes: #519438,
+      #527309).
+  * debian/patches/portable_apostrophe_fix.dpatch: Added.
+    - manpages/docbook.xsl, manpages/other.xsl: Add some code to portably
+      represent a straight apostrophe (closes: #507673).
+  * debian/patches/00list: Adjusted.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Wed, 04 Nov 2009 01:15:13 +0100
+
+docbook-xsl (1.75.2+dfsg-2) unstable; urgency=low
+
+  * debian/control (Description): Unify short description for docbook-xsl-ns.
+    (Standards-Version): Bumped to 3.8.3.
+    (Recommends): Dropped dbtoepub related dependencies.
+    (Suggests): Added dbtoepub.
+  * debian/copyright: Paths adjusted (s/nwalsh/docbook-xsl).
+  * debian/dbtoepub.1: Dropped.
+  * debian/docbook-xsl.install: Don't install files shipped with dbtoepub.
+  * debian/rules: Minor cleaning. Added rule to validate XML.
+    (binary-indep): Dropped dbtoepub stuff.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Mon, 31 Aug 2009 23:53:37 +0200
+
+docbook-xsl (1.75.2+dfsg-1) unstable; urgency=low
+
+  * New upstream release 1.75.2.
+    - Fixed rendering of copyright in manual pages (closes: #534853).
+    - Fixed rendering of ulink with leading spaces (closes: #519442).
+    - Improved Japanese translations (closes: #517078, #537603).
+    - Fixed Polish alphabet (closes: #534052).
+    - Removed dead link in README (closes: #530942).
+
+  * debian/control (Standards-Version): Bumped to 3.8.2.
+  * debian/README.Debian: Fixed typo (closes: #534849).
+  * debian/patches/514030_debianize_dbtoepub.dpatch: Adjusted.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Thu, 23 Jul 2009 15:19:05 +0200
+
+docbook-xsl (1.75.1+dfsg-1) unstable; urgency=low
+
+  * New upstream release 1.75.1.
+
+  * debian/patches/528004_apply_simpara_content.dpatch: Dropped (applied
+    upstream).
+  * debian/patches/528132_fix_epub_container.dpatch: Ditto.
+  * debian/patches/00list: Adjusted.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sat, 30 May 2009 22:21:40 +0200
+
+docbook-xsl (1.75.0+dfsg-4) unstable; urgency=low
+
+  * debian/patches/528132_fix_epub_container.dpatch: Added.
+    - epub/docbook.xsl: Remove odfc namespace prefix to fix container.xml
+      (closes: #528132).
+  * debian/patches/00list: Adjusted.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Mon, 11 May 2009 13:19:04 +0200
+
+docbook-xsl (1.75.0+dfsg-3) unstable; urgency=low
+
+  * debian/patches/528004_apply_simpara_content.dpatch: Added.
+    - (x)html(-1_1)/lists.html (listitem/simpara): Apply contents of the
+      simpara elements (closes: #528004).
+  * debian/patches/00list: Adjusted.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 10 May 2009 13:46:10 +0200
+
+docbook-xsl (1.75.0+dfsg-2) unstable; urgency=low
+
+  * debian/control (Depends, Recommends): Move dbtoepub related packages from
+    Depends to Recommends (closes: #525808).
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 10 May 2009 05:16:50 +0200
+
+docbook-xsl (1.75.0+dfsg-1) unstable; urgency=low
+
+  * New upstream release 1.75.0.
+
+  * debian/dbtoepub.1: Updated.
+
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sat, 09 May 2009 14:33:57 +0200
+
+docbook-xsl (1.74.3+dfsg-1) unstable; urgency=low
+
+  * New upstream release 1.74.3 (closes: #514030).
     - Ships new and fixed localizations (closes: #492608).
     - Fixed missing brackets for paramdef in HTML output (closes: #500456).
 
@@ -9,7 +126,7 @@
     docbook-xsl-ns needs the same documentation files).
 
   * debian/control: Removed docbook-xsl-doc* binary package fields.
-    (Standards-Version): Bumped to 3.8.0.
+    (Standards-Version): Bumped to 3.8.1.
     (Recommends): Adjusted for doc-packages without .dfsg version part.
     (Vcs-Browser): Fixed.
     (Depends): Added ruby, xsltproc and zip for dbtoepub.
@@ -19,16 +136,28 @@
   * debian/docbook-xsl.dirs: Removed trailing slash.
   * debian/docbook-xsl.install: Include new epub stylesheets and dbtoepub.
     Install everything into /usr/share/xml/docbook/stylesheet/docbook-xsl/.
-  * debian/docbook-xsl.links: Adjusted. Added compatibility symlink.
+  * debian/docbook-xsl.links: Adjusted. Added compatibility symlink. Added
+    docbook-xsl symlink in /usr/share/sgml/docbook/stylesheet/xsl/.
+  * debian/docbook-xsl.postinst: /usr/share/xml/docbook/stylesheet/nwalsh/
+    becomes a symlink - so remove the directory.
   * debian/docbook-xsl.xmlcatalogs: Likewise.
   * debian/docbook-xsl-doc*: Removed docbook-xsl-doc* related debhelper files.
+  * debian/get-orig-source.sh: Added script to replace get-orig-source target
+    in debian/rules.
   * debian/rules (binary-indep): Removed doc-packages related debhelper calls.
     Further exclude .gitignore files. Install the manual page. Fix
     permissions.
-    (get-orig-source): Adjusted for source split. The doc-tarball is not
-    longer necessary.
+    (get-orig-source): Use the new script.
+  * debian/watch: Fixed after changing to dfsg-version without period. Added
+    script support.
+  * debian/README.Debian: Note the removal of patch
+    02_use_global_papersize_conf and its reasons (#173093, #382505, #511005).
+    Further update for the new stylesheet and documentation locations.
+  * debian/README.source: Added to comply to our policy. Further document
+    repackaging.
   * debian/examples/foo.1.example_manpage.xml: Fixed encoding declaration.
-  * debian/patches/7*.dpatch: Removed (applied upstream).
+  * debian/patches/7*.dpatch,
+    debian/patches/8*.dpatch: Removed (applied upstream).
   * debian/patches/02_use_global_papersize_conf.dpatch: Removed (closes:
     #495644). /etc/papersize may not be present on the users system as it is a
     configuration file (closes: #511005).
@@ -37,7 +166,17 @@
       - not lying around in the stylesheet path.
   * debian/patches/00list: Adjusted.
 
- -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 30 Mar 2008 22:08:26 +0200
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sat, 25 Apr 2009 14:52:35 +0200
+
+docbook-xsl (1.73.2.dfsg.1-5) unstable; urgency=low
+
+  * debian/presubj: Fixed a small typo.
+  * debian/patches/02_use_global_papersize_conf.dpatch: Fixed a small typo
+    (closes: #495644).
+  * debian/patches/8162_fo_gentext_for_pubdate.dpatch: Added.
+    - gentext should map to pubdate instead of published (closes: #505790).
+ 
+ -- Daniel Leidert (dale) <daniel.leidert at wgdd.de>  Sun, 16 Nov 2008 15:28:16 +0100
 
 docbook-xsl (1.73.2.dfsg.1-4) unstable; urgency=low
 

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=1782&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/control (original)
+++ packages/docbook-xsl/branches/experimental/debian/control Tue Aug 31 19:38:14 2010
@@ -5,7 +5,7 @@
 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.8.0
+Standards-Version: 3.8.3
 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/
@@ -13,10 +13,10 @@
 
 Package: docbook-xsl
 Architecture: all
-Depends: ${misc:Depends}, ruby, xsltproc, zip
+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
-Description: stylesheets for processing DocBook XML files to various output formats
+Suggests: libsaxon-java, libxalan2-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
  XML, JRefEntry DTD, etc.).

Modified: packages/docbook-xsl/branches/experimental/debian/copyright
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/copyright?rev=1782&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/copyright (original)
+++ packages/docbook-xsl/branches/experimental/debian/copyright Tue Aug 31 19:38:14 2010
@@ -14,7 +14,7 @@
   Copyright (C) 2005-2007 The DocBook Project.
 
   Several files in the
-  /usr/share/xml/docbook/stylesheet/nwalsh/highlighting directory are
+  /usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting directory are
   copyright:
 
   delphi-hl.xml, ini-hl.xml, java-hl.xml, m2-hl.xml, myxml-hl.xml, 
@@ -22,7 +22,7 @@
                  Copyright (C) 2005 Michal Molhanec.
 
   Several JavaScript files in the
-  /usr/share/xml/docbook/stylesheet/nwalsh/slides/browser directory are
+  /usr/share/xml/docbook/stylesheet/docbook-xsl/slides/browser directory are
   copyright:
   
   xbLibrary.js:

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=1782&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/docbook-xsl.install (original)
+++ packages/docbook-xsl/branches/experimental/debian/docbook-xsl.install Tue Aug 31 19:38:14 2010
@@ -17,8 +17,6 @@
 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/
-epub/bin/dbtoepub	usr/bin/
-epub/bin/lib/*		usr/lib/ruby/1.8/dbtoepub/
+epub/*.xsl      usr/share/xml/docbook/stylesheet/docbook-xsl/epub/
 
 debian/presubj  usr/share/bug/docbook-xsl

Modified: packages/docbook-xsl/branches/experimental/debian/docbook-xsl.links
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/docbook-xsl.links?rev=1782&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/docbook-xsl.links (original)
+++ packages/docbook-xsl/branches/experimental/debian/docbook-xsl.links Tue Aug 31 19:38:14 2010
@@ -1,2 +1,3 @@
 usr/share/xml/docbook/stylesheet/docbook-xsl usr/share/xml/docbook/stylesheet/nwalsh
 usr/share/xml/docbook/stylesheet/docbook-xsl usr/share/sgml/docbook/stylesheet/xsl/nwalsh
+usr/share/xml/docbook/stylesheet/docbook-xsl usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl

Modified: packages/docbook-xsl/branches/experimental/debian/docbook-xsl.postinst
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/docbook-xsl.postinst?rev=1782&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/docbook-xsl.postinst (original)
+++ packages/docbook-xsl/branches/experimental/debian/docbook-xsl.postinst Tue Aug 31 19:38:14 2010
@@ -7,8 +7,17 @@
 
 # remove old cruft, just in case
 if [ "$1" = configure ]; then
+
 	# remove the old directory, config files now obsolete
 	rm -rf /etc/sgml/docbook-xsl
+
+	# upgrade will not replace the directory with a symlink
+	# so test for the directory and remove it for 1.74.3
+	if dpkg --compare-versions "$2" lt 1.74.3 && \
+	   [ ! -h /usr/share/xml/docbook/stylesheet/nwalsh -a -d /usr/share/xml/docbook/stylesheet/nwalsh ]; then
+		rm -rf /usr/share/xml/docbook/stylesheet/nwalsh
+		ln -sf docbook-xsl /usr/share/xml/docbook/stylesheet/nwalsh
+	fi
 fi
 
 #DEBHELPER#

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=1782&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/patches/00list (original)
+++ packages/docbook-xsl/branches/experimental/debian/patches/00list Tue Aug 31 19:38:14 2010
@@ -1,1 +1,6 @@
-514030_debianize_dbtoepub
+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/patches/00template
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/patches/00template?rev=1782&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/patches/00template (original)
+++ packages/docbook-xsl/branches/experimental/debian/patches/00template Tue Aug 31 19:38:14 2010
@@ -1,4 +1,6 @@
 #!/bin/sh
+
+#set -ex
 
 get_svn_info()
 {
@@ -6,11 +8,11 @@
 	AUTH=`svn log -r $1 https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/xsl | sed -n -e '2p' | awk -F\| '{print $2}'`
 	# possibly pipe to xml_grep: xml_grep --text_only //msg -
 	LOGX=`svn log -r $1 https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/xsl | sed -e '1,3d' -e '$d'`
-	SFBT=`echo $LOGX | egrep "#[[:digit:]]{7}" | sed -e 's/.*\(#[[:digit:]]\{7\}\).*/\1/g'`
+	SFBT=`echo ${LOGX} | egrep "#[[:digit:]]{7}" | sed -e 's/.*#\([[:digit:]]\{7\}\).*/\1/g'`
 
 	echo "## DP: Upstream fix from revision $1 ($AUTH):"
 
-	echo $LOGX | while read line ; do
+	echo ${LOGX} | while read line ; do
 		echo "## DP:   $line"  
 	done
 
@@ -19,8 +21,8 @@
 ## DP: <URL:http://docbook.svn.sourceforge.net/docbook/?rev=$REVX&view=rev>
 EOF
 
-	if test -n $SFBT; then
-		echo "## DP: <URL:$SFBT>"
+	if [ ! -z $SFBT ]; then
+		echo "## DP: <URL:http://sourceforge.net/search/?type_of_search=artifact&group_id=21935&words=$SFBT>"
 	fi
 
 	cat <<EOF
@@ -38,9 +40,13 @@
 
 REVX=`echo $1 | awk --posix -F_ '$1 ~ /^[[:digit:]]{4}$/ {print $1}'`
 
-if test -n $REVX; then
-	get_svn_info $REVX
+if test -n "${REVX}"; then
+	get_svn_info ${REVX}
 else
-	echo "## DP: "
+	cat <<EOF
+## DP:
+
+ at DPATCH@
+EOF
 fi
 

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=1782&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/rules (original)
+++ packages/docbook-xsl/branches/experimental/debian/rules Tue Aug 31 19:38:14 2010
@@ -23,20 +23,17 @@
 	dh_clean -k
 	dh_installdirs
 
-binary-arch: build install
-binary-indep: build install
+binary-arch: install
+binary-indep: install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs RELEASE-NOTES.txt
-	dh_installdirs
 	dh_installdocs
 	dh_installexamples
 	dh_installxmlcatalogs
-	dh_installman debian/dbtoepub.1
 	# 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
-	chmod 644 $(CURDIR)/debian/$(PACKAGE)/usr/lib/ruby/1.8/dbtoepub/docbook.rb
 	dh_link
 	dh_compress
 	dh_fixperms
@@ -47,23 +44,11 @@
 
 binary: binary-indep binary-arch
 
-# This following code is used to create the .orig.tar.gz tarball.
-# Use it to prepare it for a new release.
-#
-version=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$$/\1/p' )
-uversion=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)\.dfsg.*$$/\1/p' )
+check-xml:
+	xmllint --noout --noent \
+	        --valid $(CURDIR)/debian/examples/foo.1.example_manpage.xml
 
 get-orig-source:
-	set -ex ; \
-	TMPDIR=`mktemp -d docbook-xsl-$(version).orig` ; \
-	wget -P "$$TMPDIR" \
-	    http://downloads.sourceforge.net/docbook/docbook-xsl-$(uversion).tar.bz2 ; \
-	tar --directory="$$TMPDIR" -xjf "$$TMPDIR"/docbook-xsl-$(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 \
-	    $(CURDIR)/docbook-xsl_$(version).orig.tar.gz \
-	    docbook-xsl-$(version).orig ; \
-	rm -rf "$$TMPDIR"
+	uscan --force-download
 
 .PHONY: build clean binary-indep binary-arch binary get-orig-source

Modified: packages/docbook-xsl/branches/experimental/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/branches/experimental/debian/watch?rev=1782&op=diff
==============================================================================
--- packages/docbook-xsl/branches/experimental/debian/watch (original)
+++ packages/docbook-xsl/branches/experimental/debian/watch Tue Aug 31 19:38:14 2010
@@ -6,5 +6,6 @@
 # Because the usual sf.net watch file syntax fails, use the ftp site.
 
 version=3
-opts=dversionmangle=s/\.dfsg\.\d+$// \
- http://sf.net/docbook/docbook-xsl-([\d\.]+)\.tar\.gz
+opts=dversionmangle=s/\+dfsg$// \
+ http://sf.net/docbook/docbook-xsl-([\d\.]+)\.tar\.gz \
+ debian /bin/sh debian/get-orig-source.sh

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