On Wed, May 10, 2006 at 02:30:15PM +0200, Agustin Martin wrote:
> I am also working on a new NMU to deal with
>
> #185233: linuxdoc-tools: assumes A4 paper
> #187467: linuxdoc-tools: need versioned dependency on sgml-base
> #233919: linuxdoc-tools: sgml2html produces invalid HTML entities,
> like &hyphen ;
> #292994: linuxdoc-tools postinst and prerm are #!/bin/sh scripts
> but use command -v
> #352022: warning: escape sequence treated as plain with gawk
> (but not mawk)
I think it is mostly ready, signed package is available for testing at
http://corbu.aq.upm.es/~agmartin/linux/store/debian-linuxdoc-tools/
and I am attaching 0.3 to 0.4 patch.
It also takes care of a couple of lintian errors/warnings,
E: linuxdoc-tools-info binary:
copyright-should-refer-to-common-license-file-for-gpl
W: linuxdoc-tools binary:
package-installs-nonbinary-perl-in-usr-lib-perl5
usr/lib/perl5/Text/EntityMap.pm
(Moved to /usr/share/perl5)
Cheers,
--
Agustin
diff -Nru /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/debian/changelog
/tmp/RACubwAKOa/linuxdoc-tools-0.9.21/debian/changelog
--- /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/debian/changelog 2006-05-09
18:14:30.000000000 +0200
+++ /tmp/RACubwAKOa/linuxdoc-tools-0.9.21/debian/changelog 2006-05-10
15:33:03.000000000 +0200
@@ -1,3 +1,29 @@
+linuxdoc-tools (0.9.21-0.4) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * entity-map/sdata/ISOnum.2html:
+ - Add translations for some HTML entities that describe
+ ascii characters, which should just be written plain
+ in HTML files. Patch by Adeodato Simó (closes: #233919).
+ * lib/info.awk:
+ - No need to escape braces. This was producing warnings with
+ gawk. Patch by Spiro Trikaliotis (closes: #352022)
+ * debian/{prerm,postinst}:
+ - Use 'which' instead of non-POSIX 'command -v' (closes: #292994)
+ * debian/control:
+ - Make sgml-base dependency be at least on 1.04, where
+ 'update-catalog' was included (closes: #187467)
+ * debian/copyright.dependencies:
+ - Refer to common GPL copyright file
+ * debian/rules:
+ - Make sure non binary perl module is installed in the right
+ location under /usr/share/perl5, not /usr/lib/perl5.
+ * lib/LinuxDocTools.pm:
+ - Check for /etc/papersize presence and set default to letter if
+ appropriate (closes: #185233)
+
+ -- Agustin Martin Domingo <[EMAIL PROTECTED]> Wed, 10 May 2006 15:32:35 +0200
+
linuxdoc-tools (0.9.21-0.3) unstable; urgency=low
* Non-maintainer upload.
diff -Nru /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/debian/control
/tmp/RACubwAKOa/linuxdoc-tools-0.9.21/debian/control
--- /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/debian/control 2002-03-25
14:31:10.000000000 +0100
+++ /tmp/RACubwAKOa/linuxdoc-tools-0.9.21/debian/control 2006-05-10
12:39:35.000000000 +0200
@@ -7,7 +7,7 @@
Package: linuxdoc-tools
Architecture: any
-Depends: ${shlibs:Depends}, sp|opensp, sgml-data, sgml-base, gawk|mawk, perl
+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
Provides: linuxdoc-sgml
Conflicts: linuxdoc-sgml, sgml-tools (<= 1.0.9-90)
diff -Nru /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/debian/copyright.dependencies
/tmp/RACubwAKOa/linuxdoc-tools-0.9.21/debian/copyright.dependencies
--- /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/debian/copyright.dependencies
2002-01-28 18:42:52.000000000 +0100
+++ /tmp/RACubwAKOa/linuxdoc-tools-0.9.21/debian/copyright.dependencies
2006-05-10 13:24:52.000000000 +0200
@@ -13,3 +13,5 @@
The license of this dummy package is either GPL or XFree86, as you like.
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff -Nru /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/debian/postinst
/tmp/RACubwAKOa/linuxdoc-tools-0.9.21/debian/postinst
--- /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/debian/postinst 2006-05-09
13:09:20.000000000 +0200
+++ /tmp/RACubwAKOa/linuxdoc-tools-0.9.21/debian/postinst 2006-05-10
12:31:33.000000000 +0200
@@ -29,7 +29,7 @@
/usr/bin/texhash
fi
- if command -v install-docs >/dev/null 2>&1; then
+ if which install-docs >/dev/null 2>&1; then
install-docs -i /usr/share/doc-base/linuxdoc-tools
fi
diff -Nru /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/debian/prerm
/tmp/RACubwAKOa/linuxdoc-tools-0.9.21/debian/prerm
--- /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/debian/prerm 2006-05-09
13:09:20.000000000 +0200
+++ /tmp/RACubwAKOa/linuxdoc-tools-0.9.21/debian/prerm 2006-05-10
12:31:33.000000000 +0200
@@ -19,7 +19,7 @@
rm -f ${CENTRALCAT} ${CENTRALCAT}.old
fi
- if command -v install-docs >/dev/null 2>&1; then
+ if which install-docs >/dev/null 2>&1; then
install-docs -r linuxdoc-tools
fi
diff -Nru /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/debian/rules
/tmp/RACubwAKOa/linuxdoc-tools-0.9.21/debian/rules
--- /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/debian/rules 2006-05-09
18:07:18.000000000 +0200
+++ /tmp/RACubwAKOa/linuxdoc-tools-0.9.21/debian/rules 2006-05-10
13:24:52.000000000 +0200
@@ -121,6 +121,12 @@
PERL=/usr/bin/perl \
mandir=`pwd`/debian/tmp/usr/share/man \
bindir=`pwd`/debian/tmp/usr/bin install
+
+# Install non binary perl module in the right location
+ ( cd `pwd`/debian/tmp/usr/ && \
+ mkdir -p share/perl5/Text && \
+ mv lib/perl5/Text/*.pm share/perl5/Text && \
+ rmdir lib/perl5/Text lib/perl5/ )
#
# remove sgml2{text,latex,info}
rm -f `pwd`/debian/tmp/usr/bin/sgml2{txt,latex,info}
diff -Nru /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/entity-map/sdata/ISOnum.2html
/tmp/RACubwAKOa/linuxdoc-tools-0.9.21/entity-map/sdata/ISOnum.2html
--- /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/entity-map/sdata/ISOnum.2html
2001-05-24 17:57:40.000000000 +0200
+++ /tmp/RACubwAKOa/linuxdoc-tools-0.9.21/entity-map/sdata/ISOnum.2html
2006-05-10 12:13:45.000000000 +0200
@@ -9,10 +9,10 @@
[sup1 ] ^1
[sup2 ] ^2
[sup3 ] ^3
-[plus ] +
+[plus ] +
[plusmn] ±
[lt ] <
-[equals] =
+[equals] =
[gt ] >
[divide] ÷
[times ] ×
@@ -24,8 +24,8 @@
[num ] #
[percnt] %
[amp ] &
-[ast ] *
-[commat] @
+[ast ] *
+[commat] @
[lsqb ] [
[bsol ] \
[rsqb ] ]
@@ -41,30 +41,30 @@
[sect ] §
[para ] ¶
[middot] ·
-[larr ] ←
+[larr ] <-
[rarr ] ->
-[uarr ] ↑
-[darr ] ↓
+[uarr ] -^
+[darr ] -v
[copy ] ©
[reg ] ®
-[trade ] ™
+[trade ] (TM)
[brvbar] ¦
[not ] ¬
[sung ] ♪
-[excl ] !
+[excl ] !
[iexcl ] ¡
-[quot ] "
-[apos ] '
-[lpar ] (
-[rpar ] )
-[comma ] ,
+[quot ] "
+[apos ] '
+[lpar ] (
+[rpar ] )
+[comma ] ,
[lowbar] _
-[hyphen] ‐
-[period] .
+[hyphen] -
+[period] .
[sol ] /
-[colon ] :
-[semi ] ;
-[quest ] ?
+[colon ] :
+[semi ] ;
+[quest ] ?
[iquest] ¿
[laquo ] «
[raquo ] »
diff -Nru /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/lib/info.awk
/tmp/RACubwAKOa/linuxdoc-tools-0.9.21/lib/info.awk
--- /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/lib/info.awk 2001-05-24
17:57:40.000000000 +0200
+++ /tmp/RACubwAKOa/linuxdoc-tools-0.9.21/lib/info.awk 2006-05-10
12:20:40.000000000 +0200
@@ -28,8 +28,8 @@
function conv(entrytext)
{
gsub( "@[A-Za-z][A-Za-z0-9]*", "", entrytext );
- gsub( "\{", "", entrytext );
- gsub( "\}", "", entrytext );
+ gsub( "{", "", entrytext );
+ gsub( "}", "", entrytext );
gsub( ",", "", entrytext );
gsub( /\./, "-", entrytext );
gsub( ";", "", entrytext );
diff -Nru /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/lib/LinuxDocTools.pm
/tmp/RACubwAKOa/linuxdoc-tools-0.9.21/lib/LinuxDocTools.pm
--- /tmp/bH2bVO5taK/linuxdoc-tools-0.9.21/lib/LinuxDocTools.pm 2001-10-18
15:38:03.000000000 +0200
+++ /tmp/RACubwAKOa/linuxdoc-tools-0.9.21/lib/LinuxDocTools.pm 2006-05-10
14:09:17.000000000 +0200
@@ -121,7 +121,15 @@
$global->{InFiles} = [];
$Formats{$global->{NAME}} = $global; # All formats we know.
$FmtList{$global->{NAME}} = $global; # List of formats for help msgs.
-
+
+ if ( -e "/etc/papersize" ){
+ open (PAPERSIZE,"</etc/papersize") ||
+ die "Count not open \"/etc/papersize\" for reading\n";
+ chomp (my $paper = <PAPERSIZE>);
+ $global->{papersize} = "letter" if ( $paper eq "letter");
+ close PAPERSIZE;
+ }
+
# automatic language detection: disabled by default
# {
# my $lang;
