dh_installinfo: No longer inserts install-info calls into maintainer scripts

as that is now triggerized. Adds a dependency via misc:Depends to handle
partial upgrades. Note that while dh_installinfo already required that info
files had a INFO-DIR-SECTION, the new system also requires they have
START-INFO-DIR-ENTRY and END-INFO-DIR-ENTRY for proper registration. I
assume there will be some mass bug filing for any packages that do not have
that. Closes: #528864

diff --git a/autoscripts/postinst-info b/autoscripts/postinst-info
deleted file mode 100644 (file)
index ffef863..0000000
--- a/autoscripts/postinst-info
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = "configure" ]; then
-       install-info --quiet #FILE#
-fi

diff --git a/autoscripts/prerm-info b/autoscripts/prerm-info
deleted file mode 100644 (file)
index 57d25c0..0000000
--- a/autoscripts/prerm-info
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = remove ] || [ "$1" = upgrade ]; then
-       install-info --quiet --remove #FILE#
-fi

diff --git a/debian/changelog b/debian/changelog
index c735e9d235b506d43d0aa95c3ccbf9316b75c337..1721da2125777b4293137ba65d2a3842f555c289 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,14 @@ debhelper (7.2.17) UNRELEASED; urgency=low
   * Allow command-specific options to be passed to commands
     via dh without causing other commands to emit a getopt
     warning or deprecation message.
+  * dh_installinfo: No longer inserts install-info calls into
+    maintainer scripts, as that is now triggerized. Adds a dependency
+    via misc:Depends to handle partial upgrades. Note that while
+    dh_installinfo already required that info files had a INFO-DIR-SECTION,
+    the new system also requires they have START-INFO-DIR-ENTRY and
+    END-INFO-DIR-ENTRY for proper registration. I assume there will be
+    some mass bug filing for any packages that do not have that.
+    Closes: #528864
 
  -- Joey Hess <joeyh@debian.org>  Fri, 12 Jun 2009 00:26:11 -0400
 

diff --git a/dh_installinfo b/dh_installinfo
index 3e6ce87aed9e75442c9739cac0b4d638f53dad83..a7f5d914fc05b628491723c152bbe448fdc89568 100755 (executable)
--- a/dh_installinfo
+++ b/dh_installinfo
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_installinfo - install and register info files
+dh_installinfo - install info files
 
 =cut
 
@@ -11,16 +11,12 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
-B<dh_installinfo> [S<I<debhelper options>>] [B<-A>] [B<-n>] [S<I<file ...>>]
+B<dh_installinfo> [S<I<debhelper options>>] [B<-A>] [S<I<file ...>>]
 
 =head1 DESCRIPTION
 
 dh_installinfo is a debhelper program that is responsible for installing
-info files and registering the files it installs with install-info.
-
-Note that install-info determines some information about the info files by
-parsing them, in particular, it looks at the INFO-DIR-SECTION line to
-determine what section the info file belongs in.
+info files into usr/share/info in the package build directory.
 
 Any filenames specified as parameters will be installed into the first
 package dh_installinfo is told to act on. By default, this is the first
@@ -29,11 +25,6 @@ will be the first package specified by those flags.
 
 Files named debian/package.info can list other files to be installed.
 
-dh_installinfo will automatically generate the postinst and prerm commands
-needed to interface with install-info, updating the info dir. These
-commands are inserted into the maintainer scripts by dh_installdeb.
-See L<dh_installdeb(1)> for an explanation of how this works.
-
 =head1 OPTIONS
 
 =over 4
@@ -43,10 +34,6 @@ See L<dh_installdeb(1)> for an explanation of how this works.
 Install all files specified by command line parameters in ALL packages
 acted on.
 
-=item B<-n>, B<--noscripts>
-
-Do not modify postinst/prerm scripts.
-
 =item I<file ...>
 
 Install these info files into the first package acted on. (Or in
@@ -54,12 +41,6 @@ all packages if -A is specified).
 
 =back
 
-=head1 NOTES
-
-Note that this command is not idempotent. L<dh_prep(1)> should be called
-between invocations of this command. Otherwise, it may cause multiple
-instances of the same text to be added to maintainer scripts.
-
 =cut
 
 init();
@@ -85,18 +66,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                doit("cp",@info,"$tmp/usr/share/info");
                doit("chmod","-R", "go=rX","$tmp/usr/share/info/");
                doit("chmod","-R", "u+rw","$tmp/usr/share/info/");
-       }
-
-       foreach $file (@info) {
-               # Only register with install-info if this is a head file in
-               # a tree of info files.
-               if ($file !~ /-\d+$/ && ! $dh{NOSCRIPTS}) {
-                       my $fn="/usr/share/info/".basename($file);
-                       
-                       autoscript($package,"postinst","postinst-info",
-                               "s:#FILE#:$fn:");
-                       autoscript($package,"prerm","prerm-info", "s:#FILE#:$fn:");
-               }
+               # For transition, could be removed later.
+               addsubstvar($package, "misc:Depends", "dpkg (>= 1.15.4) | install-info");
        }
 }