The following commit has been merged in the master branch:
commit beaf586ede1e75f162e46cb5fbe6acf844afc5c9
Author: Guillem Jover <[email protected]>
Date: Thu May 16 07:01:52 2013 +0200
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.
diff --git a/README b/README
index 870ee1b..52b9cf3 100644
--- a/README
+++ b/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:
diff --git a/TODO b/TODO
index 6b739f3..f6718c7 100644
--- a/TODO
+++ b/TODO
@@ -94,8 +94,6 @@ TODO
* We should set our own obstack_alloc_failed_handler.
- * Remove install-info wrapper.
-
------------------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index ce12e1b..21f33bb 100644
--- a/configure.ac
+++ b/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}],
diff --git a/debian/changelog b/debian/changelog
index d6b1329..ecf04be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -78,6 +78,7 @@ dpkg (1.17.0) UNRELEASED; urgency=low
Requested-by Kevin Bortis <[email protected]>.
* Remove update-alternatives, dpkg-divert and dpkg-statoverride
compatibility symlinks under /usr/sbin/.
+ * Remove install-info wrapper.
-- Guillem Jover <[email protected]> Fri, 03 Aug 2012 13:21:00 +0200
diff --git a/debian/control b/debian/control
index c879a4f..558d110 100644
--- a/debian/control
+++ b/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
diff --git a/debian/dpkg.lintian-overrides b/debian/dpkg.lintian-overrides
index a010f42..ca1a983 100644
--- a/debian/dpkg.lintian-overrides
+++ b/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
diff --git a/debian/usertags b/debian/usertags
index b4c8620..0fc26f2 100644
--- a/debian/usertags
+++ b/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:]
diff --git a/utils/.gitignore b/utils/.gitignore
index 4ba178b..9970040 100644
--- a/utils/.gitignore
+++ b/utils/.gitignore
@@ -1,4 +1,3 @@
start-stop-daemon
update-alternatives
-dpkg-install-info
t.tmp
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 2ba090b..068c04c 100644
--- a/utils/Makefile.am
+++ b/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)
diff --git a/utils/install-info.c b/utils/install-info.c
deleted file mode 100644
index eb1679f..0000000
--- a/utils/install-info.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * install-info.c - transitional ginstall-info wrapper
- *
- * Copyright © 2009 Raphaël Hertzog <[email protected]>
- *
- * 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;
-}
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
