Author: aurel32 Date: 2009-03-03 00:01:24 +0000 (Tue, 03 Mar 2009) New Revision: 3362
Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/debhelper.in/locales.config Log: * merge lost patch from lenny: - debhelper.in/locales.config: use previous debconf settings if /etc/locales does not exists. Closes: bug#517884. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2009-03-02 10:24:51 UTC (rev 3361) +++ glibc-package/trunk/debian/changelog 2009-03-03 00:01:24 UTC (rev 3362) @@ -12,8 +12,11 @@ * debhelper.in/libc.{preinst,postint}: bump the version triggering the restart of NSS related services to 2.9-5. * debhelper.in/libc.postint: change cupsys into cups. + * merge lost patch from lenny: + - debhelper.in/locales.config: use previous debconf settings if + /etc/locales does not exists. Closes: bug#517884. - -- Aurelien Jarno <aure...@debian.org> Mon, 02 Mar 2009 10:02:14 +0100 + -- Aurelien Jarno <aure...@debian.org> Tue, 03 Mar 2009 00:54:27 +0100 glibc (2.9-4) unstable; urgency=low Modified: glibc-package/trunk/debian/debhelper.in/locales.config =================================================================== --- glibc-package/trunk/debian/debhelper.in/locales.config 2009-03-02 10:24:51 UTC (rev 3361) +++ glibc-package/trunk/debian/debhelper.in/locales.config 2009-03-03 00:01:24 UTC (rev 3362) @@ -36,24 +36,24 @@ # List of supported locales (PROVIDED_LOCALES + USER_LOCALES + GEN_LOCALES) SUPPORTED_LOCALES="$(echo -e "$PROVIDED_LOCALES\n$USER_LOCALES\n$GEN_LOCALES" | grep -v "^$" | sort -u | tr '\n' ',' | sed -e 's/, */, /g' -e 's/, *$//g')" +db_subst locales/locales_to_be_generated locales "$SUPPORTED_LOCALES" # Get the list of selected locales from /etc/locale.gen -if [ -L $LG ] && [ "$(readlink $LG)" = "/usr/share/i18n/SUPPORTED" ]; then - SELECTED_LOCALES="All locales" -else - SELECTED_LOCALES="$(echo "$GEN_LOCALES" | sort -u | tr '\n' ',' | sed -e 's/, */, /g' -e 's/, *$//g')" +if [ -e /etc/locale.gen ]; then + if [ -L $LG ] && [ "$(readlink $LG)" = "/usr/share/i18n/SUPPORTED" ]; then + SELECTED_LOCALES="All locales" + else + SELECTED_LOCALES="$(echo "$GEN_LOCALES" | sort -u | tr '\n' ',' | sed -e 's/, */, /g' -e 's/, *$//g')" + fi + db_set locales/locales_to_be_generated "$SELECTED_LOCALES" fi DEFAULT_ENVIRONMENT="$(cat /etc/environment /etc/default/locale 2>/dev/null | awk 'BEGIN {lang="None"} /^LANG=/ {gsub("\"", ""); sub("LANG=", ""); lang=$0;} END {print lang}')" DEFAULT_ENVIRONMENT="$(convert_locale "$DEFAULT_ENVIRONMENT")" - if ! echo "$SUPPORTED_LOCALES" | grep -q -e "\b$DEFAULT_ENVIRONMENT\b" ; then DEFAULT_ENVIRONMENT="None" fi - -db_set locales/locales_to_be_generated "$SELECTED_LOCALES" db_set locales/default_environment_locale "$DEFAULT_ENVIRONMENT" -db_subst locales/locales_to_be_generated locales "$SUPPORTED_LOCALES" STATE=1 while [ "$STATE" -ge 0 ]; do -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org