Browse Source

Remove install-info wrapper

The dpkg implementation was replaced by the GNU texinfo implementation
some time ago, through a wrapper used to ease the transition. Now long
complete, it's time to clean up.
Guillem Jover 11 years ago
parent
commit
beaf586ede
10 changed files with 2 additions and 95 deletions
  1. 0 1
      README
  2. 0 2
      TODO
  3. 0 1
      configure.ac
  4. 1 0
      debian/changelog
  5. 1 4
      debian/control
  6. 0 2
      debian/dpkg.lintian-overrides
  7. 0 3
      debian/usertags
  8. 0 1
      utils/.gitignore
  9. 0 15
      utils/Makefile.am
  10. 0 66
      utils/install-info.c

+ 0 - 1
README

@@ -110,7 +110,6 @@ programs:
   --disable-dselect
   --disable-start-stop-daemon
   --disable-update-alternatives
-  --disable-install-info
 
 And the following to disable modifications to the build flags:
 

+ 0 - 2
TODO

@@ -94,8 +94,6 @@ TODO
 
  * We should set our own obstack_alloc_failed_handler.
 
- * Remove install-info wrapper.
-
 
 ------------------------------------------------------------------------------
 

+ 0 - 1
configure.ac

@@ -24,7 +24,6 @@ DPKG_DIST_CHECK([test "$GMSGFMT" = ":" && test "$USE_NLS" = "yes"],
 DPKG_BUILD_PROG([dselect])
 DPKG_BUILD_PROG([start-stop-daemon])
 DPKG_BUILD_PROG([update-alternatives])
-DPKG_BUILD_PROG([install-info])
 
 # Allow alternate directories
 DPKG_WITH_DIR([admindir], [${localstatedir}/lib/${PACKAGE_NAME}],

+ 1 - 0
debian/changelog

@@ -78,6 +78,7 @@ dpkg (1.17.0) UNRELEASED; urgency=low
     Requested-by Kevin Bortis <wermut@gmail.com>.
   * Remove update-alternatives, dpkg-divert and dpkg-statoverride
     compatibility symlinks under /usr/sbin/.
+  * Remove install-info wrapper.
 
  -- Guillem Jover <guillem@debian.org>  Fri, 03 Aug 2012 13:21:00 +0200
 

+ 1 - 4
debian/control

@@ -35,10 +35,7 @@ Essential: yes
 Pre-Depends: ${shlibs:Depends}, tar (>= 1.23)
 Depends: ${misc:Depends}
 Breaks: dpkg-dev (<< 1.15.8), libdpkg-perl (<< 1.15.8),
- apt (<< 0.7.7), aptitude (<< 0.4.7-1),
-# install-info transition
-# see http://wiki.debian.org/Transitions/DpkgToGnuInstallInfo
- tkinfo (<< 2.8-3.1), pinfo (<< 0.6.9-3.1)
+ apt (<< 0.7.7), aptitude (<< 0.4.7-1)
 Suggests: apt
 Description: Debian package management system
  This package provides the low-level infrastructure for handling the

+ 0 - 2
debian/dpkg.lintian-overrides

@@ -3,5 +3,3 @@ dpkg: redundant-bugs-field
 dpkg: arch-dep-package-has-big-usr-share
 # False positives, we read from a file not from a tty
 dpkg: read-in-maintainer-script preinst:*
-# On purpose, install-info is only a wrapper that will be removed soon
-dpkg: binary-without-manpage usr/sbin/install-info

+ 0 - 3
debian/usertags

@@ -84,8 +84,6 @@ dpkg-vendor
 s-s-d			[S-S-D]			start-stop-daemon
 u-a			[U-A]			update-alternatives
 
-install-info		[INSTALL-INFO]
-
 Current categories
 ==================
 
@@ -135,7 +133,6 @@ usercategory dpkg-program [hidden]
   + dpkg-source [tag=dpkg-source]
   + dpkg-vendor [tag=dpkg-vendor]
   + Dpkg perl modules [package=libdpkg-perl]
-  + install-info [tag=install-info]
   + dselect [package=dselect]
   + Other [0:]
 

+ 0 - 1
utils/.gitignore

@@ -1,4 +1,3 @@
 start-stop-daemon
 update-alternatives
-dpkg-install-info
 t.tmp

+ 0 - 15
utils/Makefile.am

@@ -41,18 +41,6 @@ start_stop_daemon_LDADD = \
 	$(SSD_LIBS)
 endif
 
-if BUILD_INSTALL_INFO
-sbin_PROGRAMS += dpkg-install-info
-
-# Automake has its own install-info rule, gah
-dpkg_install_info_SOURCES = install-info.c
-
-dpkg_install_info_LDADD = \
-	../lib/compat/libcompat.a
-endif
-
-transform = s/dpkg-install-info/install-info/; $(program_transform_name)
-
 install-data-local:
 if BUILD_UPDATE_ALTERNATIVES
 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/alternatives
@@ -62,9 +50,6 @@ endif
 
 uninstall-local:
 	rm -f $(DESTDIR)$(sysconfdir)/alternatives/README
-if BUILD_INSTALL_INFO
-	rm -f $(DESTDIR)$(sbindir)/install-info
-endif
 
 TEST_ENV_VARS = DPKG_DATADIR=$(top_srcdir)
 

+ 0 - 66
utils/install-info.c

@@ -1,66 +0,0 @@
-/*
- * install-info.c - transitional ginstall-info wrapper
- *
- * Copyright © 2009 Raphaël Hertzog <hertzog@debian.org>
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <compat.h>
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define SELF "/usr/sbin/install-info"
-#define WRAPPED "/usr/bin/install-info"
-
-#define warn(...) fprintf(stderr, "install-info: warning: " __VA_ARGS__)
-#define error(...) fprintf(stderr, "install-info: error: " __VA_ARGS__)
-
-int
-main(int argc, char **argv)
-{
-    if (strcmp(argv[0], SELF) == 0) {
-	warn("don't call programs like install-info with an absolute path,\n");
-	warn("%s provided by dpkg is deprecated and will go away soon;\n",
-	     SELF);
-	warn("its replacement lives in /usr/bin/.\n");
-    }
-
-	execv(WRAPPED, argv);
-	if (errno == ENOENT) {
-	    if (getenv("DPKG_RUNNING_VERSION") != NULL) {
-		const char *pkg;
-
-		pkg = getenv("DPKG_MAINTSCRIPT_PACKAGE");
-
-		warn("maintainer scripts should not call install-info anymore,\n");
-		warn("this is handled now by a dpkg trigger provided by the\n");
-		warn("install-info package; package %s should be updated.\n",
-		     pkg);
-	    } else {
-		warn("nothing done since %s doesn't exist,\n", WRAPPED);
-		warn("you might want to install an info-browser package.\n");
-	    }
-	} else {
-	    error("can't execute %s: %s\n", WRAPPED, strerror(errno));
-	    return 1;
-	}
-
-    return 0;
-}