dh_scrollkeeper: Now a deprecated no-op. Closes: #530806

diff --git a/autoscripts/postinst-scrollkeeper b/autoscripts/postinst-scrollkeeper
deleted file mode 100644 (file)
index b218049..0000000
--- a/autoscripts/postinst-scrollkeeper
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = "configure" ] && which scrollkeeper-update >/dev/null 2>&1; then
-       scrollkeeper-update -q
-fi

diff --git a/autoscripts/postrm-scrollkeeper b/autoscripts/postrm-scrollkeeper
deleted file mode 100644 (file)
index 47b7154..0000000
--- a/autoscripts/postrm-scrollkeeper
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ "$1" = "remove" ] && which scrollkeeper-update >/dev/null 2>&1; then
-       scrollkeeper-update -q
-fi

diff --git a/debian/changelog b/debian/changelog
index 35aede3547551827400eeca807a550b03fe998fc..c59afe77d1855833bdd0bb9a40d8cb24cc924dbc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ debhelper (7.2.15) UNRELEASED; urgency=low
     might be used as images on a html page, and also to avoid needing
     to special case the .svgz extention when compressing svg.
     Closes: #530253
+  * dh_scrollkeeper: Now a deprecated no-op. Closes: #530806
 
  -- Joey Hess <joeyh@debian.org>  Mon, 18 May 2009 15:42:04 -0400
 

diff --git a/dh b/dh
index d1885101e6d4db90feac52c39adebc4137305baf..35fedbb02b9892ec8510d440d9f9d9a8eb7f6c69 100755 (executable)
--- a/dh
+++ b/dh
@@ -252,7 +252,6 @@ $sequences{install} = [@{$sequences{build}}, qw{
        dh_gconf
        dh_icons
        dh_perl
-       dh_scrollkeeper
        dh_usrlocal
 
        dh_link

diff --git a/dh_scrollkeeper b/dh_scrollkeeper
index d2e2145e89904e712da24e994c997792118494a2..c40e77df394a93a92967e23bbf67378c9a78cfa3 100755 (executable)
--- a/dh_scrollkeeper
+++ b/dh_scrollkeeper
@@ -2,7 +2,7 @@
 
 =head1 NAME
 
-dh_scrollkeeper - generate ScrollKeeper registration scripts
+dh_scrollkeeper - deprecated no-op
 
 =cut
 
@@ -15,63 +15,15 @@ B<dh_scrollkeeper> [S<I<debhelper options>>] [B<-n>] [S<I<directory>>]
 
 =head1 DESCRIPTION
 
-B<dh_scrollkeeper> is a debhelper program that handles correctly
-registering OMF files that it finds in package build trees with
-ScrollKeeper.
-
-This command automatically adds maintainer script snippets for registering
-and unregistering files with ScrollKeeper (unless B<-n> is used). These
-snippets are inserted into the maintainer scripts by dh_installdeb. See
-L<dh_installdeb(1)> for an explanation of Debhelper maintainer script
-snippets.
-
-It will also change any DTD declarations in the OMF and DocBook files
-to refer to local files instead of remote URLs. This change does not
-modify the source files, but the files in the package build tree.
-
-=head1 OPTIONS
-
-=over 4
-
-=item B<-n>, B<--noscripts>
-
-Do not modify F<postinst>/F<postrm> scripts.
-
-=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.
+dh_scrollkeeper was a debhelper program that handled 
+registering OMF files for ScrollKeeper. However, it no longer does
+anything, and is now deprecated.
 
 =cut
 
 init();
 
-# This is a list of paths where DocBook files might be stored.
-my @xml_paths = (
-       'usr/share/gnome/help' # GNOME Help
-);
-
-# Append the remaining command line arguments
-push @xml_paths, @ARGV if @ARGV;
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
-       my $tmp=tmpdir($package);
-       
-       # Only run if there have been OMF files installed
-       if (-d "$tmp/usr/share/omf") {
-               # Get a list of the OMF files
-               my @omf_files = `find $tmp/usr/share/omf -type f -printf '%p\n'`;
-               if (@omf_files) {
-                       if (! $dh{NOSCRIPTS}) {
-                               autoscript($package,"postinst","postinst-scrollkeeper");
-                               autoscript($package,"postrm","postrm-scrollkeeper");
-                       }
-               }
-       }
-}
+warning("This program is deprecated, and does nothing anymore.");
 
 =head1 SEE ALSO
 

diff --git a/doc/TODO b/doc/TODO
index b534af504b7754a63a52aaf137e28c4a63b774b5..3092736bbf0208531c4d8b1f613c2bda31aa5d9b 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -30,4 +30,4 @@ Deprecated:
 * Convert warning about unknown command-line options back to an error.
   Need to wait a while (from Oct 2008) to ensure that most rules files
   that pass unknown options to commands are fixed.
-* dh_desktop. Remove eventually..
+* dh_desktop, dh_scrollkeeper. Remove eventually..