On Tue, Jan 16, 2007 at 12:05:28AM +0100, Agustin Martin wrote:
> On Sat, Jan 13, 2007 at 12:09:49AM -0800, David Lawyer wrote:
> > Package: linuxdoc-tools
> > Version: 0.9.21-0.5
> >
> > The current package description reads:
> >
> > LDP has always welcomed new documentation either in LinuxDoc or
> > DocBook format although there used to be a few that strongly favored
> > DocBook. Today, that has changed and our new "Howto generator"
> > allows one to interactively create a HOWTO document with the results
> > always in LinuxDoc Format.
>
> I am not the linuxdoc-tools maintainer, but have been doing some
> Non-Maintainer uploads recently. I still have some things pending to try,
> but am waiting until etch is released. After that I will happily take care
> of that if Taketoshi Sano is busy.
I have ready a Non-maintainer upload taking care of this and other problems.
Changelog entry follows and diff is attached
* lib/dist/linuxdoc-tools/html/mapping:
- Make sure <p> starts a new line in html mode, so it
does not mess with title declaration (closes: #182775).
* lib/dist/linuxdoc-tools/latex2e/{,tr-}mapping:
- Removed unneeded newlines from latex2e mapping
(closes: #168482).
- Make sure pdftex is used before setting \pdfcompresslevel.
- Extend babel options selection to other document classes.
* lib/dist/fmt_latex2e.pl:
- Remove spurious '\n' (not real '\\n') after leading "-".
* lib/LinuxDocTools.pm:
- Use -t LIST option to expand command instead of obsolete and
undocumented (but still working) -LIST (closes: #215271).
* debian/control:
- Fix package description, linuxdoc-tools is currently in use
by the LDP. Thanks David Lawyer for his suggestions
(closes: #406708)
- Add missing texlive dependencies and build dependencies and
make texlive preferrable to tetex, to help the texlive
transition.
> > Tag: interface::commandline, role::sw:utility, use::checking,
> > use::converting, works-with::text:docbook, works-with::text:sgml
> ERROR: linuxdoc-tools doesn't work with text:docbook
I am not sure where this tag comes from, but is not from linuxdoc-tools
itself, I will try to have a look.
> > Improvements: I think the above description is too long and should be
> > shortened. Let me know and I'll write you a shorter one. But the
> > most urgent task is to remove the errors I've pointed out.
> I agree with you regarding the extension of the long description, but I
> think that is better to know what current maintainer thinks about that.
I made no further modifications to the description than applying your
changes (thanks again).
Sano, what do you think about shortening the description?
Packages are available from
http://people.debian.org/~agmartin/debian-store/debian-linuxdoc-tools/
and, as mentioned, diff is attached. Unless somebody objects, I will upload
them next week.
I am also tagging as closed with the right version some of the 'fixed by
NMU' tagged bugs.
--
Agustin
diff -Nru /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/debian/changelog /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/debian/changelog
--- /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/debian/changelog 2006-11-16 13:29:03.000000000 +0100
+++ /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/debian/changelog 2007-04-12 12:49:48.000000000 +0200
@@ -1,3 +1,29 @@
+linuxdoc-tools (0.9.21-0.6) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * lib/dist/linuxdoc-tools/html/mapping:
+ - Make sure <p> starts a new line in html mode, so it
+ does not mess with title declaration (closes: #182775).
+ * lib/dist/linuxdoc-tools/latex2e/{,tr-}mapping:
+ - Removed unneeded newlines from latex2e mapping
+ (closes: #168482).
+ - Make sure pdftex is used before setting \pdfcompresslevel.
+ - Extend babel options selection to other document classes.
+ * lib/dist/fmt_latex2e.pl:
+ - Remove spurious '\n' (not real '\\n') after leading "-".
+ * lib/LinuxDocTools.pm:
+ - Use -t LIST option to expand command instead of obsolete and
+ undocumented (but still working) -LIST (closes: #215271).
+ * debian/control:
+ - Fix package description, linuxdoc-tools is currently in use
+ by the LDP. Thanks David Lawyer for his suggestions
+ (closes: #406708)
+ - Add missing texlive dependencies and build dependencies and
+ make texlive preferrable to tetex, to help the texlive
+ transition.
+
+ -- Agustin Martin Domingo <[EMAIL PROTECTED]> Thu, 12 Apr 2007 12:47:10 +0200
+
linuxdoc-tools (0.9.21-0.5) unstable; urgency=low
* Non-maintainer upload.
diff -Nru /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/debian/control /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/debian/control
--- /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/debian/control 2006-11-15 12:46:08.000000000 +0100
+++ /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/debian/control 2007-04-12 12:49:48.000000000 +0200
@@ -3,22 +3,19 @@
Priority: optional
Maintainer: Taketoshi Sano <[EMAIL PROTECTED]>
Standards-Version: 3.5.6
-Build-Depends: sp|opensp, tetex-bin, texinfo, groff (>= 1.15.3.1), tetex-extra, flex, gawk|mawk, perl
+Build-Depends: sp|opensp, texlive-base-bin|tetex-bin, texinfo, groff (>= 1.15.3.1), texlive-latex-recommended|tetex-extra, flex, gawk|mawk, perl
Package: linuxdoc-tools
Architecture: any
Depends: ${shlibs:Depends}, sp|opensp, sgml-data, sgml-base (>= 1.04), gawk|mawk, perl
-Suggests: tetex-base (>= 0.9.990406), tetex-bin, texinfo, info-browser, tetex-extra, groff, linuxdoc-tools-text, linuxdoc-tools-latex, linuxdoc-tools-info
+Suggests: texlive-latex-base|tetex-base (>= 0.9.990406), texlive-base-bin|tetex-bin, texinfo, info-browser, texlive-latex-recommended|tetex-extra, groff, linuxdoc-tools-text, linuxdoc-tools-latex, linuxdoc-tools-info
Provides: linuxdoc-sgml
Conflicts: linuxdoc-sgml, sgml-tools (<= 1.0.9-90)
Replaces: linuxdoc-sgml, sgml-tools, linuxdoc-tools-text (<< 0.9.20), linuxdoc-tools-info (<< 0.9.20), linuxdoc-tools-latex (<< 0.9.20)
Description: SGML converters for the LinuxDoc DTD only.
LinuxDoc is a kind of SGML DTD. It was created for
- the Linux HOWTOs, and had been used officially by
- the Linux Documentation Project (LDP). Now LDP has
- aggressively migrated into the DocBook world, but many
- documents are still available in LinuxDoc DTD sgml.
- So users may still need the tool for LinuxDoc, therefore
+ the Linux HOWTOs, and is being used by the Linux
+ Documentation Project (LDP).
LinuxDoc-Tools was created on the basis of sgml-tools_v1.
.
The main command is linuxdoc, and -B option is provided
@@ -61,7 +58,7 @@
Package: linuxdoc-tools-latex
Architecture: all
-Depends: linuxdoc-tools, tetex-base | texlive-latex-base, tetex-bin | texlive-base-bin, tetex-extra | texlive-latex-recommended
+Depends: linuxdoc-tools, texlive-latex-base|tetex-base, texlive-base-bin|tetex-bin, texlive-latex-recommended|tetex-extra
Conflicts: linuxdoc-tools (<< 0.9.20)
Description: LaTeX/PS/PDF output facility of LinuxDoc-Tools
LinuxDoc-Tools is a SGML converter for the LinuxDoc DTD only.
diff -Nru /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/lib/dist/fmt_latex2e.pl /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/lib/dist/fmt_latex2e.pl
--- /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/lib/dist/fmt_latex2e.pl 2006-05-09 12:32:38.000000000 +0200
+++ /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/lib/dist/fmt_latex2e.pl 2006-11-27 16:05:04.000000000 +0100
@@ -130,15 +130,13 @@
while (<$infile>)
{
- if (/^-/)
- {
- my ($str) = $'; #' Dumy for the colorizer
- chop ($str);
- $_ = parse_data ($str, $char_maps, $latex2e_escape);
- if ($remove_comment)
- {
+ if ( s/^-// ){
+ chomp;
+ s/^\\n/ /; # Remove spurious leading \n (not real \\n)
+ $_ = parse_data ($_, $char_maps, $latex2e_escape);
+ if ($remove_comment){
s/(\s+\\n)+//;
- }
+ }
print $outfile "-" . $_ . "\n";
}
elsif (/^A/)
diff -Nru /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/html/mapping /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/html/mapping
--- /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/html/mapping 2001-09-09 07:59:26.000000000 +0200
+++ /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/html/mapping 2006-11-27 16:05:07.000000000 +0100
@@ -109,7 +109,7 @@
<heading>
</heading> + "<@@endhead>" +
-<p> "<P>"
+<p> + "<P>"
</p> "</P>" +
<itemize> + "<UL>" +
diff -Nru /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/latex2e/mapping /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/latex2e/mapping
--- /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/latex2e/mapping 2006-05-09 12:32:41.000000000 +0200
+++ /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/latex2e/mapping 2006-11-27 16:05:09.000000000 +0100
@@ -14,7 +14,7 @@
"[EMAIL PROTECTED]@\]{inputenc}\n"
"\\usepackage\[T1\]{fontenc}\n"
"\\usepackage\[colorlinks=true,urlcolor=blue,linkcolor=blue\]{hyperref}\n"
- "\\pdfcompresslevel=9\n"
+ "\\ifpdf\\pdfcompresslevel=9\\fi\n"
"[EMAIL PROTECTED]@\]{babel}\n"
"\\usepackage{epsfig}\n"
"\\usepackage{[OPTS]}\n"
@@ -32,8 +32,8 @@
"[EMAIL PROTECTED]@\]{inputenc}\n"
"\\usepackage\[T1\]{fontenc}\n"
"\\usepackage\[colorlinks=true,urlcolor=blue,linkcolor=blue\]{hyperref}\n"
- "\\pdfcompresslevel=9\n"
- "\\usepackage\[english\]{babel}\n"
+ "\\ifpdf\\pdfcompresslevel=9\\fi\n"
+ "[EMAIL PROTECTED]@\]{babel}\n"
"\\usepackage{epsfig}\n"
"\\usepackage{[OPTS]}\n"
"\\def\\addbibtoc{\n"
@@ -51,8 +51,8 @@
"[EMAIL PROTECTED]@\]{inputenc}\n"
"\\usepackage\[T1\]{fontenc}\n"
"\\usepackage\[colorlinks=true,urlcolor=blue,linkcolor=blue\]{hyperref}\n"
- "\\pdfcompresslevel=9\n"
- "\\usepackage\[english\]{babel}\n"
+ "\\ifpdf\\pdfcompresslevel=9\\fi\n"
+ "[EMAIL PROTECTED]@\]{babel}\n"
"\\usepackage{epsfig}\n"
"\\usepackage{[OPTS]}\n"
"\\def\\addbibtoc{\n"
@@ -71,8 +71,8 @@
"[EMAIL PROTECTED]@\]{inputenc}\n"
"\\usepackage\[T1\]{fontenc}\n"
"\\usepackage\[colorlinks=true,urlcolor=blue,linkcolor=blue\]{hyperref}\n"
- "\\pdfcompresslevel=9\n"
- "\\usepackage\[english\]{babel}\n"
+ "\\ifpdf\\pdfcompresslevel=9\\fi\n"
+ "[EMAIL PROTECTED]@\]{babel}\n"
"\\usepackage{epsfig}\n"
"\\usepackage{[OPTS]}\n"
"\\def\\title#1{\n"
@@ -277,11 +277,11 @@
% <htmlurl> "\\onlynameurl{[NAME]}"
% <htmlurl> "\\href{[URL]}{[NAME]}"
-<htmlurl> + "\\ifpdf\n"
- "\\href{[URL]}{[NAME]}\n"
+<htmlurl> "\\ifpdf\n"
+ "\\href{[URL]}{[NAME]}%\n"
"\\else\n"
- "\\onlynameurl{[NAME]}\n"
- "\\fi\n" +
+ "\\onlynameurl{[NAME]}%\n"
+ "\\fi{}\n"
</htmlurl>
<x>
diff -Nru /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/latex2e/tr-mapping /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/latex2e/tr-mapping
--- /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/latex2e/tr-mapping 2006-05-09 12:32:41.000000000 +0200
+++ /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/lib/dist/linuxdoc-tools/latex2e/tr-mapping 2006-11-27 16:05:09.000000000 +0100
@@ -14,7 +14,7 @@
"[EMAIL PROTECTED]@\]{inputenc}\n"
"\\usepackage\[T1\]{fontenc}\n"
"\\usepackage\[colorlinks=true,urlcolor=blue,linkcolor=blue\]{hyperref}\n"
- "\\pdfcompresslevel=9\n"
+ "\\ifpdf\\pdfcompresslevel=9\\fi\n"
"[EMAIL PROTECTED]@\]{babel}\n"
"\\usepackage{epsfig}\n"
"\\usepackage{[OPTS]}\n"
@@ -32,8 +32,8 @@
"[EMAIL PROTECTED]@\]{inputenc}\n"
"\\usepackage\[T1\]{fontenc}\n"
"\\usepackage\[colorlinks=true,urlcolor=blue,linkcolor=blue\]{hyperref}\n"
- "\\pdfcompresslevel=9\n"
- "\\usepackage\[english\]{babel}\n"
+ "\\ifpdf\\pdfcompresslevel=9\\fi\n"
+ "[EMAIL PROTECTED]@\]{babel}\n"
"\\usepackage{epsfig}\n"
"\\usepackage{[OPTS]}\n"
"\\def\\addbibtoc{\n"
@@ -51,8 +51,8 @@
"[EMAIL PROTECTED]@\]{inputenc}\n"
"\\usepackage\[T1\]{fontenc}\n"
"\\usepackage\[colorlinks=true,urlcolor=blue,linkcolor=blue\]{hyperref}\n"
- "\\pdfcompresslevel=9\n"
- "\\usepackage\[english\]{babel}\n"
+ "\\ifpdf\\pdfcompresslevel=9\\fi\n"
+ "[EMAIL PROTECTED]@\]{babel}\n"
"\\usepackage{epsfig}\n"
"\\usepackage{[OPTS]}\n"
"\\def\\addbibtoc{\n"
@@ -71,8 +71,8 @@
"[EMAIL PROTECTED]@\]{inputenc}\n"
"\\usepackage\[T1\]{fontenc}\n"
"\\usepackage\[colorlinks=true,urlcolor=blue,linkcolor=blue\]{hyperref}\n"
- "\\pdfcompresslevel=9\n"
- "\\usepackage\[english\]{babel}\n"
+ "\\ifpdf\\pdfcompresslevel=9\\fi\n"
+ "[EMAIL PROTECTED]@\]{babel}\n"
"\\usepackage{epsfig}\n"
"\\usepackage{[OPTS]}\n"
"\\def\\title#1{\n"
@@ -283,11 +283,11 @@
% <htmlurl> "\\onlynameurl{[NAME]}"
% <htmlurl> "\\href{[URL]}{[NAME]}"
-<htmlurl> + "\\ifpdf\n"
- "\\href{[URL]}{[NAME]}\n"
+<htmlurl> "\\ifpdf\n"
+ "\\href{[URL]}{[NAME]}%\n"
"\\else\n"
- "\\onlynameurl{[NAME]}\n"
- "\\fi\n" +
+ "\\onlynameurl{[NAME]}%\n"
+ "\\fi{}\n"
</htmlurl>
<x>
diff -Nru /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/lib/LinuxDocTools.pm /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/lib/LinuxDocTools.pm
--- /tmp/unOyJvtMwJ/linuxdoc-tools-0.9.21/lib/LinuxDocTools.pm 2006-11-15 12:46:11.000000000 +0100
+++ /tmp/Hcak5ZXw9u/linuxdoc-tools-0.9.21/lib/LinuxDocTools.pm 2006-11-27 16:05:02.000000000 +0100
@@ -609,7 +609,7 @@
create_temp("$tmpbase.3");
{
my $mycommand = "$main::progs->{SGMLSASP} $style $mapping <\"$tmpbase.2\" |
- expand -$global->{tabsize} >\"$tmpbase.3\"";
+ expand -t $global->{tabsize} >\"$tmpbase.3\"";
system ($mycommand) == 0
or die "Error running $mycommand\n";
}
