diff -urN ../ubuntu-git-2.23/debian/changelog debian/changelog --- ../ubuntu-git-2.23/debian/changelog 2016-03-18 22:33:46.142595746 -0600 +++ debian/changelog 2016-03-19 13:08:31.285574772 -0600 @@ -27,6 +27,39 @@ * debian/patches/ubuntu/submitted-no-stack-backtrace.diff: Rebase patch. * debian/patches/ubuntu/unsubmitted-increase-dtv-surplus.diff: Dropped. + * Evaluate and merge/drop/rebase localedata patches from langpack-locales. + - debian-*patch: Drop all langpack-locales patches copied from Debian. + - ubuntu/localedata/bn-language.patch: Rebase for glibc. + - ubuntu/localedata/ce_RU-new_locale.patch: Drop, merged upstream. + - ubuntu/localedata/ckb_IQ-new_locale.patch: Rebase for glibc. + - ubuntu/localedata/de_AT-february.patch: Drop, merged upstream. + - ubuntu/localedata/en_CA-dateformat.patch: Rebase for glibc. + - ubuntu/localedata/en_IE-am_pm.patch: Rebase for glibc. + - ubuntu/localedata/eo_US.patch: Rebase for glibc. + - ubuntu/localedata/es-decimal_point-thousands_sep.patch: Drop, merged. + - ubuntu/localedata/es_DO-am_pm.patch: Rebase for glibc. + - ubuntu/localedata/es_EV.patch: Drop, merged upstream. + - ubuntu/localedata/gd_GB-days-months.patch: Drop, merged upstream. + - ubuntu/localedata/it_IT-thousands_sep.patch: Drop, also in Debian. + - ubuntu/localedata/ln_CD-new_locale.patch: Rebase for glibc. + - ubuntu/localedata/lt_LT-currency.patch: Drop, merged upstream. + - ubuntu/localedata/lv_LV-currency.patch: Rebase for glibc. + - ubuntu/localedata/pt_BR-d_fmt.patch: Rebase for glibc. + - ubuntu/localedata/sd_PK.patch: Rebase for glibc. + - ubuntu/localedata/tr_TR-currency_symbol.patch: Drop, merged upstream. + - ubuntu/localedata/ug_CN.patch: Drop, merged upstream. + - ubuntu/localedata/ug_CN@latin.patch: Rebase for glibc. + + * Merge locales back into glibc and provide locales-all (LP: #1394929): + - debian/control.in/*: Reinstate all locales{,-all} Breaks from Debian. + - debian/control.in/main: Let locales overwrite files from old libc-bin. + - debian/debhelper.in/libc.postinst: Move locale-gen purge to locales. + - debian/debhelper.in/locales.{config,postinst}: Upgrade local locales. + - debian/debhelper.in/locales.install: Install our language-pack hooks. + - debian/rules.d/debhelper.mk: Mark our language-pack hooks executable. + - debian/local/usr_sbin/locale-gen: Add support for langpack snippets. + - debian/rules: Reinstate building locales and locales-all for Ubuntu. + -- Adam Conrad Thu, 17 Mar 2016 05:18:44 -0600 glibc (2.23-0experimental1) UNRELEASED; urgency=medium diff -urN ../ubuntu-git-2.23/debian/control debian/control --- ../ubuntu-git-2.23/debian/control 2016-03-18 22:34:14.096952088 -0600 +++ debian/control 2016-03-19 09:10:20.506759750 -0600 @@ -96,7 +96,8 @@ Section: localization Priority: standard Depends: libc-bin (>> 2.23), ${misc:Depends}, debconf | debconf-2.0 -Replaces: manpages-fr-extra (<< 20141022) +Breaks: libc-bin (<< 2.23) +Replaces: libc-bin (<< 2.23), manpages-fr-extra (<< 20141022) Build-Profiles: Description: GNU C Library: National Language (locale) data [support] Machine-readable data files, shared objects and programs used by the @@ -164,7 +165,7 @@ Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386] Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc6-i686 [i386], libc6-xen [i386], libc6-armel [armel], libc6-armhf [armhf] Conflicts: libc6-loongson2f [mipsel], libc6-xen [i386] -Breaks: nscd (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) +Breaks: nscd (<< 2.23), locales (<< 2.23), locales-all (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) Replaces: libc6-amd64 [amd64], libc6-i386 [i386], libc6-xen [i386], @@ -251,7 +252,7 @@ Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386] Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc6-i686 [i386], libc6-xen [i386], libc6-armel [armel], libc6-armhf [armhf] Conflicts: libc6-loongson2f [mipsel], libc6-xen [i386] -Breaks: nscd (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) +Breaks: nscd (<< 2.23), locales (<< 2.23), locales-all (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) Replaces: libc6-amd64 [amd64], libc6-i386 [i386], libc6-xen [i386], @@ -338,7 +339,7 @@ Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386] Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc6-i686 [i386], libc6-xen [i386], libc6-armel [armel], libc6-armhf [armhf] Conflicts: libc6-loongson2f [mipsel], libc6-xen [i386] -Breaks: nscd (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) +Breaks: nscd (<< 2.23), locales (<< 2.23), locales-all (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) Replaces: libc6-amd64 [amd64], libc6-i386 [i386], libc6-xen [i386], @@ -425,7 +426,7 @@ Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386] Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc6-i686 [i386], libc6-xen [i386], libc6-armel [armel], libc6-armhf [armhf] Conflicts: libc6-loongson2f [mipsel], libc6-xen [i386] -Breaks: nscd (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) +Breaks: nscd (<< 2.23), locales (<< 2.23), locales-all (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) Replaces: libc6-amd64 [amd64], libc6-i386 [i386], libc6-xen [i386], diff -urN ../ubuntu-git-2.23/debian/control.in/libc debian/control.in/libc --- ../ubuntu-git-2.23/debian/control.in/libc 2016-03-18 22:33:46.105595271 -0600 +++ debian/control.in/libc 2016-03-18 22:31:43.429973007 -0600 @@ -8,7 +8,7 @@ Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386] Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc6-i686 [i386], libc6-xen [i386], libc6-armel [armel], libc6-armhf [armhf] Conflicts: libc6-loongson2f [mipsel], libc6-xen [i386] -Breaks: nscd (<< @GLIBC_VERSION@), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) +Breaks: nscd (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3) Replaces: libc6-amd64 [amd64], libc6-i386 [i386], libc6-xen [i386], diff -urN ../ubuntu-git-2.23/debian/control.in/main debian/control.in/main --- ../ubuntu-git-2.23/debian/control.in/main 2016-03-18 22:34:05.526843320 -0600 +++ debian/control.in/main 2016-03-19 09:10:10.277775859 -0600 @@ -96,7 +96,8 @@ Section: localization Priority: standard Depends: libc-bin (>> @GLIBC_VERSION@), ${misc:Depends}, debconf | debconf-2.0 -Replaces: manpages-fr-extra (<< 20141022) +Breaks: libc-bin (<< 2.23) +Replaces: libc-bin (<< 2.23), manpages-fr-extra (<< 20141022) Build-Profiles: Description: GNU C Library: National Language (locale) data [support] Machine-readable data files, shared objects and programs used by the diff -urN ../ubuntu-git-2.23/debian/debhelper.in/libc-bin.install debian/debhelper.in/libc-bin.install --- ../ubuntu-git-2.23/debian/debhelper.in/libc-bin.install 2016-03-18 22:33:46.105595271 -0600 +++ debian/debhelper.in/libc-bin.install 2016-03-18 16:03:10.787156014 -0600 @@ -19,6 +19,3 @@ debian/tmp-libc/usr/sbin/zdump usr/bin debian/tmp-libc/usr/sbin/zic usr/sbin BUILD-TREE/C.UTF-8 usr/lib/locale - -debian/local/usr_sbin/update-locale usr/sbin -debian/local/usr_sbin/validlocale usr/sbin diff -urN ../ubuntu-git-2.23/debian/debhelper.in/libc.postinst debian/debhelper.in/libc.postinst --- ../ubuntu-git-2.23/debian/debhelper.in/libc.postinst 2016-03-18 22:33:46.105595271 -0600 +++ debian/debhelper.in/libc.postinst 2016-03-18 22:31:43.430973021 -0600 @@ -86,10 +86,6 @@ ln -sf spool/mail /var/mail fi if dpkg --compare-versions "$preversion" lt GLIBC_VERSION; then - # LP #504198; purge locales between major versions - if which locale-gen >/dev/null; then - locale-gen --purge - fi # give a reboot notification on major version upgrades if [ -x /usr/share/update-notifier/notify-reboot-required ]; then /usr/share/update-notifier/notify-reboot-required diff -urN ../ubuntu-git-2.23/debian/debhelper.in/locales.config debian/debhelper.in/locales.config --- ../ubuntu-git-2.23/debian/debhelper.in/locales.config 2016-01-27 07:17:05.351917004 -0700 +++ debian/debhelper.in/locales.config 2016-03-19 12:51:36.809871781 -0600 @@ -34,12 +34,20 @@ GEN_LOCALES="$(convert_locale "$GEN_LOCALES")" fi +# This upgrades from Ubuntu << 16.04, where locale-gen wrote user locales +# to /var/lib/locales/supported.d/local, but we want them in /etc/locale.gen +if [ -f /var/lib/locales/supported.d/local ]; then + LOCAL_LOCALES="$(sed -e '/^[a-zA-Z]/!d' -e 's/ *$//g' /var/lib/locales/supported.d/local)" + LOCAL_LOCALES="$(convert_locale "$LOCAL_LOCALES")" + GEN_LOCALES=$(printf '%s\n' "$GEN_LOCALES" "$LOCAL_LOCALES") +fi + # List of supported locales (PROVIDED_LOCALES + USER_LOCALES + GEN_LOCALES) SUPPORTED_LOCALES="$(printf '%s\n' "$PROVIDED_LOCALES" "$USER_LOCALES" "$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 [ -e /etc/locale.gen ]; then +if [ -e /etc/locale.gen -o -f /var/lib/locales/supported.d/local ]; then if [ -L $LG ] && [ "$(readlink $LG)" = "/usr/share/i18n/SUPPORTED" ]; then SELECTED_LOCALES="All locales" else diff -urN ../ubuntu-git-2.23/debian/debhelper.in/locales.install debian/debhelper.in/locales.install --- ../ubuntu-git-2.23/debian/debhelper.in/locales.install 2016-01-27 07:17:05.351917004 -0700 +++ debian/debhelper.in/locales.install 2016-03-19 08:59:10.202252577 -0600 @@ -3,3 +3,5 @@ debian/local/usr_sbin/locale-gen usr/sbin debian/local/usr_sbin/update-locale usr/sbin debian/local/usr_sbin/validlocale usr/sbin +debian/local/usr_share_locales/install-language-pack usr/share/locales +debian/local/usr_share_locales/remove-language-pack usr/share/locales diff -urN ../ubuntu-git-2.23/debian/debhelper.in/locales.postinst debian/debhelper.in/locales.postinst --- ../ubuntu-git-2.23/debian/debhelper.in/locales.postinst 2016-01-27 07:17:05.351917004 -0700 +++ debian/debhelper.in/locales.postinst 2016-03-19 12:14:21.928868447 -0600 @@ -73,6 +73,11 @@ update-locale "LANG=$DEFAULT_ENVIRONMENT" fi fi + # Remove cruft from locales from Ubuntu << 16.04: + if dpkg --compare-versions "$2" lt 2.23; then + rm -f /var/lib/locales/supported.d/local + rm -rf /var/lib/belocs + fi fi #DEBHELPER# diff -urN ../ubuntu-git-2.23/debian/local/manpages/locale-gen.8 debian/local/manpages/locale-gen.8 --- ../ubuntu-git-2.23/debian/local/manpages/locale-gen.8 2016-01-27 07:17:05.353916985 -0700 +++ debian/local/manpages/locale-gen.8 2016-03-19 09:03:30.303226430 -0600 @@ -86,6 +86,13 @@ line that is not empty and does not begin with a # is treated as a locale definition that is to be built. +\fB/var/lib/locales/supported.d/\fP +.PP +A directory containing locale.gen snippets provided by language-pack +packages. Do not edit these manually, they will be overwritten on +package upgrades. +.PP + .SH "SEE ALSO" .PP localedef(1), locale(1), locale.gen(5). diff -urN ../ubuntu-git-2.23/debian/local/usr_sbin/locale-gen debian/local/usr_sbin/locale-gen --- ../ubuntu-git-2.23/debian/local/usr_sbin/locale-gen 2016-01-27 07:17:05.355916967 -0700 +++ debian/local/usr_sbin/locale-gen 2016-03-19 13:16:22.890784623 -0600 @@ -5,6 +5,7 @@ LOCALEGEN=/etc/locale.gen LOCALES=/usr/share/i18n/locales USER_LOCALES=/usr/local/share/i18n/locales +SUPPORTED=/var/lib/locales/supported.d if [ -n "$POSIXLY_CORRECT" ]; then unset POSIXLY_CORRECT fi @@ -16,6 +17,7 @@ KEEP= if [ "$1" = '--keep-existing' ]; then KEEP=1 + shift fi if [ -z "$KEEP" ]; then @@ -35,8 +37,20 @@ fi } +GENERATE= +if [ -z "$1" ]; then + GENERATE="`cat $SUPPORTED/* $LOCALEGEN 2>/dev/null || true`" +else + while [ -n "$1" ]; do + if [ -f "$SUPPORTED/$1" ]; then + GENERATE="`cat $SUPPORTED/$1`" + fi + shift + done +fi + echo "Generating locales (this might take a while)..." -while read locale charset; do \ +/bin/echo -e "$GENERATE" | sort -u | while read locale charset; do \ case $locale in \#*) continue;; "") continue;; esac; \ is_entry_ok || continue if [ "$KEEP" ] && PERL_BADLANG=0 perl -MPOSIX -e \ @@ -59,5 +73,5 @@ fi localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale || :; \ echo ' done'; \ -done < $LOCALEGEN +done echo "Generation complete." diff -urN ../ubuntu-git-2.23/debian/local/usr_share_locales/install-language-pack debian/local/usr_share_locales/install-language-pack --- ../ubuntu-git-2.23/debian/local/usr_share_locales/install-language-pack 1969-12-31 17:00:00.000000000 -0700 +++ debian/local/usr_share_locales/install-language-pack 2016-03-19 09:20:47.421226377 -0600 @@ -0,0 +1,19 @@ +#!/bin/sh -e + +if [ -z "$1" ]; then + echo "Usage: $0 []" + exit 0 +fi + +# install locales for base packages (not for gnome/kde) +if [ -z "$2" ]; then + # Update requested locales if locales-all is not installed + if dpkg-query -s locales-all >/dev/null 2>&1 ; then + echo "locales-all installed, skipping locales generation" + else + /usr/sbin/locale-gen --keep-existing "$1" + fi +fi + +# ensure that .desktop caches are up to date +dpkg-trigger gmenucache || true diff -urN ../ubuntu-git-2.23/debian/local/usr_share_locales/remove-language-pack debian/local/usr_share_locales/remove-language-pack --- ../ubuntu-git-2.23/debian/local/usr_share_locales/remove-language-pack 1969-12-31 17:00:00.000000000 -0700 +++ debian/local/usr_share_locales/remove-language-pack 2016-03-19 08:56:53.895794164 -0600 @@ -0,0 +1,68 @@ +#!/bin/sh -e + +if [ -z "$1" ]; then + echo "Usage: $0 []" + exit 0 +fi + +# Copied from locale-gen +normalize_locale() { + # Insert a leading x in case $1 begins with a dash + this_locale=x$1 + charset= + if echo $this_locale | LC_ALL=C grep '\.' > /dev/null 2>&1; then + charset=$(echo $this_locale | sed -e 's/^x//' -e 's/.*\(\.[^@]*\).*/\1/' | LC_ALL=C tr '[A-Z]' '[a-z]' | LC_ALL=C sed -e 's/[^a-z0-9.]//g') + fi + modifier= + if echo $this_locale | LC_ALL=C grep '@' > /dev/null 2>&1; then + modifier=$(echo $this_locale | sed -e 's/^x//' -e 's/.*\(@[^.]*\).*/\1/') + fi + main=$(echo $this_locale | sed -e 's/^x//' -e 's/[.@].*//') + echo $main$charset$modifier +} + +get_supported_local_normalized() { + [ -e /etc/locale.gen ] || return 0 + sort -u /etc/locale.gen | while read locale charset; do + case $locale in + \#*) continue ;; + "") continue ;; + esac + normalize_locale "$locale" + done +} + +remove_locale() { + this_locale=$(normalize_locale "$1") + if ! echo "$supported_local_normalized" | fgrep -qx "$this_locale"; then + if [ -e /usr/lib/locale/locale-archive ]; then + localedef --delete-from-archive "$this_locale" + fi + fi +} + +# remove binary locales +# do nothing for gnome/kde +if [ -z "$2" ]; then + # do not remove locales if we merely remove language-support-* without + # removing language-pack-* + if [ ! -e /var/lib/locales/supported.d/$1 ]; then + supported_local_normalized="$(get_supported_local_normalized)" + if [ "$1" = 'zh-hans' ]; then + remove_locale zh_CN.utf8 + remove_locale zh_SG.utf8 + elif [ "$1" = 'zh-hant' ]; then + remove_locale zh_HK.utf8 + remove_locale zh_TW.utf8 + else + if [ -e /usr/lib/locale/locale-archive ]; then + for l in $(localedef --list-archive|grep "^$1[._@]"); do + remove_locale "$l" + done + fi + fi + fi +fi + +# ensure that .desktop caches are up to date +dpkg-trigger gmenucache || true diff -urN ../ubuntu-git-2.23/debian/patches/series debian/patches/series --- ../ubuntu-git-2.23/debian/patches/series 2016-03-18 22:33:46.106595284 -0600 +++ debian/patches/series 2016-03-19 10:18:28.083121962 -0600 @@ -222,3 +222,14 @@ ubuntu/submitted-no-sprintf-pre-truncate.diff ubuntu/submitted-no-stack-backtrace.diff ubuntu/local-warn-bsd-source.diff +ubuntu/localedata/bn-language.diff +ubuntu/localedata/ckb_IQ-new_locale.diff +ubuntu/localedata/en_CA-dateformat.diff +ubuntu/localedata/en_IE-am_pm.diff +ubuntu/localedata/eo_US.diff +ubuntu/localedata/es_DO-am_pm.diff +ubuntu/localedata/ln_CD-new_locale.diff +ubuntu/localedata/lv_LV-currency.diff +ubuntu/localedata/pt_BR-d_fmt.diff +ubuntu/localedata/sd_PK.diff +ubuntu/localedata/ug_CN@latin.diff diff -urN ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/bn-language.diff debian/patches/ubuntu/localedata/bn-language.diff --- ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/bn-language.diff 1969-12-31 17:00:00.000000000 -0700 +++ debian/patches/ubuntu/localedata/bn-language.diff 2016-03-19 10:10:50.175965728 -0600 @@ -0,0 +1,32 @@ +Description: Use the official name Bangla for the language spoken in Bangladesh +Bug-Ubuntu: https://launchpad.net/bugs/991002, https://launchpad.net/bugs/1070581 +Forwarded: http://sourceware.org/bugzilla/show_bug.cgi?id=14925 +Author: Gunnar Hjalmarsson + +Index: langpack-locales/locales/bn_BD +=================================================================== +--- a/localedata/locales/bn_BD 2012-03-06 09:21:51.000000000 +0100 ++++ b/localedata/locales/bn_BD 2013-02-02 09:29:30.968480519 +0100 +@@ -11,7 +11,7 @@ + email "taneem@bengalinux.org, jamil@bengalinux.org" + tel "" + fax "" +-language "Bengali/Bangla" ++language "Bangla" + territory "Bangladesh" + revision "0.5" + date "2007-01-10" + +Index: langpack-locales/locales/bn_IN +=================================================================== +--- a/localedata/locales/bn_IN 2012-03-06 10:10:18.000000000 +0100 ++++ b/localedata/locales/bn_IN 2013-02-02 09:30:45.764851414 +0100 +@@ -13,7 +13,7 @@ + email "bug-glibc-locales@gnu.org" + tel "" + fax "" +-language "Bengali" ++language "Bangla" + territory "India" + revision "1.0" + date "2006-05-29" diff -urN ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/ckb_IQ-new_locale.diff debian/patches/ubuntu/localedata/ckb_IQ-new_locale.diff --- ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/ckb_IQ-new_locale.diff 1969-12-31 17:00:00.000000000 -0700 +++ debian/patches/ubuntu/localedata/ckb_IQ-new_locale.diff 2016-03-19 10:16:39.757699027 -0600 @@ -0,0 +1,488 @@ +Description: Add the ckb_IQ locale +Bug-Ubuntu: https://launchpad.net/bugs/1388808 +Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=9809 +Author: Gunnar Hjalmarsson + +diff -Nru langpack-locales.orig/locales/ckb_IQ langpack-locales/locales/ckb_IQ +--- a/localedata/locales/ckb_IQ 1970-01-01 01:00:00.000000000 +0100 ++++ b/localedata/locales/ckb_IQ 2014-11-03 20:10:04.011565898 +0100 +@@ -0,0 +1,468 @@ ++comment_char % ++escape_char / ++% ++% ++%%%%%%%%%%%%%%%% local Definition ku_ckb | ckb_iq | ckb_ir %%%%%%%%%%%%%%%%%%%%%%% ++% FOR ALL KURDISH DIALECTS USING ARABIC ALPHABETS ++% Kurdish language locale for Iraq and Iran (using arabic letters): ++% KU_CKB, KU_BA, KU_HO, KU_LU ++% Contributed by Aras Noori ++% Filename: ckb_iq ++% Locale name: ckb_iq.UTF-8 ++% Language: kurdish sorani ++% Language abbrivation: KU-AR(Kurdish - Arabic letters) ++% Charset: UTF-8 ++% Creation Date: 2009-11-03 ++% History: ++% January 2009: Defining CKB locale ++% March 2009: Adding rule for CKB ++% October 2009: bug fixing and redefine ++% April 2010 fixing "not found category" problems ++% March 2011 fixing all bugs ++% Sept 2014: fixing alphabet and unicode bugs ++% Oct 2014: fixing Address and fmt_name issues ++ ++LC_IDENTIFICATION ++title "Kurdish language locale based on Arabic letters" ++source "Aras Noori" ++address "see e-mail" ++contact "Aras Noori" ++email "aras.noori@gmail.com" ++tel "+49 17629857380" ++fax "" ++language "Kurdish" ++territory "Iraq, Iran" ++revision "0.8" ++date "2014-09-20" ++ ++category "ckb_IQ:2000";LC_IDENTIFICATION ++category "ckb_IQ:2000";LC_CTYPE ++category "ckb_IQ:2000";LC_COLLATE ++category "ckb_IQ:2000";LC_MONETARY ++category "ckb_IQ:2000";LC_NUMERIC ++category "ckb_IQ:2000";LC_TIME ++category "ckb_IQ:2000";LC_MESSAGES ++category "ckb_IQ:2000";LC_PAPER ++category "ckb_IQ:2000";LC_NAME ++category "ckb_IQ:2000";LC_ADDRESS ++category "ckb_IQ:2000";LC_TELEPHONE ++category "ckb_IQ:2000";LC_MEASUREMENT ++ ++END LC_IDENTIFICATION ++ ++LC_CTYPE ++copy "i18n" ++END LC_CTYPE ++ ++LC_COLLATE ++% The Kurdish Sorani, Bahdini, and others dialects is mainly written using a modified (Arabic-based alphabet) with 33 letters. ++% Unlike the regular Arabic alphabet, which is an abjad, kurdish is an alphabet in which vowels are mandatory, making the script easy to read. ++% ++% The kurdish alphabet order is: ++% in Latin: a, b, c, ç, d, e, ê, f, g, h, i, î, j, k, l, ll, m, n, o, p, q, r, rr, s, sh, t, u, uu, v, w, x, y, z ++% vowels: A, E, I, O, U, UU ++% ++% Copy the template from ISO/IEC 14651 ++ ++order_start forward; forward ++% ++% Kurdish numeric characters. ++% ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++% ++% Characters from space to / and from : to ~ and nbsp. ++% ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++% ++% Kurish alphabet order. ++% ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++% ++ % ++ % English numeric characters. ++ % ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ % ++ % ++ % English alphabet. ++ % ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ ; ++ % ++ % ++ % Other control characters etc. upto order_end ++ % ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ IGNORE ++order_end ++ ++END LC_COLLATE ++ ++LC_MONETARY ++int_curr_symbol "" ++currency_symbol "" ++mon_decimal_point "" ++mon_thousands_sep "" ++mon_grouping 3 ++positive_sign "" ++negative_sign "" ++int_frac_digits 3 ++frac_digits 3 ++p_cs_precedes 1 ++p_sep_by_space 1 ++n_cs_precedes 1 ++n_sep_by_space 1 ++p_sign_posn 1 ++n_sign_posn 2 ++ ++END LC_MONETARY ++ ++ ++LC_NUMERIC ++% This is the POSIX Locale definition for the LC_NUMERIC category. ++decimal_point "" ++thousands_sep "" ++grouping 3 ++END LC_NUMERIC ++ ++ ++LC_TIME ++% This is the POSIX Locale definition for the LC_TIME category. ++% These are generated based on XML base Locale difintion file ++% ++% Abbreviated weekday names ++abday "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++% ++% Full weekday names ++day "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++% ++% Abbreviated month names ++abmon "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++% ++% Full month names ++mon "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++% ++% Equivalent of AM PM ++am_pm "";"" ++% ++% Appropriate date and time representation ++d_t_fmt "/ ++/ ++" ++% ++% Appropriate date representation(%x) ++% "%Oy/%Om/%Od" ++d_fmt "" ++% ++% Appropriate time representation ++% ++t_fmt "/ ++" ++% ++% Appropriate 12 h time representation ++t_fmt_ampm "/ ++" ++% ++% Appropriate date representation ++date_fmt "/ ++/ ++/ ++" ++ ++% FIXME: found in CLDR ++first_weekday 7 ++first_workday 7 ++cal_direction 3 ++END LC_TIME ++ ++ ++LC_MESSAGES ++yesexpr "" ++noexpr "" ++END LC_MESSAGES ++ ++ ++LC_PAPER ++% This is the ISO_IEC TR14652 Locale definition for the ++height 297 ++width 210 ++END LC_PAPER ++ ++ ++LC_NAME ++% This is the ISO_IEC TR14652 Locale definition for the ++% LC_NAME category. ++% ++name_fmt "/ ++" ++name_gen "" ++name_miss "" ++name_ms "" ++name_mrs "" ++name_mr "" ++END LC_NAME ++% ++LC_ADDRESS ++% This is the ISO_IEC TR14652 Locale definition for the ++postal_fmt "/ ++" ++country_ab2 "" ++country_ab3 "" ++country_post "" ++country_num 368 ++country_car "" ++% ++END LC_ADDRESS ++ ++ ++LC_TELEPHONE ++% ++tel_int_fmt "/ ++" ++tel_dom_fmt "" ++int_select "" ++int_prefix "" ++ ++END LC_TELEPHONE ++ ++ ++LC_MEASUREMENT ++% This is the ISO_IEC TR14652 Locale definition ++% ++measurement 1 ++ ++END LC_MEASUREMENT +diff -Nru langpack-locales.orig/SUPPORTED langpack-locales/SUPPORTED +--- a/localedata/SUPPORTED 2014-11-04 02:20:10.983097932 +0100 ++++ b/localedata/SUPPORTED 2014-11-04 02:29:38.337911294 +0100 +@@ -80,6 +80,7 @@ + ca_IT.UTF-8/UTF-8 \ + ca_IT/ISO-8859-15 \ + ce_RU/UTF-8 \ ++ckb_IQ/UTF-8 \ + cmn_TW/UTF-8 \ + crh_UA/UTF-8 \ + cs_CZ.UTF-8/UTF-8 \ diff -urN ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/en_CA-dateformat.diff debian/patches/ubuntu/localedata/en_CA-dateformat.diff --- ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/en_CA-dateformat.diff 1969-12-31 17:00:00.000000000 -0700 +++ debian/patches/ubuntu/localedata/en_CA-dateformat.diff 2016-03-19 10:11:44.846767566 -0600 @@ -0,0 +1,16 @@ +# Description: en_CA date format should be "%Y-%m-%d" +# Reference: http://www.fin.gov.nt.ca/documents/ocio/ppsg/6003.00.12%20-%20Standard%20-%20Date%20and%20Time%20Attachments.pdf +# Ubuntu: https://launchpad.net/bugs/214730 +# Last modified: 2014-09-10 + +--- a/localedata/locales/en_CA 2012-03-06 10:10:19.000000000 +0100 ++++ b/localedata/locales/en_CA 2014-09-10 00:23:48.815221534 +0200 +@@ -125,7 +125,7 @@ + "";/ + "" + d_t_fmt "" +-d_fmt "" ++d_fmt "" + t_fmt "" + am_pm "";"" + t_fmt_ampm "" diff -urN ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/en_IE-am_pm.diff debian/patches/ubuntu/localedata/en_IE-am_pm.diff --- ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/en_IE-am_pm.diff 1969-12-31 17:00:00.000000000 -0700 +++ debian/patches/ubuntu/localedata/en_IE-am_pm.diff 2016-03-19 10:12:02.817702434 -0600 @@ -0,0 +1,14 @@ +# Description: Add am_pm for en_IE. +# Ubuntu: https://launchpad.net/bugs/199899 +# Upstream: http://sourceware.org/bugzilla/show_bug.cgi?id=3236 +--- a/localedata/locales/en_IE ++++ b/localedata/locales/en_IE +@@ -110,7 +110,7 @@ mon "";/ + d_t_fmt "" + d_fmt "" + t_fmt "" +-am_pm "";"" ++am_pm "";"" + t_fmt_ampm "" + date_fmt "/ + / diff -urN ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/eo_US.diff debian/patches/ubuntu/localedata/eo_US.diff --- ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/eo_US.diff 1969-12-31 17:00:00.000000000 -0700 +++ debian/patches/ubuntu/localedata/eo_US.diff 2016-03-19 11:07:31.697596224 -0600 @@ -0,0 +1,257 @@ +# Description: Add eo_US locale. +# Ubuntu: https://launchpad.net/bugs/1918 +Index: langpack-locales/locales/eo_US +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ b/localedata/locales/eo_US 2011-11-16 08:42:33.089335550 +0100 +@@ -0,0 +1,238 @@ ++comment_char % ++escape_char / ++ ++% Esperanto language locale for the USA ++% Contributed by David Mandelberg ++% based on eo_EO by Edmund GRIMLEY EVANS ++% with help from en_US by Ulrich Drepper ++ ++LC_IDENTIFICATION ++title "Esperanto locale for the USA" ++source "" ++address "" ++contact "" ++email "debian-esperanto@lists.debian.org" ++tel "" ++fax "" ++language "Esperanto" ++territory "USA" ++revision "draft" ++date "2005-08-27" ++% ++category "eo_US:2000";LC_IDENTIFICATION ++category "eo_US:2000";LC_CTYPE ++category "eo_US:2000";LC_COLLATE ++category "eo_US:2000";LC_TIME ++category "eo_US:2000";LC_NUMERIC ++category "eo_US:2000";LC_MONETARY ++category "eo_US:2000";LC_MESSAGES ++category "eo_US:2000";LC_PAPER ++category "eo_US:2000";LC_NAME ++category "eo_US:2000";LC_ADDRESS ++category "eo_US:2000";LC_TELEPHONE ++ ++END LC_IDENTIFICATION ++ ++LC_CTYPE ++copy "i18n" ++END LC_CTYPE ++ ++LC_COLLATE ++copy "iso14651_t1" ++ ++collating-symbol ++collating-symbol ++collating-symbol ++collating-symbol ++collating-symbol ++collating-symbol ++ ++reorder-after ++ ++reorder-after ++ ++reorder-after ++ ++reorder-after ++ ++reorder-after ++ ++reorder-after ++ ++ ++reorder-after ++ ;;;IGNORE % Ĉ ++reorder-after ++ ;;;IGNORE % ĉ ++reorder-after ++ ;;;IGNORE % Ĝ ++reorder-after ++ ;;;IGNORE % ĝ ++reorder-after ++ ;;;IGNORE % Ĥ ++reorder-after ++ ;;;IGNORE % ĥ ++reorder-after ++ ;;;IGNORE % Ĵ ++reorder-after ++ ;;;IGNORE % ĵ ++reorder-after ++ ;;;IGNORE % Ŝ ++reorder-after ++ ;;;IGNORE % ŝ ++reorder-after ++ ;;;IGNORE % Ŭ ++reorder-after ++ ;;;IGNORE % ŭ ++ ++reorder-end ++ ++END LC_COLLATE ++ ++LC_MONETARY ++int_curr_symbol "" % "USD " ++currency_symbol "" % "$" ++% "" ne eblas en ISO-8859-3 ++mon_decimal_point "" % . ++mon_thousands_sep "" % , ++mon_grouping 3;3 ++positive_sign "" ++negative_sign "" ++int_frac_digits 2 ++frac_digits 2 ++p_cs_precedes 1 ++p_sep_by_space 0 ++n_cs_precedes 1 ++int_n_sep_by_space 1 ++n_sep_by_space 0 ++p_sign_posn 1 ++n_sign_posn 1 ++END LC_MONETARY ++ ++LC_NUMERIC ++decimal_point "" ++thousands_sep "" ++grouping 3;3 ++END LC_NUMERIC ++ ++LC_TIME ++ ++% "dim";"lun";"mar";"mer";"ĵaŭ";"ven";"sab" ++abday "";"";/ ++ "";"";/ ++ "";"";/ ++ "" ++ ++% "dimanĉo";"lundo";"mardo";"merkredo";"ĵaŭdo";"vendredo";"sabato" ++day "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++ ++% "Jan";"Feb";"Mar";"Apr";"Maj";"Jun";"Jul";"Aŭg";"Sep";"Okt";"Nov";"Dec" ++abmon "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"";/ ++ "";"" ++ ++% "Januaro";"Februaro";"Marto";"Aprilo";"Majo";"Junio"; ++% "Julio";"Aŭgusto";"Septembro";"Oktobro";"Novembro";"Decembro" ++mon "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++ ++am_pm "";"" ++ ++% "%a %d %b %Y %T %z" ++d_t_fmt "" ++ ++% "%m/%d/%Y" ++d_fmt "" ++ ++% "%r" ++t_fmt "" ++ ++% "%I:%M:%S %p" ++t_fmt_ampm "/ ++" ++ ++% "AM";"PM" ++am_pm "";"" ++ ++% "%a %b %e %H:%M:%S %Z %Y" ++date_fmt "/ ++/ ++" ++END LC_TIME ++ ++LC_MESSAGES ++% "^[JjYy].*" ++yesexpr "" ++% "^[Nn].*" ++noexpr "" ++END LC_MESSAGES ++ ++LC_PAPER ++height 279 ++width 216 ++END LC_PAPER ++ ++LC_TELEPHONE ++% "+%c (%a) %l" ++tel_int_fmt "/ ++" ++% "(%a) %l" ++tel_dom_fmt "" ++% "11" ++int_select "" ++% "1" ++int_prefix "" ++END LC_TELEPHONE ++ ++LC_MEASUREMENT ++measurement 2 ++END LC_MEASUREMENT ++ ++LC_NAME ++% "%d%t%g%t%m%t%f" ++name_fmt "/ ++" ++name_mr "" % "s-ro" ++name_mrs "" % "s-ino" ++name_ms "" % "s-ino" ++END LC_NAME ++ ++LC_ADDRESS ++% "%f%N%a%N%d%N%b%N%s %h %e %r%N%%z %T%N%c%N" ++postal_fmt "/ ++/ ++/ ++/ ++" ++country_name "" % "USA" ++country_post "" % "USA" ++country_ab2 "" % "US" ++country_ab3 "" % "USA" ++country_num 840 ++country_car "" % "USA" ++country_isbn 0 ++% "Esperanto" ++lang_name "" ++lang_ab "" % "eo" ++lang_term "" % "epo" ++lang_lib "" % "epo" ++END LC_ADDRESS +Index: langpack-locales/SUPPORTED +=================================================================== +--- a/localedata/SUPPORTED 2011-11-16 08:42:27.697335289 +0100 ++++ b/localedata/SUPPORTED 2011-11-16 08:42:33.093335550 +0100 +@@ -145,6 +145,7 @@ + en_ZW/ISO-8859-1 \ + eo.UTF-8/UTF-8 \ + eo/ISO-8859-3 \ ++eo_US.UTF-8/UTF-8 \ + es_AR.UTF-8/UTF-8 \ + es_AR/ISO-8859-1 \ + es_BO.UTF-8/UTF-8 \ diff -urN ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/es_DO-am_pm.diff debian/patches/ubuntu/localedata/es_DO-am_pm.diff --- ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/es_DO-am_pm.diff 1969-12-31 17:00:00.000000000 -0700 +++ debian/patches/ubuntu/localedata/es_DO-am_pm.diff 2016-03-19 10:12:44.011553145 -0600 @@ -0,0 +1,20 @@ +Description: Define 12-hours a.m./p.m. format +Bug-Ubuntu: https://launchpad.net/bugs/1288843 +Forwarded: http://sourceware.org/bugzilla/show_bug.cgi?id=16045 +Author: Gunnar Hjalmarsson + +--- a/localedata/locales/es_DO 2012-03-06 10:10:20.000000000 +0100 ++++ b/localedata/locales/es_DO 2014-03-09 01:03:37.309958275 +0100 +@@ -114,8 +114,10 @@ + d_t_fmt "" + d_fmt "" + t_fmt "" +-am_pm "";"" +-t_fmt_ampm "" ++% a.m., p.m. ++am_pm "";"" ++% %I:%M:%S %p ++t_fmt_ampm "" + date_fmt "/ + / + " diff -urN ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/ln_CD-new_locale.diff debian/patches/ubuntu/localedata/ln_CD-new_locale.diff --- ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/ln_CD-new_locale.diff 1969-12-31 17:00:00.000000000 -0700 +++ debian/patches/ubuntu/localedata/ln_CD-new_locale.diff 2016-03-19 10:13:25.218403824 -0600 @@ -0,0 +1,214 @@ +Description: Add the ln_CD locale +Bug-Ubuntu: https://launchpad.net/bugs/1491880 +Bug: sourceware.org/bugzilla/show_bug.cgi?id=12676 +Author: René Manassé GALEKWA + +diff -Nru langpack-locales.orig/locales/ln_CD langpack-locales/locales/ln_CD +--- a/localedata/locales/ln_CD 1970-01-01 01:00:00.000000000 +0100 ++++ b/localedata/locales/ln_CD 2015-09-03 21:01:05.371322549 +0200 +@@ -0,0 +1,194 @@ ++comment_char % ++escape_char / ++% ++% Lingala Language Locale for Democratic Republic of Congo ++% Source: RAP ++% Language:ln ++% Contact: Ubuntu DR Congo Team ++% Address: 44 avenu de la Democratie ++% 14898 Kinshasa ++% Email: renemanasse@gmail.com ++% Territory: CD ++% Revision: 1.0 ++% Date: 2015-09-03 ++% Users: general ++% Charset: UTF-8 ++% Authors: ++% 2000-09-03,renemanasse@gmail.com ++% ++% ++% Distribution and use is free, also ++% for commercial purposes. ++ ++LC_IDENTIFICATION ++title "Lingala locale for Democratic Republic of Congo" ++source "RAP" ++address "" ++contact "loco.ubuntu.com/teams/ubuntu-cd" ++email "renemanasse@gmail.com" ++tel "" ++fax "" ++language "Lingala" ++territory "Democratic Republic of Congo" ++revision "1.0" ++date "2015-09-03" ++% ++category "lin_CD:2000";LC_IDENTIFICATION ++category "lin_CD:2000";LC_CTYPE ++category "lin_CD:2000";LC_COLLATE ++category "lin_CD:2000";LC_TIME ++category "lin_CD:2000";LC_NUMERIC ++category "lin_CD:2000";LC_MONETARY ++category "lin_CD:2000";LC_MESSAGES ++category "lin_CD:2000";LC_PAPER ++category "lin_CD:2000";LC_NAME ++category "lin_CD:2000";LC_ADDRESS ++category "lin_CD:2000";LC_TELEPHONE ++category "lin_CD:2000";LC_MEASUREMENT ++ ++END LC_IDENTIFICATION ++ ++LC_CTYPE ++copy "i18n" ++ ++translit_start ++ ++include "translit_combining";"" ++ ++translit_end ++ ++END LC_CTYPE ++ ++LC_COLLATE ++% Copy the template from ISO/IEC 14651 ++copy "iso14651_t1" ++END LC_COLLATE ++ ++LC_MESSAGES ++yesexpr "" ++noexpr "" ++END LC_MESSAGES ++ ++LC_MONETARY ++int_curr_symbol "" ++currency_symbol "" ++mon_decimal_point "" ++mon_thousands_sep "" ++mon_grouping 3 ++positive_sign "" ++negative_sign "" ++int_frac_digits 2 ++frac_digits 2 ++p_cs_precedes 0 ++p_sep_by_space 1 ++n_cs_precedes 0 ++n_sep_by_space 1 ++p_sign_posn 1 ++n_sign_posn 1 ++END LC_MONETARY ++ ++LC_NUMERIC ++decimal_point "" ++thousands_sep "" ++grouping 3 ++END LC_NUMERIC ++ ++LC_TIME ++abday "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++day "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++abmon "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++mon "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++d_t_fmt "" ++d_fmt "" ++t_fmt "" ++am_pm "";"" ++t_fmt_ampm "" ++date_fmt "/ ++/ ++/ ++" ++ ++week 7;19971130;4 ++first_weekday 2 ++first_workday 2 ++END LC_TIME ++ ++LC_PAPER ++height 297 ++width 210 ++END LC_PAPER ++ ++LC_TELEPHONE ++tel_int_fmt "/ ++" ++tel_dom_fmt "" ++int_prefix "" ++int_select "" ++END LC_TELEPHONE ++ ++LC_MEASUREMENT ++measurement 1 ++END LC_MEASUREMENT ++ ++LC_NAME ++name_fmt "/ ++" ++name_gen "" ++name_mr "" ++name_mrs "" ++name_miss "" ++name_ms "" ++END LC_NAME ++ ++LC_ADDRESS ++postal_fmt "/ ++/ ++/ ++/ ++" ++country_ab2 "" ++country_ab3 "" ++country_num 250 ++country_name "" ++country_car "" ++country_post "" ++country_isbn 2 ++lang_name "" ++lang_ab "" ++lang_term "" ++lang_lib "" ++END LC_ADDRESS +diff -Nru langpack-locales.orig/SUPPORTED langpack-locales/SUPPORTED +--- a/localedata/SUPPORTED 2012-03-06 10:10:17.000000000 +0100 ++++ b/localedata/SUPPORTED 2015-09-03 21:12:13.148262703 +0200 +@@ -280,6 +280,7 @@ + li_BE/UTF-8 \ + li_NL/UTF-8 \ + lij_IT/UTF-8 \ ++ln_CD/UTF-8 \ + lo_LA/UTF-8 \ + lt_LT.UTF-8/UTF-8 \ + lt_LT/ISO-8859-13 \ diff -urN ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/lv_LV-currency.diff debian/patches/ubuntu/localedata/lv_LV-currency.diff --- ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/lv_LV-currency.diff 1969-12-31 17:00:00.000000000 -0700 +++ debian/patches/ubuntu/localedata/lv_LV-currency.diff 2016-03-19 10:13:39.802350979 -0600 @@ -0,0 +1,37 @@ +Description: Changed to currency EUR/‬€ +Bug-Ubuntu: https://launchpad.net/bugs/1264551 +Forwarded: https://sourceware.org/bugzilla/show_bug.cgi?id=16374 +Author: Gunnar Hjalmarsson + +--- a/localedata/locales/lv_LV 2012-03-06 10:10:19.000000000 +0100 ++++ b/localedata/locales/lv_LV 2014-09-28 22:37:43.021365004 +0200 +@@ -2122,8 +2122,10 @@ + END LC_CTYPE + + LC_MONETARY +-int_curr_symbol "" +-currency_symbol "" ++% EUR ++int_curr_symbol "" ++% € ++currency_symbol "" + mon_decimal_point "" + mon_thousands_sep "" + mon_grouping 3;3 +@@ -2131,12 +2133,12 @@ + negative_sign "" + int_frac_digits 2 + frac_digits 2 +-p_cs_precedes 1 ++p_cs_precedes 0 + p_sep_by_space 1 +-n_cs_precedes 1 ++n_cs_precedes 0 + n_sep_by_space 1 +-p_sign_posn 3 +-n_sign_posn 3 ++p_sign_posn 1 ++n_sign_posn 1 + END LC_MONETARY + + LC_NUMERIC diff -urN ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/pt_BR-d_fmt.diff debian/patches/ubuntu/localedata/pt_BR-d_fmt.diff --- ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/pt_BR-d_fmt.diff 1969-12-31 17:00:00.000000000 -0700 +++ debian/patches/ubuntu/localedata/pt_BR-d_fmt.diff 2016-03-19 10:13:52.594304628 -0600 @@ -0,0 +1,16 @@ +Description: Change d_fmt delimiter from - to / +Bug-Ubuntu: https://launchpad.net/bugs/1101134 +Forwarded: https://sourceware.org/bugzilla/show_bug.cgi?id=17438 +Author: Gunnar Hjalmarsson + +--- a/localedata/locales/pt_BR 2012-03-06 10:10:19.000000000 +0100 ++++ b/localedata/locales/pt_BR 2014-09-27 09:30:29.863838693 +0200 +@@ -113,7 +113,7 @@ + "";/ + "" + d_t_fmt "" +-d_fmt "" ++d_fmt "" + t_fmt "" + am_pm "";"" + t_fmt_ampm "" diff -urN ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/sd_PK.diff debian/patches/ubuntu/localedata/sd_PK.diff --- ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/sd_PK.diff 1969-12-31 17:00:00.000000000 -0700 +++ debian/patches/ubuntu/localedata/sd_PK.diff 2016-03-19 10:14:16.579217725 -0600 @@ -0,0 +1,238 @@ +Description: Add sd_PK locale +Author: Abdul-Rahim Nizamani +Bug: http://sourceware.org/bugzilla/show_bug.cgi?id=11660 +Bug-Ubuntu: https://launchpad.net/bugs/588910 + +Index: langpack-locales/locales/sd_PK +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ a/localedata/locales/sd_PK 2011-11-16 08:42:42.133335987 +0100 +@@ -0,0 +1,216 @@ ++comment_char % ++escape_char / ++% Sindhi language locale for Pakistan. ++% Contributed by Abdul-Majid Bhurgri ++% and Abdul-Rahim Nizamani ++ ++LC_IDENTIFICATION ++ ++title "Sindhi language locale for Pakistan" ++source "Ubuntu, Sindh" ++address "USA" ++contact "" ++email "bug-glibc-locales@gnu.org" ++tel "" ++fax "" ++language "Sindhi" ++territory "Pakistan" ++revision "1.0" ++date "2010,June,5" ++% ++category "sd_PK:2008";LC_IDENTIFICATION ++category "sd_PK:2008";LC_CTYPE ++category "sd_PK:2008";LC_COLLATE ++category "sd_PK:2008";LC_TIME ++category "sd_PK:2008";LC_NUMERIC ++category "sd_PK:2008";LC_MONETARY ++category "sd_PK:2008";LC_MESSAGES ++category "sd_PK:2008";LC_PAPER ++category "sd_PK:2008";LC_NAME ++category "sd_PK:2008";LC_ADDRESS ++category "sd_PK:2008";LC_TELEPHONE ++ ++END LC_IDENTIFICATION ++ ++ ++LC_CTYPE ++copy "i18n" ++ ++translit_start ++include "translit_combining";"" ++translit_end ++END LC_CTYPE ++ ++ ++LC_COLLATE ++% Copy the template from ISO/IEC 14651 ++copy "iso14651_t1" ++ ++END LC_COLLATE ++ ++ ++LC_MONETARY ++% This is the POSIX Locale definition the LC_MONETARY category ++% generated by IBM Basic CountryPack Transformer. ++% These are generated based on XML base Locale defintion file ++% for IBM Class for Unicode. ++% ++int_curr_symbol "" ++currency_symbol "" ++mon_decimal_point "" ++mon_thousands_sep "" ++mon_grouping 3;2 ++positive_sign "" ++negative_sign "" ++int_frac_digits 2 ++frac_digits 2 ++p_cs_precedes 1 ++p_sep_by_space 1 ++n_cs_precedes 1 ++n_sep_by_space 1 ++p_sign_posn 1 ++n_sign_posn 1 ++% ++END LC_MONETARY ++ ++ ++LC_NUMERIC ++decimal_point "" ++thousands_sep "" ++grouping 3;2 ++END LC_NUMERIC ++ ++ ++LC_TIME ++% This is the POSIX Locale definition for the LC_TIME category ++% generated by IBM Basic CountryPack Transformer. ++% These are generated based on XML base Locale definition file ++% for IBM Class for Unicode. ++% ++% Abbreviated weekday names (%a) ++ abday "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";"" ++ % ++% Full weekday names (%A) ++ day "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++ % ++% Abbreviated month names (%b) ++ abmon "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++ % ++% Full month names (%B) ++ mon "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++ % ++% Equivalent of AM PM ++ am_pm "";"" ++% ++%Date and time format (%c) ++d_t_fmt "%A %d %B %Y %H:%M:%S" ++% ++%Date format (%x) ++d_fmt "%d/%m/%y" ++% ++%Time format (%X) ++t_fmt "%H:%M:%S" ++ ++% Time format with am_pm ++t_fmt_ampm "%I:%M:%S %p" ++era_year "" ++era_d_fmt "" ++ ++% Appropriate date representation (date(1)) "%a %b %e %H:%M:%S %Z %Y" ++date_fmt "%A %e %B %Y %H:%M:%S %Z" ++ ++% display columns right to left ++cal_direction 3 ++END LC_TIME ++ ++ ++LC_MESSAGES ++yesexpr "([yY][[:alpha:]]*)|()|(OK)" ++noexpr "([nN][[:alpha:]]*)|()" ++yesstr "" ++nostr "" ++END LC_MESSAGES ++ ++ ++LC_PAPER ++height 297 ++width 210 ++END LC_PAPER ++ ++LC_NAME ++% This is the ISO_IEC TR14652 Locale definition for the LC_NAME category ++% generated by IBM Basic CountryPack Transformer. ++% ++% ++name_fmt "" ++name_gen "" ++name_mr "" ++name_mrs "" ++name_miss "" ++name_ms "" ++ ++END LC_NAME ++ ++ ++LC_ADDRESS ++% This is the ISO_IEC TR14652 Locale definition for the LC_ADDRESS category ++% generated by IBM Basic CountryPack Transformer. ++postal_fmt "/ ++/ ++/ ++/ ++" ++ ++country_ab2 "" ++country_ab3 "" ++country_num 586 ++ ++END LC_ADDRESS ++ ++ ++LC_TELEPHONE ++tel_int_fmt "" ++int_prefix "" ++int_select "" ++END LC_TELEPHONE ++ ++ ++LC_MEASUREMENT ++measurement 1 ++END LC_MEASUREMENT ++ ++%%%%%%%%%%%%%%%%%%%% locale definition file "sd_PK" ends %%%%%%%%%%%%%%%%%%%%% ++ +Index: langpack-locales/SUPPORTED +=================================================================== +--- a/localedata/SUPPORTED 2011-11-16 08:42:41.229335945 +0100 ++++ b/localedata/SUPPORTED 2011-11-16 08:42:42.133335987 +0100 +@@ -361,6 +361,7 @@ + sc_IT/UTF-8 \ + sd_IN/UTF-8 \ + sd_IN@devanagari/UTF-8 \ ++sd_PK/UTF-8 \ + se_NO/UTF-8 \ + shs_CA/UTF-8 \ + si_LK/UTF-8 \ diff -urN ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/ug_CN@latin.diff debian/patches/ubuntu/localedata/ug_CN@latin.diff --- ../ubuntu-git-2.23/debian/patches/ubuntu/localedata/ug_CN@latin.diff 1969-12-31 17:00:00.000000000 -0700 +++ debian/patches/ubuntu/localedata/ug_CN@latin.diff 2016-03-19 10:14:48.590101747 -0600 @@ -0,0 +1,163 @@ +Bug: http://sourceware.org/bugzilla/show_bug.cgi?id=13865 + +Index: langpack-locales/locales/ug_CN@latin +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ b/localedata/locales/ug_CN@latin 2012-04-04 12:01:25.459348798 +0200 +@@ -0,0 +1,144 @@ ++escape_char / ++comment_char % ++% ++% Uyghur Latin locale ++% Source: http://en.wikipedia.org/wiki/Uyghur_language ++% Contact: Eagle Burkut ++% Email: eagle.burkut@gmail.com ++% Language: ug ++% Territory: CN ++% Revision: 1.00 ++% Date: 2012-03-17 ++% Users: general ++% Charset: UTF-8 ++% Distribution and use is free, ++% also for commercial purposes. ++ ++LC_IDENTIFICATION ++title "Uyghur Latin locale" ++source "http://en.wikipedia.org/wiki/Uyghur_language" ++address "" ++contact "Eagle Burkut" ++email "eagle.burkut@gmail.com" ++tel "" ++fax "" ++language "Uyghur" ++territory "China" ++revision "1.00" ++date "2012-03-17" ++ ++category "ug_CN@latin:2012";LC_IDENTIFICATION ++category "ug_CN@latin:2012";LC_CTYPE ++category "ug_CN@latin:2012";LC_COLLATE ++category "ug_CN@latin:2012";LC_TIME ++category "ug_CN@latin:2012";LC_NUMERIC ++category "ug_CN@latin:2012";LC_MONETARY ++category "ug_CN@latin:2012";LC_MESSAGES ++category "ug_CN@latin:2012";LC_PAPER ++category "ug_CN@latin:2012";LC_NAME ++category "ug_CN@latin:2012";LC_ADDRESS ++category "ug_CN@latin:2012";LC_TELEPHONE ++ ++END LC_IDENTIFICATION ++ ++LC_COLLATE ++copy "iso14651_t1" ++END LC_COLLATE ++ ++LC_CTYPE ++copy "i18n" ++END LC_CTYPE ++ ++LC_MONETARY ++copy "ug_CN" ++END LC_MONETARY ++ ++LC_NUMERIC ++copy "ug_CN" ++END LC_NUMERIC ++ ++LC_TELEPHONE ++copy "ug_CN" ++END LC_TELEPHONE ++ ++LC_TIME ++ ++abday "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++day "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++abmon "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++mon "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "";/ ++ "" ++ ++% %a, %Y-%m-%d, %T (abday, YYYY-mm-dd, HH:MM:SS) (Ye, 2012-12-31, 23:08:59) ++d_t_fmt "/ ++" ++ ++% %a, %Y-%m-%d (abday, YYYY-mm-dd) (Ye, 2012-12-31) ++d_fmt "" ++ ++% %T (HH:MM:SS) ++t_fmt "" ++ ++am_pm "";"" ++ ++% %a, %Y-%m-%d, %T (abday, YYYY-mm-dd, HH:MM:SS) (Ye, 2012-12-31, 23:08:59) ++date_fmt "/ ++" ++ ++END LC_TIME ++ ++LC_MESSAGES ++yesexpr "" ++noexpr "" ++yesstr "" ++nostr "" ++END LC_MESSAGES ++ ++LC_PAPER ++copy "ug_CN" ++END LC_PAPER ++ ++LC_MEASUREMENT ++copy "ug_CN" ++END LC_MEASUREMENT ++ ++LC_NAME % to be fixed ++copy "ug_CN" ++END LC_NAME ++ ++LC_ADDRESS % to be fixed ++copy "ug_CN" ++END LC_ADDRESS +Index: langpack-locales/SUPPORTED +=================================================================== +--- a/localedata/SUPPORTED 2012-04-04 12:00:54.671347626 +0200 ++++ b/localedata/SUPPORTED 2012-04-04 12:01:34.139349128 +0200 +@@ -420,6 +420,7 @@ + tt_RU/UTF-8 \ + tt_RU@iqtelif/UTF-8 \ + ug_CN/UTF-8 \ ++ug_CN@latin/UTF-8 \ + uk_UA.UTF-8/UTF-8 \ + uk_UA/KOI8-U \ + unm_US/UTF-8 \ diff -urN ../ubuntu-git-2.23/debian/rules debian/rules --- ../ubuntu-git-2.23/debian/rules 2016-03-18 22:33:46.106595284 -0600 +++ debian/rules 2016-03-19 09:07:28.649291722 -0600 @@ -149,8 +149,12 @@ DEB_UDEB_PACKAGES = else DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-pic libc-bin libc-dev-bin multiarch-support - DEB_INDEP_REGULAR_PACKAGES = glibc-doc glibc-source + DEB_INDEP_REGULAR_PACKAGES = glibc-doc glibc-source locales DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb + ## Locales can only be pre-generated during native compiles + ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) + DEB_ARCH_REGULAR_PACKAGES += locales-all + endif endif # Generic kernel version check diff -urN ../ubuntu-git-2.23/debian/rules.d/debhelper.mk debian/rules.d/debhelper.mk --- ../ubuntu-git-2.23/debian/rules.d/debhelper.mk 2016-03-10 03:14:20.611637067 -0700 +++ debian/rules.d/debhelper.mk 2016-03-19 10:40:28.478267802 -0600 @@ -65,6 +65,9 @@ dh_compress -p$(curpass) dh_fixperms -p$(curpass) -Xpt_chown + if [ $(curpass) = locales ] ; then \ + chmod +x debian/$(curpass)/usr/share/locales/*-language-pack ; \ + fi # Use this instead of -X to dh_fixperms so that we can use # an unescaped regular expression. ld.so must be executable; # libc.so and NPTL's libpthread.so print useful version