Update polish translation, add manpage for cleanup-info, update

dpkg-scansources to handle trailing blanks.

7 files changed, 67 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 864b302a7..42b9a5674 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Dec  5 18:09:36 CET 1999 Wichert Akkerman <wakkerma@debian.org>
+
+  * Add manpages from Josip Rodin <joy@cibalia.gkvk.hr> for
+    cleanup-info
+  * New dpkg-scansources from Roderick to allow trailing blanks on lines
+  * Correct generation of manual-version
+
 Sat Dec  4 04:22:49 CET 1999 Wichert Akkerman <wakkerma@debian.org>
 
   * Update the polish translation
diff --git a/debian/changelog b/debian/changelog
index 47f509c06..178d2a231 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 dpkg (1.6.2) unstable; urgency=low
 
-  * Fix default lispdir, Closes: #51525
+  * New dpkg-scansources, Closes: #51888
+  * Fix default for elispdir, Closes: #51919,51525
+  * New manpages for cleanup-info and dpkg-divert, Closes: #51539, 46657
+  * Buildsystem updates, Closes: #51525, 51855, 51914
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 
diff --git a/debian/rules b/debian/rules
index 42e97dd02..f45891436 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,6 +103,7 @@ binary-dpkg: stamp-binary
 
 	install -p -m 644 -o root -g root debian/changelog \
 		$(TMP_DPKG)/usr/share/doc/dpkg/changelog.Debian
+	rm -f $(TMP_DPKG)/usr/share/doc/dpkg/copyright
 	gzip -9 $(TMP_DPKG)/usr/share/doc/dpkg/*
 	install -p -m 644 -o root -g root debian/copyright \
 		$(TMP_DPKG)/usr/share/doc/dpkg/
diff --git a/doc/Makefile.in b/doc/Makefile.in
index c39396608..b0064f84c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -20,8 +20,8 @@ cvsclean: clean cvsclean-recursive
 install: install-doc
 
 manuals-version: $(top_srcdir)/version-nr
-	v=`sed -ne 1s/.*(\(.*\)).*/\1/ $(srcdir)/ChangeLog` ; \
-	echo "<!entity manuals-version \"$$v)\">" > $@
+	set -e ; v=`sed -ne '1s/.*(\(.*\)).*/\1/' $(srcdir)/ChangeLog` ; \
+	echo "<!entity manuals-version \"$$v\">" > $@
 	echo "<!entity dpkg-version \"$(VERSION)\">" >> $@
 
 internals.html: internals.sgml manuals-version
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index a618fafdb..0ac7cdddb 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -14,7 +14,7 @@ SBIN_SCRIPTS		= update-rc.d update-alternatives install-info \
 
 MAN1PAGES		= dpkg-name.1 dpkg-source.1 822-date.1 dpkg-architecture.1
 MAN8PAGES		= update-rc.d.8 update-alternatives.8 install-info.8  \
-			  dpkg-scanpackages.8 dpkg-scansources.8
+			  cleanup-info.8 dpkg-scanpackages.8 dpkg-scansources.8
 
 CHANGELOG_PARSERS	= cl-debian
 
diff --git a/scripts/cleanup-info.8 b/scripts/cleanup-info.8
new file mode 100644
index 000000000..2f1c9b29b
--- /dev/null
+++ b/scripts/cleanup-info.8
@@ -0,0 +1,48 @@
+.TH CLEANUP-INFO 8 "November 1999" "Debian Project" "dpkg utilities"
+.SH NAME
+cleanup-info \- clean up the mess that bogus install-info may have done
+.SH SYNOPSIS
+.B cleanup-info
+[--help] [--unsafe] [--version] [--] [\fI<dirname>\fP]
+.SH DESCRIPTION
+.B cleanup-info
+is a Perl script that tries to clean up the mess that bogus install-info may
+have done. It gathers all sections with the same heading into a single one.
+It tries to be smart about cases and trailing colon/spaces.
+.br
+Other clean-ups include removing of empty sections, and squeezing the blank
+lines (in entries part only).
+.sp
+Order of sections is preserved (the first encountered section counts).
+Order of entries within a section is preserved.
+.sp
+Please be \fBextremely careful\fP when using this utility - it might
+not be 100% safe. cleanup-info tries to be careful with your info dir
+file, but only until it writes it. You should back the file up prior
+to using this.
+.SH OPTIONS
+.TP
+.I --help
+Output the help screen and exit successfully.
+.TP
+.I --unsafe
+Set some additional possibly useful options.
+.br
+.B "Warning: the `--unsafe' option may garble an otherwise correct file!"
+.TP
+.I --version
+Output version and exit successfully.
+.SH FILES
+.TP
+.I "/usr/info/dir or <dirname>/dir"
+The info directory file. The lock file is named the same, with ".lock" suffix.
+.SH BUGS
+Probably many.
+.SH SEE ALSO
+.BR install-info (8),
+.BR info (1).
+.SH AUTHOR
+Copyright (C) 1996 Kim-Minh Kaplan.
+.sp
+This is free software; see the GNU General Public Licence
+version 2 or later for copying conditions.  There is NO warranty.
diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl
index 411c9af09..083b5a351 100755
--- a/scripts/dpkg-scansources.pl
+++ b/scripts/dpkg-scansources.pl
@@ -315,6 +315,10 @@ sub process_dsc {
 
     my ($size, $md5, $contents) = read_dsc $file or return;
 
+    # Allow blank lines at the end of a file, because the other programs
+    # do.
+    $contents =~ s/\n\n+\z/\n/;
+
     if ($contents =~ /^\n/ || $contents =~ /\n\n/) {
     	xwarn_noerror "$file invalid (contains blank line)\n";
 	return;