alcovebook-sgml (0.1.2dfsg-8) direct (non packaging) changes

Summary

 Makefile                                      |   23 +++++++++++++++++------
 bin/alcovedoc2alcovebook                      |    2 +-
 doc/Makefile                                  |    4 ++--
 errors                                        |    3 +++
 stylesheet/dsssl/docbook/print/extensions.dsl |    2 +-
 5 files changed, 24 insertions(+), 10 deletions(-)

    
download this patch

Patch contents

--- alcovebook-sgml-0.1.2dfsg.orig/bin/alcovedoc2alcovebook
+++ alcovebook-sgml-0.1.2dfsg/bin/alcovedoc2alcovebook
@@ -24,7 +24,7 @@
 then
     SPECFILE=$(dirname "$0")/../ad2ab-spec.pl
 else
-    SPECFILE=/usr/lib/perl5/sgmlspl-specs/ad2ab-spec.pl
+    SPECFILE=/usr/share/perl5/sgmlspl-specs/ad2ab-spec.pl
 fi
 
 while [ $# -gt 0 ]
--- alcovebook-sgml-0.1.2dfsg.orig/doc/Makefile
+++ alcovebook-sgml-0.1.2dfsg/doc/Makefile
@@ -1,10 +1,10 @@
-FILENAME=alcovebook-intro
+FILENAME=
 
 STYLE=bookarticle
 
 AB2XFLAGS = --catalog $(shell pwd)/../catalog --confdirs /etc/sgml/sgml2x --confdirs ../sgml2x-aliases
 
-all: html pdf
+all: #html pdf
 
 html: $(FILENAME).en-html $(FILENAME).fr-html
 
--- alcovebook-sgml-0.1.2dfsg.orig/Makefile
+++ alcovebook-sgml-0.1.2dfsg/Makefile
@@ -1,5 +1,8 @@
 JADE = jade
 
+# workaround perlsgml not 
+export P_SGML_PATH=/etc/sgml:/usr/share/sgml:.
+
 SGML2X=/usr/bin/sgml2x
 
 DTD = dtd/v0.1/alcovebook.dtd
@@ -27,7 +30,8 @@
 
 SGMLDIR = /usr/share/sgml
 install:
-	install -d -m755 ${DESTDIR}/usr/bin ${DESTDIR}${SGMLDIR}/alcovebook/dtd
+	install -d -m755 ${DESTDIR}/usr/bin ${DESTDIR}${SGMLDIR}/alcovebook/dtd \
+		${DESTDIR}/usr/share/man/man1
   # catalog
 	install -m644 catalog-installable ${DESTDIR}${SGMLDIR}/alcovebook/alcovebook.catalog
   # dtd
@@ -48,6 +52,13 @@
 	for conv in ${CONVERTERS}; do \
 		ln -s sgml2x ${DESTDIR}/usr/bin/$$conv ; \
 	done
+  # manpages
+	cd ${DESTDIR}/usr/share/man/man1/ && { \
+		set -x ; if [ -r sgml2x.1.gz -o -r /usr/share/man/man1/sgml2x.1.gz ]; then GZ=.gz ; else GZ= ; fi ; \
+		for conv in ${CONVERTERS}; do \
+			rm -f $$conv.1$${GZ} ; \
+			ln -s sgml2x.1$${GZ} $$conv.1$${GZ} ; \
+		done; }
 
   # sgml2x conf
 	install -d -m755 ${DESTDIR}/etc/sgml/sgml2x
@@ -56,14 +67,14 @@
 
   # alcovedoc2alcovebook
 	install -m755 bin/alcovedoc2alcovebook ${DESTDIR}/usr/bin/
-	install -d -m755 ${DESTDIR}/usr/lib/perl5/sgmlspl-specs
-	install -m644 ad2ab-spec.pl ${DESTDIR}/usr/lib/perl5/sgmlspl-specs/
+	install -d -m755 ${DESTDIR}/usr/share/perl5/sgmlspl-specs
+	install -m644 ad2ab-spec.pl ${DESTDIR}/usr/share/perl5/sgmlspl-specs/
 
 
   # docs
 	install -d -m755 ${DESTDIR}${DOCDIR}
 	cp -a html ${DESTDIR}${DOCDIR}
-	cp -a doc/*-html doc/*.pdf ${DESTDIR}${DOCDIR}
+#	cp -a doc/*-html doc/*.pdf ${DESTDIR}${DOCDIR}
 	cp -p TODO.txt ${DESTDIR}${DOCDIR}/TODO
 
 checkversion:
@@ -106,13 +117,13 @@
 	mkdir -p db41html
 	dtd2html -outdir db41html -dtdname 'DocBook 4.1' -modelwidth 78 \
 		-ents -tree \
-		/usr/lib/sgml/dtd/docbook-4.1/docbook.dtd
+		/usr/share/sgml/docbook/dtd/4.1/docbook.dtd
 
 db31html:
 	mkdir -p db31html
 	dtd2html -outdir db31html -dtdname 'DocBook 3.1' -modelwidth 78 \
 		-ents -tree \
-		/usr/lib/sgml/dtd/docbook-3.1/docbook.dtd
+		/usr/share/sgml/docbook/dtd/3.1/docbook.dtd
 
 test:
 	nsgmls -sv test-alcovebook.sgml
--- alcovebook-sgml-0.1.2dfsg.orig/stylesheet/dsssl/docbook/print/extensions.dsl
+++ alcovebook-sgml-0.1.2dfsg/stylesheet/dsssl/docbook/print/extensions.dsl
@@ -473,7 +473,7 @@
 ;; Admonitions
 ;;
 
-(define %admon-graphics-path% "/usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/images/")
+(define %admon-graphics-path% "/usr/share/sgml/docbook/stylesheet/dsssl/modular/images/")
 (define admon-graphic-default-extension
   (if use-eps ".eps" ".pdf"))
 
--- alcovebook-sgml-0.1.2dfsg.orig/errors
+++ alcovebook-sgml-0.1.2dfsg/errors
@@ -0,0 +1,3 @@
+openjade-1.4devel:/home/dwitch/work/debian/mine/markup/alcovebook/alcovebook-sgml-0.1.2/doc/../stylesheet/dsssl/docbook/print/extensions.dsl:491:14:E: flow object not accepted by port; only display flow objects accepted
+openjade-1.4devel:/home/dwitch/work/debian/mine/markup/alcovebook/alcovebook-sgml-0.1.2/doc/../stylesheet/dsssl/docbook/print/extensions.dsl:515:4:E: flow object not accepted by port; only display flow objects accepted
+openjade-1.4devel:/home/dwitch/work/debian/mine/markup/alcovebook/alcovebook-sgml-0.1.2/doc/../stylesheet/dsssl/docbook/print/extensions.dsl:490:3:E: flow object not accepted by port; only display flow objects accepted