tags 301684 patch
thanks
On Tue, Mar 29, 2005 at 08:05:58PM +0100, Ian Jackson wrote:
> Kurt Roeckx writes ("Bug#301684: userv: FTBFS: debiandoc2ps: unknown option
> `1'"):
> > Your package is failing to build with the following error:
> > sed -e '/<version><\/version>/ s/>/&1.0.3-2/' \
> > spec.sgml.in >spec.sgml.new && mv -f spec.sgml.new spec.sgml
> > debiandoc2ps -1 -O spec.sgml >spec.ps.new && mv spec.ps.new spec.ps
> > debiandoc2ps: unknown option `1'
> > make[1]: *** [spec.ps] Error 2
>
> Ahm.
>
> > The manpage of debiandoc2ps says:
> >
> > -1 Generate 1 page per page (default) for PostScript output.
> > Gen-
> > erate one page for HTML output.
> >
> > So this looks like it this option atleast used to exist. Since
> > it is the default, it's probably easy to just remove the -1.
>
> I would like to do this, but then it doesn't do the right thing with
> older versions of debiandoc2ps where -1 isn't the default. I think
> debiandoc2sgml should continue to support the -1 option for at least
> one release cycle after it's deprecated.
Proposed patch for this:
diff -Naur debiandoc-sgml-1.1.86.bak/debian/changelog
debiandoc-sgml-1.1.86/debian/changelog
--- debiandoc-sgml-1.1.86.bak/debian/changelog 2005-02-21 21:58:22.000000000
+0100
+++ debiandoc-sgml-1.1.86/debian/changelog 2005-04-13 16:05:10.842862489
+0200
@@ -1,3 +1,12 @@
+debiandoc-sgml (1.1.87-0.1) unstable; urgency=high
+
+ * Non-maintainer upload
+ * Readd option -1 to debiandoc2ps to ensure compatibility with
+ older build scripts. Will be removed again after sarge release
+ (Closes: #301684).
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Wed, 13 Apr 2005 16:05:05 +0200
+
debiandoc-sgml (1.1.86) unstable; urgency=low
* Reorganize source to generate all debiandoc2* files from a single
diff -Naur debiandoc-sgml-1.1.86.bak/tools/bin/template
debiandoc-sgml-1.1.86/tools/bin/template
--- debiandoc-sgml-1.1.86.bak/tools/bin/template 2005-02-21
18:29:12.000000000 +0100
+++ debiandoc-sgml-1.1.86/tools/bin/template 2005-04-13 16:13:08.394585026
+0200
@@ -87,6 +87,9 @@
@@@start-info-docbookxml-latexdvi-latexps-latexpdf-active@@@
-v be verbose
@@@end-info-docbookxml-latexdvi-latexps-latexpdf-active@@@
+@@@start-info-docbookxml-latexps-active@@@
+ -1 1 page per page (deprecated, default)
+@@@end-info-docbookxml-latexps-active@@@
END
exit 0;
}
@@ -226,6 +229,9 @@
@@@start-info-docbookxml-latexdvi-latexps-latexpdf-active@@@
options="${options}v"
@@@end-info-docbookxml-latexdvi-latexps-latexpdf-active@@@
+@@@start-info-docbookxml-latexps-active@@@
+options="${options}1"
+@@@end-info-docbookxml-latexps-active@@@
while getopts ${options} opt
do
case ${opt}
@@ -287,6 +293,8 @@
export PAPERSIZE
paperopt="-t ${PAPERSIZE}"
;;
+ 1 ) echo >&2 "${script}: the -1 option is deprecated and will probably
be removed in the future. It is activated by default now."
+ ;;
@@@end-latexps-active@@@
@@@start-info-docbookxml-latexdvi-latexps-latexpdf-active@@@
v ) verbose=true
diff -Naur debiandoc-sgml-1.1.86.bak/tools/man/debiandoc-sgml.1
debiandoc-sgml-1.1.86/tools/man/debiandoc-sgml.1
--- debiandoc-sgml-1.1.86.bak/tools/man/debiandoc-sgml.1 2005-02-21
18:32:57.000000000 +0100
+++ debiandoc-sgml-1.1.86/tools/man/debiandoc-sgml.1 2005-04-13
16:15:36.004664045 +0200
@@ -53,6 +53,7 @@
.I "[-s\ script]"
.I "[-p\ papersize]"
.I "[-v]"
+.I "[-1]"
.I "[shared options]"
.br
.B debiandoc2latexpdf
@@ -343,8 +344,9 @@
Be verbose when invoking secondary processors.
.TP
.BI -1
-Generate 1 page per page (default) for PostScript output. Generate one
-page for HTML output.
+Generate one page for HTML output. Generate 1 page per page (default)
+for PostScript output (as this is the default now the option is
+deprecated and will likely be removed in the future).
.\"
.\" ----------------------------------------------------------------------
.SH "DIAGNOSTICS"
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
