[xml/sgml-commit] r2031 - in /packages/docbook5-defguide/trunk/debian: patches/buildtools.patch patches/series rules
dleidert at users.alioth.debian.org
dleidert at users.alioth.debian.org
Tue Jun 26 21:51:17 UTC 2012
Author: dleidert
Date: Tue Jun 26 21:51:16 2012
New Revision: 2031
URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2031
Log:
More work on the packaging.
Added:
packages/docbook5-defguide/trunk/debian/patches/buildtools.patch
- copied, changed from r2018, packages/docbook-defguide/trunk/debian/patches/buildtools.patch
packages/docbook5-defguide/trunk/debian/patches/series
- copied, changed from r2017, packages/docbook-defguide/trunk/debian/patches/series
Modified:
packages/docbook5-defguide/trunk/debian/rules
Copied: packages/docbook5-defguide/trunk/debian/patches/buildtools.patch (from r2018, packages/docbook-defguide/trunk/debian/patches/buildtools.patch)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/patches/buildtools.patch?rev=2031&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/patches/buildtools.patch (original)
+++ packages/docbook5-defguide/trunk/debian/patches/buildtools.patch Tue Jun 26 21:51:16 2012
@@ -60,21 +60,120 @@
+# 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
++XSLT?=$(JAVA_HOME)/bin/java -cp $(CLASSPATH)
--- a/en/Makefile
+++ b/en/Makefile
@@ -1,4 +1,4 @@
--include ../../buildtools/Makefile.incl
-+include ../buildtools/Makefile.incl
+-include ../buildtools/Makefile.incl
++include (DOCBOOK_SVN)/buildtools/Makefile.incl
SSTITLEPG=stylesheets/html-titlepage.xsl
SSCHUNK=stylesheets/chunk.xsl
-@@ -79,5 +79,6 @@
- grep -v "<?xml" /tmp/fm-docbook-tdg | freshmeat-submit $(FMGO)
+@@ -34,7 +34,7 @@
+ all: chunks
+
+ test: book.xml
+- jing ../../docbook/relaxng/docbook/docbook.rng $<
++ jing /usr/share/xml/docbook/schema/rng/5.0/docbook.rng $<
+
+ patterns.xml: stylesheets/patterns.xml stylesheets/patterns.xsl
+ $(XSLT) $< stylesheets/patterns.xsl $@
+@@ -57,7 +57,7 @@
+ cp $< $@
+
+ refpages:
+- make -C refpages
++ $(MAKE) -C refpages
+
+ chunks: $(SOURCE) $(SSTITLEPG) book.xml
+ $(XSLT) $(MEMORYOPT) $(SOURCE) $(SSCHUNK) /dev/null base.dir=$(BASEDIR) html.ext=$(HTMLEXT) $(STYLEOPT)
+@@ -71,7 +71,7 @@
+ $(XSLT) $(MEMORYOPT) $(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) $< /usr/share/xml/docbook/stylesheet/docbook-xsl/template/titlepage.xsl $@
+
+ fochunks:
+ $(XSLT) $(MEMORYOPT) $(SOURCE) $(SSFO) partI.fo rootid=docbook-intro $(STYLEOPT)
+@@ -82,16 +82,17 @@
+ $(XSLT) $(MEMORYOPT) $(SOURCE) $(SSFO) $(FORESULT) $(ROOTIDPARAM) $(STYLEOPT)
+
+ %.pdf: %.fo
+- xep $<
++ fop -fo $< -pdf $@
+
+ tdg.fo: tdg.xml
+ $(XSLT) $(MEMORYOPT) $< $(SSFO) $@ $(ROOTIDPARAM) $(STYLEOPT)
+
+ tdg.pdf: tdg.fo
+- xep $< $@
++ fop -fo $< -pdf $@
+
+ clean:
+- rm -f tdg.{html,fo,pdf} tdg.xml tdgex.xml tdg-p.xml
++ $(MAKE) -C refpages clean
++ $(RM) tdg.html tdg.fo tdg.pdf tdg.xml tdgex.xml tdg-p.xml
WhatsNew:
-- svn update
-- /usr/local/svn2cl/svn2cl.sh --group-by-day --output=$@
-+ #svn update
-+ #/usr/local/svn2cl/svn2cl.sh --group-by-day --output=$@
-+ touch $@
+ $(CVS2LOG) -w
+--- a/en/refpages/elements/Makefile
++++ b/en/refpages/elements/Makefile
+@@ -3,10 +3,10 @@
+ SAXON=$(DOCBOOK_SVN)/buildtools/saxon
+
+ all: buildall
+- rm -f build/*.xi
++ $(RM) build/*.xi
+
+ clean:
+- rm -rf build
++ $(RM) -r build
+
+ Makefile:
+ ../../tools/bin/makeelmake > $@
+--- /dev/null
++++ b/buildtools/saxon
+@@ -0,0 +1,42 @@
++#!/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}
++
++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
Copied: packages/docbook5-defguide/trunk/debian/patches/series (from r2017, packages/docbook-defguide/trunk/debian/patches/series)
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/patches/series?rev=2031&op=diff
==============================================================================
--- packages/docbook-defguide/trunk/debian/patches/series (original)
+++ packages/docbook5-defguide/trunk/debian/patches/series Tue Jun 26 21:51:16 2012
@@ -1,2 +1,1 @@
buildtools.patch
-misc_fixes.patch
Modified: packages/docbook5-defguide/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/docbook5-defguide/trunk/debian/rules?rev=2031&op=diff
==============================================================================
--- packages/docbook5-defguide/trunk/debian/rules (original)
+++ packages/docbook5-defguide/trunk/debian/rules Tue Jun 26 21:51:16 2012
@@ -1,18 +1,15 @@
#!/usr/bin/make -f
+#
+#export DH_VERBOSE=1
-export DH_VERBOSE=1
-
+export DOCBOOK_SVN=$(CURDIR)
export JAVA_HOME=/usr/lib/jvm/default-java
export CLASSPATH=/usr/share/java/bsf.jar:/usr/share/java/bsh.jar:/usr/share/java/commons-logging.jar:/usr/share/java/jing.jar:/usr/share/java/saxonb.jar:/usr/share/java/xml-resolver.jar:/etc/xml/resolver/CatalogManager.properties
+PACKAGE = docbook5-defguide
+
%:
- dh $@ --buildsystem ant --parallel
-
-override_dh_auto_build:
- dh_auto_build -- en
-
-override_dh_auto_test:
- dh_auto_test -- validate
+ dh $@ --buildsystem makefile --sourcedirectory=en --parallel
override_dh_installdirs:
dh_installdirs
@@ -21,8 +18,5 @@
echo "DirectoryIndex docbook.html" >> \
debian/$(PACKAGE)/usr/share/doc/$(PACKAGE)/html/.htaccess
-override_dh_clean:
- dh_clean en/refpages/list-elements.xml
-
override_dh_compress:
dh_compress -i -Xusr/share/doc/docbook5-defguide/html
More information about the debian-xml-sgml-commit
mailing list