r5973 - in glibc-package/branches/eglibc-2.19/debian: . debhelper.in
Author: aurel32
Date: 2014-02-27 09:28:23 +0000 (Thu, 27 Feb 2014)
New Revision: 5973
Modified:
glibc-package/branches/eglibc-2.19/debian/changelog
glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc.preinst
Log:
debian/debhelper.in/libc.preinst: stop checking for /etc/init.d/glibc.sh
on upgrade, we don't support lenny to jessie upgrades.
Modified: glibc-package/branches/eglibc-2.19/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/changelog 2014-02-26 22:38:35 UTC (rev 5972)
+++ glibc-package/branches/eglibc-2.19/debian/changelog 2014-02-27 09:28:23 UTC (rev 5973)
@@ -45,6 +45,8 @@
from pre-Wheezy versions.
* debian/debhelper.in/libc.preinst: don't act on the filesystem until it
is sure that the libc is going to be upgraded.
+ * debian/debhelper.in/libc.preinst: stop checking for /etc/init.d/glibc.sh
+ on upgrade, we don't support lenny to jessie upgrades.
-- Adam Conrad <adconrad@0c3.net> Sun, 09 Feb 2014 09:46:13 -0700
Modified: glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc.preinst 2014-02-26 22:38:35 UTC (rev 5972)
+++ glibc-package/branches/eglibc-2.19/debian/debhelper.in/libc.preinst 2014-02-27 09:28:23 UTC (rev 5973)
@@ -14,25 +14,6 @@
fi
}
-rm_conffile() {
- local PKGNAME="$1"
- local CONFFILE="$2"
-
- [ -e "$CONFFILE" ] || return 0
-
- local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
- local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
- sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
- if [ "$md5sum" != "$old_md5sum" ]; then
- echo "Obsolete conffile $CONFFILE has been modified by you."
- echo "Saving as $CONFFILE.dpkg-bak ..."
- mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
- else
- echo "Removing obsolete conffile $CONFFILE ..."
- rm -f "$CONFFILE"
- fi
-}
-
linux_compare_versions () {
verA=$(($(echo "$1" | sed 's/^\([0-9]*\.[0-9]*\)\([^.0-9]\|$\)/\1.0\2/; s/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 10000 + \2 \* 100 + \3/')))
verB=$(($(echo "$3" | sed 's/^\([0-9]*\.[0-9]*\)\([^.0-9]\|$\)/\1.0\2/; s/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 10000 + \2 \* 100 + \3/')))
@@ -283,12 +264,6 @@
fi
fi
- # Remove old /etc/init.d/glibc.sh init script
- if dpkg --compare-versions "$preversion" le "2.9-22"; then
- rm_conffile $(package_name) "/etc/init.d/glibc.sh"
- update-rc.d glibc.sh remove >/dev/null
- fi
-
# ldconfig might have broken the ld.so symlink in case a biarch package
# of the same architecture than the native one has been installed (e.g.:
# libc6-amd64:i386 on amd64). Try to detect this by checking that the
Reply to: