[xml/sgml-commit] r1899 - in /packages/docbook-defguide/trunk: buildtools/ debian/ debian/patches/ debian/source/
dleidert-guest at users.alioth.debian.org
dleidert-guest at users.alioth.debian.org
Wed Nov 23 17:52:22 UTC 2011
Author: dleidert-guest
Date: Wed Nov 23 17:52:21 2011
New Revision: 1899
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=1899
Log:
* buildtools/saxon.sh (DEFAULT_CLASSPATH): Fix catalog resolver jar name
(closes: #642256).
* buildtools/Makefile.incl,
buildtools/saxon.sh: Moved into debian/patches/buildtools.patch.
* debian/compat: Increased dh compatibility level.
* debian/control (Build-Depends): Removed dpatch. Increased dh version.
Fixed debhelper-but-no-misc-depends.
(Standards-Version): Bumped to 3.9.2.
* debian/docbook-defguide.dirs: Added.
* debian/docbook-defguide.docs: Ditto.
* debian/docbook-defguide.install: Ditto.
* debian/rules: Rewritten for dh 7.
* debian/source.lintian-overrides: Dropped.
* debian/source/format: Added for version 3.0 (quilt).
* debian/README.Debian: Moved a comment to debian/README.source.
* debian/README.source: Added with a note from debian/README.Debian.
* debian/patches/01_misc_fixes.dpatch: Transformed to quilt and renamed to
debian/patches/misc_fixes.patch.
* debian/patches/00list: Renamed to debian/patches/series and adjusted.
Added:
packages/docbook-defguide/trunk/debian/README.source
- copied, changed from r1895, packages/docbook-defguide/trunk/debian/README.Debian
packages/docbook-defguide/trunk/debian/docbook-defguide.dirs
packages/docbook-defguide/trunk/debian/docbook-defguide.docs
packages/docbook-defguide/trunk/debian/docbook-defguide.install
packages/docbook-defguide/trunk/debian/patches/buildtools.patch
packages/docbook-defguide/trunk/debian/patches/misc_fixes.patch
- copied, changed from r1895, packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch
packages/docbook-defguide/trunk/debian/patches/series
- copied, changed from r1895, packages/docbook-defguide/trunk/debian/patches/00list
packages/docbook-defguide/trunk/debian/source/
packages/docbook-defguide/trunk/debian/source/format
Removed:
packages/docbook-defguide/trunk/buildtools/
packages/docbook-defguide/trunk/debian/patches/00list
packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch
packages/docbook-defguide/trunk/debian/source.lintian-overrides
Modified:
packages/docbook-defguide/trunk/debian/README.Debian
packages/docbook-defguide/trunk/debian/changelog
packages/docbook-defguide/trunk/debian/compat
packages/docbook-defguide/trunk/debian/control
packages/docbook-defguide/trunk/debian/rules
Modified: packages/docbook-defguide/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/README.Debian?rev=1899&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/README.Debian (original)
+++ packages/docbook-defguide/trunk/debian/README.Debian Wed Nov 23 17:52:21 2011
@@ -19,15 +19,7 @@
to package the translated versions of the book.
-NOTE: For those wanting to "rebuild" the package: Note, that it takes quite
-some time and memory to build [3]. So better do not try this on some old and
-slow piece of hardware. The build works with kaffe, GIJ (which are both slow)
-and Suns Java (fast). You can make your decision in debian/rules, but you will
-probably have to fix Build-Depends too.
-
-
[1] <URL:http://docbook.org/tdg/en/html/docbook-x.html>
[2] <URL:http://docbook.org/tdg5/>
-[3] It takes more than an hour on an 1.8GHz system with 1GB RAM.
-- Daniel Leidert <daniel.leidert at wgdd.de>, somewhere at the end of 2007.
Copied: packages/docbook-defguide/trunk/debian/README.source (from r1895, packages/docbook-defguide/trunk/debian/README.Debian)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/README.source?rev=1899&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/README.Debian (original)
+++ packages/docbook-defguide/trunk/debian/README.source Wed Nov 23 17:52:21 2011
@@ -1,33 +1,12 @@
-DocBook: The Definitive Guide for Debian
-----------------------------------------
+docbook-defguide source for Debian
+----------------------------------
-NOTE: The book starts with html/docbook.html, NOT with html/index.html.
- See also http://bugs.debian.org/135296.
-
-
-Please feel free to report all issues you find, even if this book can be
-considered to be not actively developed anymore - the official DocBook 5
-series are getting nearer.
-
-Feel free to report, if you are interested in the unexpanded [1] version,
-the Chinese or the Russian translation of this version of the book to be
-packaged.
-
-Please do not tell me, that you want me to package "DocBook 5.0: The
-Definitive Guide" [2]. This is already planned. I'm just waiting for the
-official release of DocBook 5.0. But feel free to tell me, if you want me
-to package the translated versions of the book.
-
-
-NOTE: For those wanting to "rebuild" the package: Note, that it takes quite
-some time and memory to build [3]. So better do not try this on some old and
+For those wanting to "rebuild" the package: Note, that it takes quite some
+time and memory to build [1]. So better do not try this on some old and
slow piece of hardware. The build works with kaffe, GIJ (which are both slow)
and Suns Java (fast). You can make your decision in debian/rules, but you will
probably have to fix Build-Depends too.
-
-[1] <URL:http://docbook.org/tdg/en/html/docbook-x.html>
-[2] <URL:http://docbook.org/tdg5/>
-[3] It takes more than an hour on an 1.8GHz system with 1GB RAM.
+[1] It takes more than an hour on an 1.8GHz system with 1GB RAM.
-- 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=1899&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/changelog (original)
+++ packages/docbook-defguide/trunk/debian/changelog Wed Nov 23 17:52:21 2011
@@ -1,6 +1,25 @@
docbook-defguide (2.0.17+svn7549-4) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * buildtools/saxon.sh (DEFAULT_CLASSPATH): Fix catalog resolver jar name
+ (closes: #642256).
+ * buildtools/Makefile.incl,
+ buildtools/saxon.sh: Moved into debian/patches/buildtools.patch.
+ * debian/compat: Increased dh compatibility level.
+ * debian/control (Build-Depends): Removed dpatch. Increased dh version.
+ Fixed debhelper-but-no-misc-depends.
+ (Standards-Version): Bumped to 3.9.2.
+ * debian/docbook-defguide.dirs: Added.
+ * debian/docbook-defguide.docs: Ditto.
+ * debian/docbook-defguide.install: Ditto.
+ * debian/rules: Rewritten for dh 7.
+ * debian/source.lintian-overrides: Dropped.
+ * debian/source/format: Added for version 3.0 (quilt).
+ * debian/README.Debian: Moved a comment to debian/README.source.
+ * debian/README.source: Added with a note from debian/README.Debian.
+ * debian/patches/01_misc_fixes.dpatch: Transformed to quilt and renamed to
+ debian/patches/misc_fixes.patch.
+ * debian/patches/00list: Renamed to debian/patches/series and adjusted.
-- Daniel Leidert (dale) <daniel.leidert at wgdd.de> Thu, 01 May 2008 07:00:42 +0200
Modified: packages/docbook-defguide/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/compat?rev=1899&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/compat (original)
+++ packages/docbook-defguide/trunk/debian/compat Wed Nov 23 17:52:21 2011
@@ -1,1 +1,1 @@
-5
+7
Modified: packages/docbook-defguide/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/control?rev=1899&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/control (original)
+++ packages/docbook-defguide/trunk/debian/control Wed Nov 23 17:52:21 2011
@@ -2,12 +2,12 @@
Section: doc
Priority: optional
Maintainer: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
-Build-Depends: debhelper (>= 5), dpatch
+Build-Depends: debhelper (>> 7.0.50~)
Build-Depends-Indep: docbook-ebnf (>> 1.2~cr1), docbook-xml (>= 4.5),
docbook-xsl, java-gcj-compat [!alpha !arm !hppa !hurd-i386],
docbook-xsl-saxon-gcj, libsaxon-java-gcj (>> 1:6.5), libxerces2-java-gcj,
libxml-commons-resolver1.1-java-gcj, xml-core, xsltproc
-Standards-Version: 3.7.3
+Standards-Version: 3.9.2
Homepage: http://docbook.org/tdg/
Vcs-Browser: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/
Vcs-Svn: svn://svn.debian.org/svn/debian-xml-sgml/packages/docbook-defguide/trunk/
@@ -15,6 +15,7 @@
Package: docbook-defguide
Architecture: all
+Depends: ${misc:Depends}
Suggests: docbook, docbook-xml
Replaces: docbook-book
Provides: docbook-book
Added: packages/docbook-defguide/trunk/debian/docbook-defguide.dirs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/docbook-defguide.dirs?rev=1899&op=file
==============================================================================
--- packages/docbook-defguide/trunk/debian/docbook-defguide.dirs (added)
+++ packages/docbook-defguide/trunk/debian/docbook-defguide.dirs Wed Nov 23 17:52:21 2011
@@ -1,0 +1,1 @@
+usr/share/doc/docbook-defguide/html/figures
Added: packages/docbook-defguide/trunk/debian/docbook-defguide.docs
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/docbook-defguide.docs?rev=1899&op=file
==============================================================================
--- packages/docbook-defguide/trunk/debian/docbook-defguide.docs (added)
+++ packages/docbook-defguide/trunk/debian/docbook-defguide.docs Wed Nov 23 17:52:21 2011
@@ -1,0 +1,1 @@
+defguide/en/README
Added: packages/docbook-defguide/trunk/debian/docbook-defguide.install
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/docbook-defguide.install?rev=1899&op=file
==============================================================================
--- packages/docbook-defguide/trunk/debian/docbook-defguide.install (added)
+++ packages/docbook-defguide/trunk/debian/docbook-defguide.install Wed Nov 23 17:52:21 2011
@@ -1,0 +1,2 @@
+defguide/en/html usr/share/doc/docbook-defguide/
+defguide/en/figures/100dpi/* usr/share/doc/docbook-defguide/html/figures/
Added: packages/docbook-defguide/trunk/debian/patches/buildtools.patch
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/patches/buildtools.patch?rev=1899&op=file
==============================================================================
--- packages/docbook-defguide/trunk/debian/patches/buildtools.patch (added)
+++ packages/docbook-defguide/trunk/debian/patches/buildtools.patch Wed Nov 23 17:52:21 2011
@@ -1,0 +1,65 @@
+Description: Debians own simplified buildsystem
+Author: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Bug-Debian: http://bugs.debian.org/642256
+Origin: Debian
+Forwarded: not-needed
+Last-Update: 2011-11-23
+
+--- /dev/null
++++ docbook-defguide-2.0.17+svn7549/buildtools/saxon.sh
+@@ -0,0 +1,44 @@
++#!/bin/sh
++#
++# Written for the Debian distribution by Daniel Leidert, 2007.
++# Released under GPL v2.
++#
++# This is a small and custom script so we don't need upstreams build
++# environment. Further this shall help to decrease the number of changes we
++# need to make to upstreams build process.
++
++set -e
++
++JAVA=${JAVA:-java}
++
++DEFAULT_CLASSPATH="/usr/share/java/saxon.jar:/usr/share/java/docbook-xsl-saxon.jar:/usr/share/java/xml-resolver.jar:/usr/share/java/xercesImpl.jar:/etc/xml/resolver/"
++
++CLASSPATH=${CLASSPATH:-$DEFAULT_CLASSPATH}
++
++JAVA=${JAVA:-java}
++
++MY_XML=$1
++shift
++MY_XSL=$1
++shift
++MY_OUT=$1
++shift
++
++MY_OPT=$*
++
++$JAVA -cp $CLASSPATH -Xms512M -Xmx1024M \
++ -Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
++ -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
++ com.icl.saxon.StyleSheet \
++ -x org.apache.xml.resolver.tools.ResolvingXMLReader \
++ -y org.apache.xml.resolver.tools.ResolvingXMLReader \
++ -r org.apache.xml.resolver.tools.CatalogResolver \
++ -u \
++ -o $MY_OUT $MY_XML $MY_XSL $MY_OPT \
++ use.extensions=1 \
++ graphicsize.extension=0 \
++ admon.graphics.path=figures/admon/ \
++ callout.graphics.path=figures/callouts/ \
++ chunker.output.indent=yes
++
++exit 0
+--- /dev/null
++++ docbook-defguide-2.0.17+svn7549/buildtools/Makefile.incl
+@@ -0,0 +1,8 @@
++# Written for the Debian distribution by Daniel Leidert, 2007.
++# Released under GPL v2.
++#
++# This is a small and custom Makefile.incl so we don't need upstreams build
++# environment. Further this shall help to decrease the number of changes we
++# need to make to upstreams build process.
++
++XSLT = JAVA="$(JAVA)" CLASSPATH="$(CLASSPATH)" /bin/sh ../../buildtools/saxon.sh
Copied: packages/docbook-defguide/trunk/debian/patches/misc_fixes.patch (from r1895, 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/misc_fixes.patch?rev=1899&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/patches/01_misc_fixes.dpatch (original)
+++ packages/docbook-defguide/trunk/debian/patches/misc_fixes.patch Wed Nov 23 17:52:21 2011
@@ -1,32 +1,29 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_misc_fixes.dpatch by Daniel Leidert <daniel.leidert at wgdd.de>.
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use the generic resources, not local copies shipped with the source:
-## DP:
-## DP: * defguide/en/schema/tdg.dtd: The TDG should be DocBook XML v4.5. Also
-## DP: use the Public ID for DocBook EBNF.
-## DP: * defguide/ru/stylesheets/identity.xsl: Ditto. Do not use a System ID
-## DP: that points to the local copy.
-## DP:
-## DP: * defguide/en/stylesheets/htmlhelp.xsl: Use the online location for the
-## DP: current docbook-xsl distribution. The references directory only
-## DP: exists in SVN and not in our tarball.
-## DP: * defguide/ru/stylesheets/htmlhelp.xsl: Ditto.
-## DP: * defguide/stylesheets/defchunk.xsl: Ditto.
-## DP: * defguide/stylesheets/defguide.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.
+Description: Use the generic resources, not local copies shipped with the source:
+ * defguide/en/schema/tdg.dtd: The TDG should be DocBook XML v4.5. Also
+ use the Public ID for DocBook EBNF.
+ * defguide/ru/stylesheets/identity.xsl: Ditto. Do not use a System ID
+ that points to the local copy.
+ .
+ * defguide/en/stylesheets/htmlhelp.xsl: Use the online location for the
+ current docbook-xsl distribution. The references directory only
+ exists in SVN and not in our tarball.
+ * defguide/ru/stylesheets/htmlhelp.xsl: Ditto.
+ * defguide/stylesheets/defchunk.xsl: Ditto.
+ * defguide/stylesheets/defguide.xsl: Ditto.
+ * defguide/en/Makefile: Ditto.
+ .
+ * defguide/en/stylesheets/chunk.xsl: Fixed pi-template names.
+ * defguide/ru/stylesheets/chunk.xsl: Ditto.
+ * defguide/stylesheets/defchunk.xsl: Ditto.
+ .
+ * defguide/en/stylesheets/html-titlepage.xml: Removed wrong namespace.
+Author: Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+Origin: Debian
+Forwarded: not-needed
+Last-Update: 2011-11-23
- at 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
+--- a/defguide/en/Makefile
++++ b/defguide/en/Makefile
@@ -52,7 +52,7 @@
$(XSLT) $(SOURCE) $(SSCHUNK) /dev/null base.dir=$(BASEDIR) html.ext=$(HTMLEXT) rootid=index
@@ -36,9 +33,8 @@
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 14:47:11.000000000 +0100
+--- a/defguide/en/schema/tdg.dtd
++++ b/defguide/en/schema/tdg.dtd
@@ -1,5 +1,6 @@
-<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+<!ENTITY % docbook PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
@@ -48,9 +44,8 @@
+ "dbebnf.dtd">
%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 14:47:11.000000000 +0100
+--- a/defguide/en/stylesheets/chunk.xsl
++++ b/defguide/en/stylesheets/chunk.xsl
@@ -111,10 +111,10 @@
<!-- returns the filename of a chunk -->
<xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
@@ -64,9 +59,8 @@
</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
+--- a/defguide/en/stylesheets/html-titlepage.xml
++++ b/defguide/en/stylesheets/html-titlepage.xml
@@ -49,7 +49,7 @@
</t:titlepage-content>
@@ -76,9 +70,8 @@
</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 14:47:11.000000000 +0100
+--- a/defguide/en/stylesheets/htmlhelp.xsl
++++ b/defguide/en/stylesheets/htmlhelp.xsl
@@ -11,7 +11,7 @@
******************************************************************** -->
@@ -88,9 +81,8 @@
<xsl:include href="manifest.xsl"/>
<xsl:param name="use.extensions" select="1"/>
-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 14:47:11.000000000 +0100
+--- a/defguide/ru/stylesheets/chunk.xsl
++++ b/defguide/ru/stylesheets/chunk.xsl
@@ -111,10 +111,10 @@
<!-- returns the filename of a chunk -->
<xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
@@ -104,9 +96,8 @@
</xsl:variable>
<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 14:47:11.000000000 +0100
+--- a/defguide/ru/stylesheets/htmlhelp.xsl
++++ b/defguide/ru/stylesheets/htmlhelp.xsl
@@ -11,8 +11,8 @@
******************************************************************** -->
@@ -118,9 +109,8 @@
<xsl:param name="use.extensions" select="1"/>
<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 14:47:11.000000000 +0100
+--- a/defguide/ru/stylesheets/identity.xsl
++++ b/defguide/ru/stylesheets/identity.xsl
@@ -5,7 +5,8 @@
version="1.0">
@@ -131,9 +121,8 @@
<xsl:preserve-space elements="*"/>
-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 14:47:11.000000000 +0100
+--- a/defguide/stylesheets/defchunk.xsl
++++ b/defguide/stylesheets/defchunk.xsl
@@ -12,7 +12,7 @@
to avoid chunking. -->
@@ -156,9 +145,8 @@
</xsl:variable>
<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 14:47:11.000000000 +0100
+--- a/defguide/stylesheets/defguide.xsl
++++ b/defguide/stylesheets/defguide.xsl
@@ -5,7 +5,7 @@
exclude-result-prefixes="scvs xcvs"
version="1.0">
Copied: packages/docbook-defguide/trunk/debian/patches/series (from r1895, packages/docbook-defguide/trunk/debian/patches/00list)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/patches/series?rev=1899&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/patches/00list (original)
+++ packages/docbook-defguide/trunk/debian/patches/series Wed Nov 23 17:52:21 2011
@@ -1,1 +1,2 @@
-01_misc_fixes
+buildtools.patch
+misc_fixes.patch
Modified: packages/docbook-defguide/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/rules?rev=1899&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/rules (original)
+++ packages/docbook-defguide/trunk/debian/rules Wed Nov 23 17:52:21 2011
@@ -1,52 +1,31 @@
#!/usr/bin/make -f
-
-include /usr/share/dpatch/dpatch.make
JAVA = java
BASEDIR = html/
+PACKAGE = docbook-defguide
-build: patch-stamp build-stamp
-build-stamp:
- dh_testdir
+%:
+ dh $@ --parallel
+
+override_dh_auto_configure:
+override_dh_auto_install:
+override_dh_auto_build:
$(MAKE) -C defguide/en tdg.xml all JAVA=$(JAVA) BASEDIR=$(BASEDIR)
- touch build-stamp
-clean: unpatch
- dh_testdir
- dh_testroot
+override_dh_installdirs:
+ dh_installdirs
+ echo "# <URL:http://bugs.debian.org/135296>" > \
+ debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)/html/.htaccess
+ echo "DirectoryIndex docbook.html" >> \
+ debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)/html/.htaccess
+
+override_dh_compress:
+ dh_compress -i -Xusr/share/doc/docbook-defguide/html
+
+override_dh_clean:
$(MAKE) -C defguide/en clean
- (cd defguide/en && rm -f $(BASEDIR)/*.html stylesheets/html-titlepage.xsl bookinfo.xml)
- rm -f build-stamp patch-stamp
+ (cd defguide/en && $(RM) $(BASEDIR)/*.html stylesheets/html-titlepage.xsl bookinfo.xml)
dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs usr/share/doc/docbook-defguide/html/figures
- echo "# <URL:http://bugs.debian.org/135296>" > \
- debian/docbook-defguide/usr/share/doc/docbook-defguide/html/.htaccess
- echo "DirectoryIndex docbook.html" >> \
- debian/docbook-defguide/usr/share/doc/docbook-defguide/html/.htaccess
-
-binary-indep: build install
- 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_compress -i -Xusr/share/doc/docbook-defguide/html
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-binary-arch:
-# Nothing to do here.
-
-binary: binary-indep binary-arch
# TODO: create WhatsNew from svn2cl instead to touch it
# TODO: the Russian TDG needs it
@@ -64,4 +43,4 @@
GZIP=-9 tar -czf $(CURDIR)/docbook-defguide_${version}+svn"$$TDGVERSION".orig.tar.gz "$$TMPDIR" ; \
rm -rf "$$TMPDIR"
-.PHONY: build clean binary-indep binary-arch binary install get-orig-source
+.PHONY: get-orig-source
Added: packages/docbook-defguide/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook-defguide/trunk/debian/source/format?rev=1899&op=file
==============================================================================
--- packages/docbook-defguide/trunk/debian/source/format (added)
+++ packages/docbook-defguide/trunk/debian/source/format Wed Nov 23 17:52:21 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-xml-sgml-commit
mailing list