Просмотр исходного кода

Remove cleanup-info and its associated manual page

* scripts/Makefile.am: Drop cleanup-info.pl script.
* man/Makefile.am, man/po/po4a.cfg: Drop cleanup-info(8) manual page.
* README.feature-removal-schedule: Update information accordingly.
Raphael Hertzog лет назад: 17
Родитель
Сommit
6e0c0e26da
9 измененных файлов с 20 добавлено и 259 удалено
  1. 6 0
      ChangeLog
  2. 12 8
      README.feature-removal-schedule
  3. 1 0
      debian/changelog
  4. 0 2
      debian/dpkg.install
  5. 0 1
      man/Makefile.am
  6. 0 58
      man/cleanup-info.8
  7. 0 5
      man/po/po4a.cfg
  8. 1 5
      scripts/Makefile.am
  9. 0 180
      scripts/cleanup-info.pl

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2009-02-11  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/Makefile.am: Drop cleanup-info.pl script.
+	* man/Makefile.am, man/po/po4a.cfg: Drop cleanup-info(8) manual page.
+	* README.feature-removal-schedule: Update information accordingly.
+
 2009-02-11  Raphael Hertzog  <hertzog@debian.org>
 
 	* scripts/Makefile.am: Move update-alternatives, dpkg-divert and

+ 12 - 8
README.feature-removal-schedule

@@ -8,14 +8,6 @@ Warning: program
 Why:
  Should switch to use 'date -R'.
 
-What: cleanup-info (program)
-Status: deprecated
-When: lenny
-Warning: none
-Why:
- This program was needed long time ago to fixup broken info dir files
- generated by buggy install-info programs. Should not be needed anymore.
-
 What: Source-Version (substvar)
 Status: obsolete
 When: lenny+1
@@ -92,3 +84,15 @@ Why:
  PGP is not part of Debian and GnuPG has been the standard tool for digital
  signatures for several years already. Supporting only GnuPG enables us to
  rely on some of its features.
+
+History of feature removals
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+What: cleanup-info (program)
+Status: removed
+Since: 1.15.0
+Why:
+ This program was needed long time ago to fixup broken info dir files
+ generated by buggy install-info programs. Should not be needed anymore.
+
+

+ 1 - 0
debian/changelog

@@ -149,6 +149,7 @@ dpkg (1.15.0) UNRELEASED; urgency=low
   * Use dh_lintian to install lintian overrides. Build-Depends on debhelper
     (>= 6.0.7) for this. Update debhelper compatility level to 6 at the same
     time.
+  * Drop cleanup-info script.
 
   [ Pierre Habouzit ]
   * Add a --query option to update-alternatives. Closes: #336091, #441904

+ 0 - 2
debian/dpkg.install

@@ -15,8 +15,6 @@ usr/lib/dpkg/mksplit
 usr/sbin
 usr/share/dpkg
 usr/share/locale/*/LC_MESSAGES/dpkg.mo
-usr/share/man/*/*/cleanup-info.8
-usr/share/man/*/cleanup-info.8
 usr/share/man/*/*/dpkg-deb.1
 usr/share/man/*/dpkg-deb.1
 usr/share/man/*/*/dpkg-divert.8

+ 0 - 1
man/Makefile.am

@@ -66,7 +66,6 @@ dist-hook: man.stamp
 
 dist_man_MANS = \
 	822-date.1 \
-	cleanup-info.8 \
 	deb-control.5 \
 	deb-version.5 \
 	deb-shlibs.5 \

+ 0 - 58
man/cleanup-info.8

@@ -1,58 +0,0 @@
-.TH cleanup\-info 8 "2008-08-18" "Debian Project" "dpkg utilities"
-.SH NAME
-cleanup\-info \- clean up the mess that bogus install\-info may have done
-.
-.SH SYNOPSIS
-.B cleanup\-info
-.RI [ options ]
-.RB [ \-\- ]
-.RI [ dirname ]
-.
-.SH DESCRIPTION
-.B cleanup\-info
-is a Perl script that tries to clean up the mess that bogus
-.BR install\-info (8)
-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 script.
-.
-.SH OPTIONS
-.TP
-.B \-\-unsafe
-Set some additional possibly useful options.
-.br
-.B "Warning: the `\-\-unsafe' option may garble an otherwise correct file!"
-.TP
-.B \-\-help
-Show the usage message and exit.
-.TP
-.B \-\-version
-Show the version and exit.
-.
-.SH FILES
-.TP
-.IR /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 \(co 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.

+ 0 - 5
man/po/po4a.cfg

@@ -18,11 +18,6 @@
            add_$lang:$(srcdir)/po/$lang.add
 
 
-[type:man] $(srcdir)/cleanup-info.8             \
-           $lang:$lang/cleanup-info.8           \
-           add_$lang:$(srcdir)/po/$lang.add
-
-
 [type:man] $(srcdir)/deb.5                      \
            $lang:$lang/deb.5                    \
            add_$lang:$(srcdir)/po/$lang.add

+ 1 - 5
scripts/Makefile.am

@@ -21,9 +21,6 @@ bin_SCRIPTS = \
 	dpkg-source \
 	update-alternatives
 
-sbin_SCRIPTS = \
-	cleanup-info
-
 changelogdir = $(pkglibdir)/parsechangelog
 changelog_SCRIPTS = \
 	changelog/debian
@@ -44,7 +41,6 @@ EXTRA_DIST = \
 	dpkg-scansources.pl \
 	dpkg-shlibdeps.pl \
 	dpkg-source.pl \
-	cleanup-info.pl \
 	dpkg-divert.pl \
 	dpkg-statoverride.pl \
 	install-info.pl \
@@ -82,7 +78,7 @@ EXTRA_DIST = \
 	t/900_update_alternatives.t
 
 CLEANFILES = \
-	$(bin_SCRIPTS) $(sbin_SCRIPTS) $(changelog_SCRIPTS) \
+	$(bin_SCRIPTS) $(changelog_SCRIPTS) \
 	install-info install-info-stamp
 
 perllibdir = $(PERL_LIBDIR)

+ 0 - 180
scripts/cleanup-info.pl

@@ -1,180 +0,0 @@
-#!/usr/bin/perl --
-#
-#   Clean up the mess that bogus install-info may have done :
-#
-#	- gather all sections with the same heading into a single one.
-#	Tries to be smart about cases and trailing colon/spaces.
-#
-#   Other clean ups :
-#
-#	- remove empty sections,
-#	- squeeze blank lines (in entries part only).
-#
-#   Order of sections is preserved (the first encountered section
-# counts).
-#
-#   Order of entries within a section is preserved.
-#
-# BUGS:
-#
-#   Probably many : I just recently learned Perl for this program
-# using the man pages.  Hopefully this is a short enough program to
-# debug.
-
-use strict;
-use warnings;
-
-use Dpkg;
-use Dpkg::Gettext;
-
-textdomain("dpkg");
-
-($0) = $0 =~ m:.*/(.+):;
-
-sub version {
-    printf _g("Debian %s version %s.\n"), $0, $version;
-
-    printf _g("
-Copyright (C) 1996 Kim-Minh Kaplan.");
-
-    printf _g("
-This is free software; see the GNU General Public Licence version 2 or
-later for copying conditions. There is NO warranty.
-");
-}
-
-sub usage {
-    printf _g(
-"Usage: %s [<option> ...] [--] [<dirname>]
-
-Options:
-  --unsafe     set some additional possibly useful options.
-               warning: this option may garble an otherwise correct file.
-  --help       show this help message.
-  --version    show the version.
-"), $0;
-}
-
-my $infodir = '/usr/info';
-my $unsafe = 0;
-$0 =~ m|[^/]+$|;
-my $name= $&;
-
-sub ulquit {
-    unlink "$infodir/dir.lock"
-	or warn sprintf(_g("%s: warning - unable to unlock %s: %s"),
-	                $name, "$infodir/dir", $!)."\n";
-    die "$name: $_[0]";
-}
-
-while (scalar @ARGV > 0 && $ARGV[0] =~ /^--/) {
-    $_ = shift;
-    /^--$/ and last;
-    /^--version$/ and do {
-	version;
-	exit 0;
-    };
-    /^--help$/ and do {
-	usage;
-	exit 0;
-    };
-    /^--unsafe$/ and do {
-	$unsafe=1;
-	next;
-    };
-    printf STDERR _g("%s: unknown option \`%s'")."\n", $name, $_;
-    usage;
-    exit 1;
-}
-
-if (scalar @ARGV > 0) {
-    $infodir = shift;
-    if (scalar @ARGV > 0) {
-	printf STDERR _g("%s: too many arguments")."\n", $name;
-	usage;
-	exit 1;
-    }
-}
-
-if (!link "$infodir/dir", "$infodir/dir.lock") {
-    die sprintf(_g("%s: failed to lock dir for editing! %s"),
-                $name, $!)."\n".
-        ($! =~ /exist/i ? sprintf(_g("try deleting %s"),
-                                  "$infodir/dir.lock")."\n" : '');
-}
-open OLD, "$infodir/dir"
-    or ulquit sprintf(_g("unable to open %s: %s"), "$infodir/dir", $!)."\n";
-open OUT, ">$infodir/dir.new"
-    or ulquit sprintf(_g("unable to create %s: %s"), "$infodir/dir.new", $!)."\n";
-
-my (%sections, @section_list, $lastline);
-my $section="Miscellaneous";	# default section
-my $section_canonic="miscellaneous";
-my $waitfor = $unsafe ? '^\*.*:' : '^\*\s*Menu';
-
-while (<OLD>) {				# dump the non entries part
-    last if (/$waitfor/oi);
-    if (defined $lastline) {
-	print OUT $lastline
-	    or ulquit sprintf(_g("unable to write %s: %s"),
-				 "$infodir/dir.new", $!)."\n";
-    }
-    $lastline = $_;
-};
-
-if (/^\*\s*Menu\s*:?/i) {
-    print OUT $lastline if defined $lastline;
-    print OUT $_;
-} else {
-    print OUT "* Menu:\n";
-    if (defined $lastline) {
-	$lastline =~ s/\s*$//;
-	if ($lastline =~ /^([^\*\s].*)/) { # there was a section title
-	    $section = $1;
-	    $lastline =~ s/\s*:$//;
-	    $section_canonic = lc $lastline;
-	}
-    }
-    push @section_list, $section_canonic;
-    s/\s*$//;
-    $sections{$section_canonic} = "\n$section\n$_\n";
-}
-
-foreach (<OLD>) {		# collect sections
-    next if (/^\s*$/ or $unsafe and /^\*\s*Menu/oi);
-    s/\s*$//;
-    if (/^([^\*\s].*)/) {		# change of section
-	$section = $1;
-	s/\s*:$//;
-	$section_canonic = lc $_;
-    } else {			# add to section
-	if (! exists $sections{$section_canonic}) { # create section header
-	    push @section_list, $section_canonic;
-	    $sections{$section_canonic} = "\n$section\n";
-	}
-	$sections{$section_canonic} .= "$_\n";
-    }
-}
-
-eof OLD or ulquit sprintf(_g("unable to read %s: %s"), "$infodir/dir", $!)."\n";
-close OLD or ulquit sprintf(_g("unable to close %s after read: %s"),
-                               "$infodir/dir", $!)."\n";
-
-print OUT @sections{@section_list};
-close OUT or ulquit sprintf(_g("unable to close %s: %s"),
-                               "$infodir/dir.new", $!)."\n";
-
-# install clean version
-unlink "$infodir/dir.old";
-link "$infodir/dir", "$infodir/dir.old"
-    or ulquit sprintf(_g("unable to backup old %s, giving up: %s"),
-                         "$infodir/dir", $!)."\n";
-rename "$infodir/dir.new", "$infodir/dir"
-    or ulquit sprintf(_g("failed to install %s; it will be left as %s: %s"),
-                         "$infodir/dir", "$infodir/dir.new", $!)."\n";
-
-unlink "$infodir/dir.lock"
-    or die sprintf(_g("%s: unable to unlock %s: %s"),
-                   $name, "$infodir/dir", $!)."\n";
-
-exit 0;