r3113 - in glibc-package/branches/glibc-2.8/debian: . debhelper.in
Author: aurel32
Date: 2008-08-26 15:38:57 +0000 (Tue, 26 Aug 2008)
New Revision: 3113
Modified:
glibc-package/branches/glibc-2.8/debian/changelog
glibc-package/branches/glibc-2.8/debian/debhelper.in/locales-all.prerm
glibc-package/branches/glibc-2.8/debian/debhelper.in/locales.postinst
Log:
* debhelper.in/locales-all.prerm, debhelper.in/locales.postinst: remove
prepended path.
Modified: glibc-package/branches/glibc-2.8/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.8/debian/changelog 2008-08-26 15:36:08 UTC (rev 3112)
+++ glibc-package/branches/glibc-2.8/debian/changelog 2008-08-26 15:38:57 UTC (rev 3113)
@@ -114,6 +114,8 @@
builds.
* debian/sysdeps/kfreebsd-amd64.mk: remove wrong symlink /lib32/lib32.
* debian/sysdeps/amd64.mk,kfreebsd-amd64.mk: enable i686 optimizations.
+ * debhelper.in/locales-all.prerm, debhelper.in/locales.postinst: remove
+ prepended path.
[ Petr Salinger ]
* add any/local-linuxthreads-ptw.diff. Closes: #494908.
Modified: glibc-package/branches/glibc-2.8/debian/debhelper.in/locales-all.prerm
===================================================================
--- glibc-package/branches/glibc-2.8/debian/debhelper.in/locales-all.prerm 2008-08-26 15:36:08 UTC (rev 3112)
+++ glibc-package/branches/glibc-2.8/debian/debhelper.in/locales-all.prerm 2008-08-26 15:38:57 UTC (rev 3113)
@@ -6,7 +6,7 @@
# Is locales installed?
if [ -x /usr/sbin/locale-gen ] ; then
# If yes, generate locales selected in the debconf question
- /usr/sbin/locale-gen
+ locale-gen
else
# If not, clean the locales
rm -f /usr/lib/locale/locale-archive
Modified: glibc-package/branches/glibc-2.8/debian/debhelper.in/locales.postinst
===================================================================
--- glibc-package/branches/glibc-2.8/debian/debhelper.in/locales.postinst 2008-08-26 15:36:08 UTC (rev 3112)
+++ glibc-package/branches/glibc-2.8/debian/debhelper.in/locales.postinst 2008-08-26 15:38:57 UTC (rev 3113)
@@ -51,17 +51,17 @@
if [ -f /usr/lib/locales-all/supported.tar.lzma ] ; then
echo "locales-all installed, skipping locales generation"
else
- /usr/sbin/locale-gen
+ locale-gen
fi
if ! [ -e $EE ] || [ -n "$DEBCONF_RECONFIGURE" ] ; then
# Set default LANG environment variable
if [ -e $EE ]; then
# Remove previous definitions
- /usr/sbin/update-locale --no-checks LANG
+ update-locale --no-checks LANG
fi
if [ -n "$DEFAULT_ENVIRONMENT" ] && [ "$DEFAULT_ENVIRONMENT" != "None" ]; then
- /usr/sbin/update-locale "LANG=$DEFAULT_ENVIRONMENT"
+ update-locale "LANG=$DEFAULT_ENVIRONMENT"
fi
fi
fi
Reply to: