r1370 - in glibc-package/trunk/debian: debhelper.in rules.d
Author: aurel32
Date: 2006-04-09 23:58:57 +0000 (Sun, 09 Apr 2006)
New Revision: 1370
Modified:
glibc-package/trunk/debian/debhelper.in/libc.preinst
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
Correctly remove the old /usr/share/doc/libc6 directory in preinst
Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.preinst 2006-04-09 22:52:19 UTC (rev 1369)
+++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2006-04-09 23:58:57 UTC (rev 1370)
@@ -41,7 +41,6 @@
if [ -f /var/log/wtmpx ]; then rm -f /var/log/wtmpx*; fi
if [ -e /var/run/utmpd.ro ]; then rm -f /var/run/utmpd.ro; fi
if [ -e /var/run/utmpd.rw ]; then rm -f /var/run/utmpd.rw; fi
- if [ ! -L /usr/share/doc/LIBC-dev ]; then rm -rf /usr/share/doc/LIBC; fi
fi
# NSS authentication trouble guard
@@ -98,6 +97,11 @@
fi
fi
+ # Remove the old directory so that it could be replaced by a symlink
+ if [ ! -L /usr/share/doc/LIBC ]; then
+ rm -rf /usr/share/doc/LIBC;
+ fi
+
# This will keep us from using hwcap libs (optimized) during an
# upgrade.
touch /etc/ld.so.nohwcap
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-04-09 22:52:19 UTC (rev 1369)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-04-09 23:58:57 UTC (rev 1370)
@@ -225,7 +225,7 @@
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#" -i $$zd; \
sed -e "s#LIBC#$(libc)#" -i $$z; \
sed -e "s#FLAVOR#$$x#" -i $$z; \
- sed -e "s#LIBDIR#$$libdir#g" -i $$zd; \
+ sed -e "s#LIBDIR#$$libdir#" -i $$zd; \
sed -e "s/^#.*//" -i $$zd; \
;; \
*) \
Reply to: