--- 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/debian/alcovebook-sgml.files +++ alcovebook-sgml-0.1.2dfsg/debian/alcovebook-sgml.files @@ -1,4 +1,5 @@ usr/bin usr/share/sgml -usr/lib/perl5 +usr/share/man +usr/share/perl5 etc/sgml --- alcovebook-sgml-0.1.2dfsg.orig/debian/changelog +++ alcovebook-sgml-0.1.2dfsg/debian/changelog @@ -1,3 +1,68 @@ +alcovebook-sgml (0.1.2dfsg-8) unstable; urgency=low + + * Removed OPL/GFDL-licenced documentation from upstream tarball (Closes: + #321770, #321771). + * Removed matching doc-base files. + * Updated extended description to reflect the removal of the intro + documents. + * Removed doc-specific copyright file, promoted + alcovebook-sgml.copyright to be debian/copyright. + * Updated FSF address in debian/copyright (lintian). + * Moved debhelper from Buil-depends-indep to Build-depends (lintian). + + -- Yann Dirson Wed, 13 Sep 2006 00:06:58 +0200 + +alcovebook-sgml (0.1.2-7) unstable; urgency=low + + * Added build-depend on gtk-doc-tools, since it was the stylesheet used + on my box to get the .html suffix (Closes: #280455). + + -- Yann Dirson Mon, 22 Nov 2004 22:21:15 +0100 + +alcovebook-sgml (0.1.2-6) unstable; urgency=low + + * Added openjade1.3 to Depends and Build-Depends to workaround #229154, + so that we can downgrade it to normal. + * Moved the sgmlspl specfile for alcovedoc2alcovebook into /usr/share/. + * Made stylesheets refer to other files through /usr/share, not relying + on compat symlinks in /usr/lib. + * Updated location of docbook DTDs in Makefile for dtd2html calls. + * Workaround perlsgml not being updated yet by setting P_SGML_PATH + before calling dtd2html. + + -- Yann Dirson Sat, 7 Aug 2004 15:37:33 +0200 + +alcovebook-sgml (0.1.2-5) unstable; urgency=low + + * Fixed heuristic and code for creation of symlinks to gzipped manpages + (Closes: #220711). + + -- Yann Dirson Fri, 14 Nov 2003 11:25:56 +0100 + +alcovebook-sgml (0.1.2-4) unstable; urgency=low + + * Install symlinks to sgml2x.1 (Closes: #134251). + + -- Yann Dirson Sat, 1 Nov 2003 22:03:57 +0100 + +alcovebook-sgml (0.1.2-3) unstable; urgency=low + + * Woops, forgot to declare the catalog :( + + -- Yann Dirson Thu, 18 Sep 2003 00:40:02 +0200 + +alcovebook-sgml (0.1.2-2) unstable; urgency=low + + * Use dh_installcatalogs (Closes: #205630, #186771). + + -- Yann Dirson Tue, 2 Sep 2003 17:14:00 +0200 + +alcovebook-sgml (0.1.2-1) unstable; urgency=low + + * Official package, no change. + + -- Yann Dirson Tue, 11 Jun 2002 20:17:23 +0200 + alcovebook-sgml (0.1.2-0.0upstream) unstable; urgency=low * Work in progress. --- alcovebook-sgml-0.1.2dfsg.orig/debian/control +++ alcovebook-sgml-0.1.2dfsg/debian/control @@ -2,12 +2,13 @@ Section: text Priority: optional Maintainer: Yann Dirson -Build-Depends-Indep: docbook, docbook-dsssl | docbook-stylesheets (>= 1.72-0potato2), jade, sgml2x (>= 0.99.6-1), lynx, perlsgml, debhelper (>> 4) +Build-Depends-Indep: docbook, docbook-dsssl | docbook-stylesheets (>= 1.72-0potato2), gtk-doc-tools, jade, openjade1.3, sgml2x (>= 0.99.6-1), lynx, perlsgml +Build-Depends: debhelper (>> 4) Standards-Version: 3.1.1 Package: alcovebook-sgml Architecture: all -Depends: sgml-base, docbook, docbook-dsssl | docbook-stylesheets (>= 1.72-0potato2), opensp, jade, libsgmls-perl, sgmlspl, sgml2x (>= 0.99.6-1) +Depends: sgml-base, docbook, docbook-dsssl | docbook-stylesheets (>= 1.72-0potato2), opensp, jade, openjade1.3, libsgmls-perl, sgmlspl, sgml2x (>= 0.99.6-1) Suggests: openjade1.3 | openjade Description: Alcove customisation of the DocBook DTD and stylesheets This includes the AlcoveBook DTD (generic, still to be refined into several @@ -22,7 +23,5 @@ Architecture: all Suggests: doc-base Description: Documentation for the AlcoveBook DTD - This package contains: - - the dtd2html-generated documentation for AlcoveBook, for use as a - reference manual - - an AlcoveBook/DocBook tutorial, in English and in French + This package contains the dtd2html-generated documentation for + AlcoveBook, for use as a reference manual. --- alcovebook-sgml-0.1.2dfsg.orig/debian/postinst +++ alcovebook-sgml-0.1.2dfsg/debian/postinst @@ -2,7 +2,4 @@ set -e -install-sgmlcatalog --install /usr/share/sgml/alcovebook/alcovebook.catalog \ - alcovebook-sgml - #DEBHELPER# --- alcovebook-sgml-0.1.2dfsg.orig/debian/prerm +++ alcovebook-sgml-0.1.2dfsg/debian/prerm @@ -2,6 +2,4 @@ set -e -install-sgmlcatalog --remove alcovebook-sgml - #DEBHELPER# --- alcovebook-sgml-0.1.2dfsg.orig/debian/rules +++ alcovebook-sgml-0.1.2dfsg/debian/rules @@ -43,6 +43,7 @@ dh_installexamples `find examples/ -maxdepth 1 -type f ! -name Makefile` cd debian/alcovebook-sgml/usr/share/doc/*/examples && mv sample.dsl local.dsl dh_installchangelogs + dh_installcatalogs dh_compress dh_fixperms dh_installdeb --- alcovebook-sgml-0.1.2dfsg.orig/debian/copyright +++ alcovebook-sgml-0.1.2dfsg/debian/copyright @@ -0,0 +1,21 @@ +This package was debianized by Yann Dirson + +Upstream Author: Alcove + Yann Dirson + +Copyright: + +This is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation, version 2. + +This is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License with +your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or +with the dpkg source package as the file COPYING. If not, write to +the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +Boston, MA 02110-1301, USA. --- alcovebook-sgml-0.1.2dfsg.orig/debian/sgmlcatalogs +++ alcovebook-sgml-0.1.2dfsg/debian/sgmlcatalogs @@ -0,0 +1 @@ +catalog-installable /usr/share/sgml/alcovebook/alcovebook.catalog --- 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