[xml/sgml-commit] r952 - in /packages/docbook-defguide/trunk: buildtools/saxon.sh debian/TODO debian/changelog debian/control debian/patches/01_misc_fixes.dpatch debian/rules debian/watch

dleidert-guest at users.alioth.debian.org dleidert-guest at users.alioth.debian.org
Sat Dec 15 14:08:44 UTC 2007 

Author: dleidert-guest
Date: Sat Dec 15 14:08:43 2007
New Revision: 952

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=952
Log:
* buildtools/saxon.sh: Added some custom parameters to indent the output and
  determine the image paths.
* debian/control (Build-Depends-Indep): Added missing dependencies (NOT TESTED YET).
* debian/rules: Removed obsolete stuff and fixed the build system (cleanup).
  Make sure, nothing in docbook-defguide/html gets compressed!
  (get-orig-source) Fixed. We need to set LANG to C to not fail on "not well
  balanced chunks" (locale issue).
* debian/patches/01_misc_fixes.dpatch: Adjusted.
  - Added stylesheet location fix to Makefile.
  - Removed the indentation changes.
  - Added a namespace fix.
* debian/watch: Added.

* debian/TODO: Updated.

This is a working package! Now try to fix/check all the items in debian/TODO.


Added:
    packages/docbook-defguide/trunk/debian/watch
Modified:
    packages/docbook-defguide/trunk/buildtools/saxon.sh
    packages/docbook-defguide/trunk/debian/TODO
    packages/docbook-defguide/trunk/debian/changelog
    packages/docbook-defguide/trunk/debian/control
    packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch
    packages/docbook-defguide/trunk/debian/rules

Modified: packages/docbook-defguide/trunk/buildtools/saxon.sh
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/buildtools/saxon.sh?rev=952&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/buildtools/saxon.sh (original)
+++ packages/docbook-defguide/trunk/buildtools/saxon.sh Sat Dec 15 14:08:43 2007
@@ -36,6 +36,9 @@
       -u \
       -o $MY_OUT $MY_XML $MY_XSL $MY_OPT \
       use.extensions=1 \
-      graphicsize.extension=0
+      graphicsize.extension=0 \
+      admon.graphics.path=figures/admon/ \
+      callout.graphics.path=figures/callouts/ \
+      chunker.output.indent=yes
 
 exit 0

Modified: packages/docbook-defguide/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/TODO?rev=952&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/TODO (original)
+++ packages/docbook-defguide/trunk/debian/TODO Sat Dec 15 14:08:43 2007
@@ -1,6 +1,19 @@
-- write a CSS stylesheet
-- investigate the dblib.dsl error
-- address `cannot find "examples/*"' issue
-- catch build errors
+DocBook: The Definitive Guide for Debian
+----------------------------------------
 
-- find out other non-presented pieces of information
+IMPORTANT:
+
+  + build with a JRE in main
+
+NORMAL:
+
+  + create WhatsNew from svn2cl
+  + check for dead links
+  + check for the broken example for a *co
+
+WISHLIST:
+
+  + package expanded/unexpanded separated
+  + package Chinese version
+
+ -- Daniel Leidert <daniel.leidert at wgdd.de>, somewhere at the end of 2007.

Modified: packages/docbook-defguide/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/changelog?rev=952&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/changelog (original)
+++ packages/docbook-defguide/trunk/debian/changelog Sat Dec 15 14:08:43 2007
@@ -21,7 +21,9 @@
   * debian/copyright: Updated. Added information about newly added source
     files (xml2po/entities/docbook-xml/sgml-data).
   * debian/rules: Added get-orig-source target to retreive the source via SVN.
-    Added dpatch infrastructure. Removed obsolete stuff (cleanup).
+    Added dpatch infrastructure. Removed obsolete stuff and fixed the build
+    system (cleanup).
+  * debian/watch: Added (crude, but it should work).
   * debian/patches/01_misc_fixes.dpatch: Added. Fixes to make the package
     build (we are not inside the projects SVN).
   * debian/patches/00list: Added.

Modified: packages/docbook-defguide/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/control?rev=952&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/control (original)
+++ packages/docbook-defguide/trunk/debian/control Sat Dec 15 14:08:43 2007
@@ -3,8 +3,9 @@
 Priority: optional
 Maintainer: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
 Build-Depends: debhelper (>= 5), dpatch
-Build-Depends-Indep: docbook-ebnf (>= 1.2~cr1-5), docbook-xsl,
- libsaxon-java (>> 1:6.5), libxml-commons-resolver1.1-java,
+Build-Depends-Indep: docbook-ebnf (>= 1.2~cr1-5), docbook-xml (>= 4.5),
+ docbook-xsl, docbook-xsl-saxon,
+ libsaxon-java (>> 1:6.5), libxerces2-java, libxml-commons-resolver1.1-java,
  sun-java5-jre, xml-core, xsltproc
 Standards-Version: 3.7.3
 Homepage: http://docbook.org/tdg/

Modified: packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch?rev=952&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch (original)
+++ packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch Sat Dec 15 14:08:43 2007
@@ -15,21 +15,30 @@
 ## DP: * defguide/ru/stylesheets/htmlhelp.xsl: Ditto.
 ## DP: * defguide/stylesheets/defchunk.xsl: Ditto.
 ## DP: * defguide/stylesheets/defguide.xsl: Ditto.
-## DP:
-## DP: * defguide/en/stylesheets/chunk.xsl: Enable output indentation.
-## DP: * defguide/en/stylesheets/identity.xsl: Ditto.
-## DP: * defguide/ru/stylesheets/chunk.xsl: Ditto.
-## DP: * defguide/ru/stylesheets/identity.xsl: Ditto.
-## DP: * defguide/stylesheets/defchunk.xsl: Ditto.
+## DP: * defguide/en/Makefile: Ditto.
 ## DP:
 ## DP: * defguide/en/stylesheets/chunk.xsl: Fixed pi-template names.
 ## DP: * defguide/ru/stylesheets/chunk.xsl: Ditto.
 ## DP: * defguide/stylesheets/defchunk.xsl: Ditto.
+## DP:
+## DP: * defguide/en/stylesheets/html-titlepage.xml: Removed wrong namespace.
 
 @DPATCH@
+diff -urNad trunk~/defguide/en/Makefile trunk/defguide/en/Makefile
+--- trunk~/defguide/en/Makefile	2007-03-01 11:59:20.000000000 +0100
++++ trunk/defguide/en/Makefile	2007-12-15 14:47:11.000000000 +0100
+@@ -52,7 +52,7 @@
+ 	$(XSLT) $(SOURCE) $(SSCHUNK) /dev/null base.dir=$(BASEDIR) html.ext=$(HTMLEXT) rootid=index
+ 
+ stylesheets/html-titlepage.xsl: stylesheets/html-titlepage.xml
+-	$(XSLT) $< ../../xsl/template/titlepage.xsl $@
++	$(XSLT) $< http://docbook.sourceforge.net/release/xsl/current/template/titlepage.xsl $@
+ 
+ fochunks:
+ 	$(XSLT) $(SOURCE) $(SSFO) partI.fo rootid=docbook-intro $(STYLEOPT)
 diff -urNad trunk~/defguide/en/schema/tdg.dtd trunk/defguide/en/schema/tdg.dtd
 --- trunk~/defguide/en/schema/tdg.dtd	2005-04-15 16:26:14.000000000 +0200
-+++ trunk/defguide/en/schema/tdg.dtd	2007-12-15 04:25:47.000000000 +0100
++++ trunk/defguide/en/schema/tdg.dtd	2007-12-15 14:47:11.000000000 +0100
 @@ -1,5 +1,6 @@
 -<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
 +<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
@@ -41,16 +50,7 @@
  %dbebnf;
 diff -urNad trunk~/defguide/en/stylesheets/chunk.xsl trunk/defguide/en/stylesheets/chunk.xsl
 --- trunk~/defguide/en/stylesheets/chunk.xsl	2003-01-01 22:39:36.000000000 +0100
-+++ trunk/defguide/en/stylesheets/chunk.xsl	2007-12-15 04:28:27.000000000 +0100
-@@ -17,7 +17,7 @@
- 
- <xsl:output method="html"
-             encoding="ISO-8859-1"
--            indent="no"/>
-+            indent="yes"/>
- 
- <xsl:param name="html.ext" select="'.html'"/>
- <xsl:param name="root.filename" select="'docbook'"/>
++++ trunk/defguide/en/stylesheets/chunk.xsl	2007-12-15 14:47:11.000000000 +0100
 @@ -111,10 +111,10 @@
    <!-- returns the filename of a chunk -->
    <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
@@ -64,9 +64,21 @@
    </xsl:variable>
  
    <xsl:choose>
+diff -urNad trunk~/defguide/en/stylesheets/html-titlepage.xml trunk/defguide/en/stylesheets/html-titlepage.xml
+--- trunk~/defguide/en/stylesheets/html-titlepage.xml	2004-05-19 20:32:51.000000000 +0200
++++ trunk/defguide/en/stylesheets/html-titlepage.xml	2007-12-15 14:47:20.000000000 +0100
+@@ -49,7 +49,7 @@
+   </t:titlepage-content>
+ 
+   <t:titlepage-separator>
+-    <hr t:class="component-separator"/>
++    <hr class="component-separator"/>
+   </t:titlepage-separator>
+ 
+   <t:titlepage-before t:side="recto">
 diff -urNad trunk~/defguide/en/stylesheets/htmlhelp.xsl trunk/defguide/en/stylesheets/htmlhelp.xsl
 --- trunk~/defguide/en/stylesheets/htmlhelp.xsl	2007-03-20 22:16:16.000000000 +0100
-+++ trunk/defguide/en/stylesheets/htmlhelp.xsl	2007-12-15 04:27:22.000000000 +0100
++++ trunk/defguide/en/stylesheets/htmlhelp.xsl	2007-12-15 14:47:11.000000000 +0100
 @@ -11,7 +11,7 @@
       ******************************************************************** -->
  
@@ -76,30 +88,9 @@
  <xsl:include href="manifest.xsl"/>
  
  <xsl:param name="use.extensions" select="1"/>
-diff -urNad trunk~/defguide/en/stylesheets/identity.xsl trunk/defguide/en/stylesheets/identity.xsl
---- trunk~/defguide/en/stylesheets/identity.xsl	2005-04-15 17:18:32.000000000 +0200
-+++ trunk/defguide/en/stylesheets/identity.xsl	2007-12-15 04:28:51.000000000 +0100
-@@ -4,7 +4,7 @@
-                 exclude-result-prefixes="saxon"
-                 version="1.0">
- 
--  <xsl:output method="xml" indent="no"
-+  <xsl:output method="xml" indent="yes"
-               doctype-system="schema/tdg.dtd"/>
- 
-   <xsl:preserve-space elements="*"/>
 diff -urNad trunk~/defguide/ru/stylesheets/chunk.xsl trunk/defguide/ru/stylesheets/chunk.xsl
 --- trunk~/defguide/ru/stylesheets/chunk.xsl	2004-02-23 15:25:58.000000000 +0100
-+++ trunk/defguide/ru/stylesheets/chunk.xsl	2007-12-15 04:29:05.000000000 +0100
-@@ -17,7 +17,7 @@
- 
- <xsl:output method="html"
-             encoding="ISO-8859-1"
--            indent="no"/>
-+            indent="yes"/>
- 
- <xsl:param name="html.ext" select="'.html'"/>
- <xsl:param name="root.filename" select="'docbook'"/>
++++ trunk/defguide/ru/stylesheets/chunk.xsl	2007-12-15 14:47:11.000000000 +0100
 @@ -111,10 +111,10 @@
    <!-- returns the filename of a chunk -->
    <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
@@ -115,7 +106,7 @@
    <xsl:choose>
 diff -urNad trunk~/defguide/ru/stylesheets/htmlhelp.xsl trunk/defguide/ru/stylesheets/htmlhelp.xsl
 --- trunk~/defguide/ru/stylesheets/htmlhelp.xsl	2004-02-23 15:25:58.000000000 +0100
-+++ trunk/defguide/ru/stylesheets/htmlhelp.xsl	2007-12-15 04:27:42.000000000 +0100
++++ trunk/defguide/ru/stylesheets/htmlhelp.xsl	2007-12-15 14:47:11.000000000 +0100
 @@ -11,8 +11,8 @@
       ******************************************************************** -->
  
@@ -129,14 +120,12 @@
  <xsl:param name="base.dir" select="'htmlhelp/'"/>
 diff -urNad trunk~/defguide/ru/stylesheets/identity.xsl trunk/defguide/ru/stylesheets/identity.xsl
 --- trunk~/defguide/ru/stylesheets/identity.xsl	2004-02-23 15:25:58.000000000 +0100
-+++ trunk/defguide/ru/stylesheets/identity.xsl	2007-12-15 04:29:16.000000000 +0100
-@@ -4,8 +4,9 @@
-                 exclude-result-prefixes="saxon"
++++ trunk/defguide/ru/stylesheets/identity.xsl	2007-12-15 14:47:11.000000000 +0100
+@@ -5,7 +5,8 @@
                  version="1.0">
  
--  <xsl:output method="xml" indent="no"
+   <xsl:output method="xml" indent="no"
 -              doctype-system="../../docbook/ebnf/dbebnf.dtd"/>
-+  <xsl:output method="xml" indent="yes"
 +              doctype-public="-//OASIS//DTD DocBook EBNF Module V1.2CR1//EN"
 +              doctype-system="http://www.oasis-open.org/docbook/xml/ebnf/1.2CR1/dbebnf.dtd"/>
  
@@ -144,8 +133,8 @@
  
 diff -urNad trunk~/defguide/stylesheets/defchunk.xsl trunk/defguide/stylesheets/defchunk.xsl
 --- trunk~/defguide/stylesheets/defchunk.xsl	2001-08-03 13:56:41.000000000 +0200
-+++ trunk/defguide/stylesheets/defchunk.xsl	2007-12-15 04:29:28.000000000 +0100
-@@ -12,11 +12,11 @@
++++ trunk/defguide/stylesheets/defchunk.xsl	2007-12-15 14:47:11.000000000 +0100
+@@ -12,7 +12,7 @@
       to avoid chunking. -->
  
  <xsl:import href="defguide.xsl"/>
@@ -154,11 +143,6 @@
  
  <xsl:output method="html"
              encoding="ISO-8859-1"
--            indent="no"/>
-+            indent="yes"/>
- 
- <!-- ==================================================================== -->
- 
 @@ -118,10 +118,10 @@
    <!-- returns the filename of a chunk -->
    <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
@@ -174,7 +158,7 @@
    <xsl:choose>
 diff -urNad trunk~/defguide/stylesheets/defguide.xsl trunk/defguide/stylesheets/defguide.xsl
 --- trunk~/defguide/stylesheets/defguide.xsl	2001-08-03 15:28:54.000000000 +0200
-+++ trunk/defguide/stylesheets/defguide.xsl	2007-12-15 04:28:11.000000000 +0100
++++ trunk/defguide/stylesheets/defguide.xsl	2007-12-15 14:47:11.000000000 +0100
 @@ -5,7 +5,7 @@
                  exclude-result-prefixes="scvs xcvs"
                  version="1.0">

Modified: packages/docbook-defguide/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/rules?rev=952&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/rules (original)
+++ packages/docbook-defguide/trunk/debian/rules Sat Dec 15 14:08:43 2007
@@ -2,17 +2,20 @@
 
 include /usr/share/dpatch/dpatch.make
 
+JAVA    = /usr/lib/jvm/java-1.5.0-sun/jre/bin/java
+BASEDIR = html/
+
 build: patch-stamp build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE) -C defguide/en tdg.xml
-	$(MAKE) -C defguide/en JAVA=/usr/lib/jvm/java-1.5.0-sun/jre/bin/java BASEDIR=html/
+	$(MAKE) -C defguide/en tdg.xml all JAVA=$(JAVA) BASEDIR=$(BASEDIR)
 	touch build-stamp
 
 clean: unpatch
 	dh_testdir
 	dh_testroot
 	$(MAKE) -C defguide/en clean
+	(cd defguide/en && rm -f $(BASEDIR)/*.html stylesheets/html-titlepage.xsl)
 	rm -f build-stamp patch-stamp
 	dh_clean
 
@@ -26,9 +29,10 @@
 	dh_testdir -i
 	dh_testroot -i
 	dh_installchangelogs -i
+	dh_install -i defguide/en/$(BASEDIR) usr/share/doc/docbook-defguide/
+	dh_install -i defguide/en/figures/100dpi/* usr/share/doc/docbook-defguide/html/figures/
 	dh_installdocs -i defguide/en/README
-#	dh_installinfo -i
-	dh_compress -i -Xdocbook-defguide/html/changelog.html
+	dh_compress -i -Xusr/share/doc/docbook-defguide/html
 	dh_fixperms -i
 	dh_installdeb -i
 	dh_gencontrol -i
@@ -47,10 +51,12 @@
 
 get-orig-source:
 	set -ex ; \
-	TDGVERSION=`LANG=C svn info https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/defguide | sed -n -e 's/^Last Changed Rev: //p'` ; \
+	export LANG=C ; \
+	TDGVERSION=`svn info https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/defguide | sed -n -e 's/^Last Changed Rev: //p'` ; \
 	TMPDIR=`mktemp -d docbook-defguide-$(version)+svn"$$TDGVERSION".orig` ; \
 	svn export https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/defguide "$$TMPDIR"/defguide ; \
 	find "$$TMPDIR" -name .cvsignore -delete ; \
+	echo "TODO: create WhatsNew from svn2cl instead to touch it" > "$$TMPDIR"/defguide/en/WhatsNew ; \
 	GZIP=-9 tar -czf $(CURDIR)/docbook-defguide_${version}+svn"$$TDGVERSION".orig.tar.gz "$$TMPDIR" ; \
 	rm -rf "$$TMPDIR"
 

Added: packages/docbook-defguide/trunk/debian/watch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/watch?rev=952&op=file
==============================================================================
--- packages/docbook-defguide/trunk/debian/watch (added)
+++ packages/docbook-defguide/trunk/debian/watch Sat Dec 15 14:08:43 2007
@@ -1,0 +1,7 @@
+# See uscan(1) for format
+#
+# NOTE: You need to call the get-orig-source target in debian/rules.
+# NOTE: uupdate will *NOT* work, because we need to get the source from SVN.
+
+version=3
+http://docbook.org/tdg/ en/tdg-en-html-([\d\.]+).zip

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