[xml/sgml-commit] r1370 - in /packages/docbook-xsl/trunk/debian: NEWS README.Debian changelog docbook-xsl.links docbook-xsl.postinst
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Sat Mar 14 14:07:53 UTC 2009
Author: dleidert-guest
Date: Sat Mar 14 14:07:52 2009
New Revision: 1370
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1370
Log:
* debian/docbook-xsl.links: 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/NEWS: Updated for stylesheet location change.
* debian/README.Debian: Further update for the new stylesheet and
documentation locations.
Modified:
packages/docbook-xsl/trunk/debian/NEWS
packages/docbook-xsl/trunk/debian/README.Debian
packages/docbook-xsl/trunk/debian/changelog
packages/docbook-xsl/trunk/debian/docbook-xsl.links
packages/docbook-xsl/trunk/debian/docbook-xsl.postinst
Modified: packages/docbook-xsl/trunk/debian/NEWS
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/NEWS?rev=1370&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/NEWS (original)
+++ packages/docbook-xsl/trunk/debian/NEWS Sat Mar 14 14:07:52 2009
@@ -1,4 +1,12 @@
docbook-xsl (1.74.2+dfsg-1) UNRELEASED; 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
Modified: packages/docbook-xsl/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/README.Debian?rev=1370&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/README.Debian (original)
+++ packages/docbook-xsl/trunk/debian/README.Debian Sat Mar 14 14:07:52 2009
@@ -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.
@@ -154,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>, January 2009
+ -- Daniel Leidert <daniel.leidert at wgdd.de>, Updated in March 2009
Modified: packages/docbook-xsl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/changelog?rev=1370&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/changelog (original)
+++ packages/docbook-xsl/trunk/debian/changelog Sat Mar 14 14:07:52 2009
@@ -19,7 +19,10 @@
* 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/rules (binary-indep): Removed doc-packages related debhelper calls.
@@ -31,6 +34,7 @@
* debian/watch: Fixed after changing to dfsg-version without period.
* 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/examples/foo.1.example_manpage.xml: Fixed encoding declaration.
* debian/patches/7*.dpatch,
debian/patches/8*.dpatch: Removed (applied upstream).
Modified: packages/docbook-xsl/trunk/debian/docbook-xsl.links
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/docbook-xsl.links?rev=1370&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/docbook-xsl.links (original)
+++ packages/docbook-xsl/trunk/debian/docbook-xsl.links Sat Mar 14 14:07:52 2009
@@ -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/trunk/debian/docbook-xsl.postinst
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-xsl/trunk/debian/docbook-xsl.postinst?rev=1370&op=diff
==============================================================================
--- packages/docbook-xsl/trunk/debian/docbook-xsl.postinst (original)
+++ packages/docbook-xsl/trunk/debian/docbook-xsl.postinst Sat Mar 14 14:07:52 2009
@@ -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#
More information about the debian-xml-sgml-commit
mailing list