Author: aurel32 Date: 2006-04-09 22:38:21 +0000 (Sun, 09 Apr 2006) New Revision: 1368
Added: glibc-package/trunk/debian/debhelper.in/libc-alt-dev.preinst glibc-package/trunk/debian/debhelper.in/libc-alt.preinst glibc-package/trunk/debian/debhelper.in/libc-dev.preinst Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/debhelper.in/libc-otherbuild.preinst glibc-package/trunk/debian/debhelper.in/libc.preinst glibc-package/trunk/debian/rules.d/debhelper.mk Log: * Remove old /usr/share/doc/libc* directories in preinst, so they can be replaced by symlinks by dpkg. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2006-04-09 21:12:36 UTC (rev 1367) +++ glibc-package/trunk/debian/changelog 2006-04-09 22:38:21 UTC (rev 1368) @@ -5,6 +5,8 @@ by a separate package called tzdata. * Split out binaries from libc6 into libc-bin, and binaries from libc6-bin into libc-bin-dev. (Closes: #330735) + * Remove old /usr/share/doc/libc* directories in preinst, so they can be + replaced by symlinks by dpkg. * Put each test log file in the corresponding package instead of putting all of them in libc6. * Remove sparc/local-sparc64-fixups.diff as /lib64 and /usr/lib64 are now a Added: glibc-package/trunk/debian/debhelper.in/libc-alt-dev.preinst =================================================================== --- glibc-package/trunk/debian/debhelper.in/libc-alt-dev.preinst 2006-04-09 21:12:36 UTC (rev 1367) +++ glibc-package/trunk/debian/debhelper.in/libc-alt-dev.preinst 2006-04-09 22:38:21 UTC (rev 1368) @@ -0,0 +1,39 @@ +#! /bin/sh +# preinst script for libc-alt-dev +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> + +case "$1" in + install) + ;; + + upgrade) + if [ ! -L /usr/share/doc/ALT ]; then + rm -rf /usr/share/doc/ALT + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# + +exit 0 + + Added: glibc-package/trunk/debian/debhelper.in/libc-alt.preinst =================================================================== --- glibc-package/trunk/debian/debhelper.in/libc-alt.preinst 2006-04-09 21:12:36 UTC (rev 1367) +++ glibc-package/trunk/debian/debhelper.in/libc-alt.preinst 2006-04-09 22:38:21 UTC (rev 1368) @@ -0,0 +1,39 @@ +#! /bin/sh +# preinst script for libc-alt +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> + +case "$1" in + install) + ;; + + upgrade) + if [ ! -L /usr/share/doc/ALT ]; then + rm -rf /usr/share/doc/ALT + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# + +exit 0 + + Added: glibc-package/trunk/debian/debhelper.in/libc-dev.preinst =================================================================== --- glibc-package/trunk/debian/debhelper.in/libc-dev.preinst 2006-04-09 21:12:36 UTC (rev 1367) +++ glibc-package/trunk/debian/debhelper.in/libc-dev.preinst 2006-04-09 22:38:21 UTC (rev 1368) @@ -0,0 +1,39 @@ +#! /bin/sh +# preinst script for libc-dev +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> + +case "$1" in + install) + ;; + + upgrade) + if [ ! -L /usr/share/doc/LIBC-dev ]; then + rm -rf /usr/share/doc/LIBC-dev + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. +#DEBHELPER# + +exit 0 + + Modified: glibc-package/trunk/debian/debhelper.in/libc-otherbuild.preinst =================================================================== --- glibc-package/trunk/debian/debhelper.in/libc-otherbuild.preinst 2006-04-09 21:12:36 UTC (rev 1367) +++ glibc-package/trunk/debian/debhelper.in/libc-otherbuild.preinst 2006-04-09 22:38:21 UTC (rev 1368) @@ -8,6 +8,12 @@ echo $opt >> /etc/ld.so.nohwcap fi +if [ "$1" = upgrade ]; then + if [ ! -L /usr/share/doc/OPT ]; then + rm -rf /usr/share/doc/OPT + fi +fi + #DEBHELPER# exit 0 Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst =================================================================== --- glibc-package/trunk/debian/debhelper.in/libc.preinst 2006-04-09 21:12:36 UTC (rev 1367) +++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2006-04-09 22:38:21 UTC (rev 1368) @@ -41,6 +41,7 @@ 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 Modified: glibc-package/trunk/debian/rules.d/debhelper.mk =================================================================== --- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-04-09 21:12:36 UTC (rev 1367) +++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-04-09 22:38:21 UTC (rev 1368) @@ -190,7 +190,7 @@ cp $$x $$z; \ sed -e "s#TMPDIR#debian/tmp-libc#" -i $$z; \ sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#" -i $$z; \ - sed -e "s#LIBC#$(libc)#" -i $$z; \ + sed -e "s#LIBC#$(libc)#g" -i $$z; \ sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$z; \ sed -e "/KERNEL_VERSION_CHECK/r debian/script.in/kernelcheck.sh" -i $$z; \ sed -e "s#EXIT_CHECK##" -i $$z; \ @@ -207,11 +207,17 @@ for x in $(OPT_PASSES); do \ slibdir=$$1; \ shift; \ + y=debian/$(libc)-$$x.preinst; \ z=debian/$(libc)-$$x.install; \ case $$slibdir in \ /lib32 | /lib64 | /emul/ia32-linux/lib) \ libdir=$$1; \ shift; \ + cp debian/debhelper.in/libc-alt.preinst $$y; \ + sed -e "s#ALT#$(libc)-$$x#" -i $$y; \ + yd=debian/$(libc)-dev-$$x.preinst; \ + cp debian/debhelper.in/libc-alt-dev.preinst $$yd; \ + sed -e "s#ALT#$(libc)-dev-$$x#" -i $$yd; \ cp debian/debhelper.in/libc-alt.install $$z; \ zd=debian/$(libc)-dev-$$x.install; \ cp debian/debhelper.in/libc-alt-dev.install $$zd; \ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]