This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit a5e6bbdd8ae883eebe20f184afe0fa3732f2e057 Author: Guillem Jover <[email protected]> Date: Mon Aug 15 17:39:15 2016 +0200 debian: Remove ancient upgrade code from maintainer scripts These were upgrade recipes from 1.9.x, 1.10.x and 1.15.x. --- Makefile.am | 1 - debian/changelog | 1 + debian/dpkg.lintian-overrides | 2 -- debian/dpkg.postinst | 28 ---------------- debian/dpkg.preinst | 76 ------------------------------------------- 5 files changed, 1 insertion(+), 107 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3a01a36..fc2ca36 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,7 +52,6 @@ EXTRA_DIST = \ debian/dpkg.manpages \ debian/dpkg.postinst \ debian/dpkg.postrm \ - debian/dpkg.preinst \ debian/dpkg.prerm \ debian/dpkg.logrotate \ debian/dpkg.lintian-overrides \ diff --git a/debian/changelog b/debian/changelog index 8482bbf..9209919 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium compatibility symlinks, again. - Use perl:Depends via dh_perl instead of a hardcoded perl in Depends. - Remove unused dh_strip from binary_indep target. + - Remove ancient upgrade code from maintainer scripts (before 1.15.x). * Documentation: - Update custom changelog parser API support status in README.api. - Fix typos in docs and man pages. Thanks to Jakub Wilk <[email protected]> diff --git a/debian/dpkg.lintian-overrides b/debian/dpkg.lintian-overrides index ca1a983..66f9624 100644 --- a/debian/dpkg.lintian-overrides +++ b/debian/dpkg.lintian-overrides @@ -1,5 +1,3 @@ dpkg: redundant-origin-field 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:* diff --git a/debian/dpkg.postinst b/debian/dpkg.postinst index b685d61..9771d7f 100755 --- a/debian/dpkg.postinst +++ b/debian/dpkg.postinst @@ -15,31 +15,6 @@ create_database() { } -# Move the info directory from /usr/info to /usr/share/info -move_info_directory() { - if [ -d /usr/info ] && [ ! -L /usr/info ] \ - && [ -f /usr/info/dir ] && [ ! -L /usr/info/dir ] - then - echo "Moving /usr/info/dir to /usr/share/info/dir ..." - mv /usr/info/dir /usr/share/info/dir - if [ -f /usr/info/dir.old ]; then - mv /usr/info/dir.old /usr/share/info/dir.old - fi - fi -} - - -# Remove the /usr/info symlinks we used to generate -remove_info_symlink() { - if [ -L /usr/info ]; then - echo "Removing /usr/info symlink ..." - rm /usr/info - elif [ -L /usr/info/dir ]; then - echo "Removing /usr/info/dir symlink ..." - rm /usr/info/dir - fi -} - # Create log file and set default permissions if possible create_logfile() { logfile=/var/log/dpkg.log @@ -53,9 +28,6 @@ case "$1" in configure) create_database create_logfile - - move_info_directory - remove_info_symlink ;; abort-upgrade|abort-deconfigure|abort-remove) diff --git a/debian/dpkg.preinst b/debian/dpkg.preinst deleted file mode 100755 index 07f3899..0000000 --- a/debian/dpkg.preinst +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh -# See dpkg-preinst(5). - -set -e - -# Handle upgrades from pre-conffile dpkg.cfg -upgrade_dpkg_non_conffile() -{ - if [ -r /etc/dpkg/dpkg.cfg ]; then - dpkg_cfg_md5="535552ad5ee9145dbc7a34c264df4e59 /etc/dpkg/dpkg.cfg" - if echo "$dpkg_cfg_md5" | md5sum -c >/dev/null 2>&1; then - echo "Removing non-modified dpkg.cfg to be replaced by a conffile ..." - rm -f /etc/dpkg/dpkg.cfg - fi - fi -} - -kill_bad_alternatives () { - local IFS="" - admindir=${DPKG_ADMINDIR:-/var/lib/dpkg} - ALTDIR="$admindir/alternatives" - for alt in $ALTDIR/*; do - if [ ! -f $alt ]; then - # In case it's been removed by the code below, or in case - # it's not a real file - continue - fi - { - read mode || continue - read mainlink || continue - while true; do - read slave || break - if [ "$slave" = "" ]; then - break - fi - if [ -e "$ALTDIR/$slave" ]; then - echo "Removing conflicting master alternative $slave (it is slave of $(basename $alt))..." - rm -f "$ALTDIR/$slave" - fi - read slavelink || break - done - } <$alt - done -} - -case "$1" in - install) - ;; - - upgrade) - # Cleanup bad alternatives that would choke with new - # update-alternatives (see #530633, #531611, #532739, #521760) - if dpkg --compare-versions "$2" lt 1.15.3; then - kill_bad_alternatives - fi - - case "$2" in - # Upgrade from pre-conffile dpkg.cfg - 1.9.21 | 1.10.* ) - upgrade_dpkg_non_conffile - ;; - esac - ;; - - abort-upgrade) - ;; - - - *) - echo "$0 called with unknown argument '$1'" 1>&2 - exit 1 - ;; -esac - -#DEBHELPER# -exit 0 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git
