Author: aurel32 Date: 2006-04-10 00:45:48 +0000 (Mon, 10 Apr 2006) New Revision: 1373
Added: glibc-package/branches/glibc-2.4/debian/local/manpages/update-locale.8 glibc-package/branches/glibc-2.4/debian/local/usr_sbin/update-locale glibc-package/branches/glibc-2.4/debian/patches/amd64-i386-biarch.diff glibc-package/branches/glibc-2.4/debian/patches/getcwd_c.diff glibc-package/branches/glibc-2.4/debian/patches/localedata/locale-en_NZ.diff glibc-package/branches/glibc-2.4/debian/patches/localedata/locale-ia.diff glibc-package/branches/glibc-2.4/debian/patches/siginfo_h.diff Removed: glibc-package/branches/glibc-2.4/debian/patches/getcwd_ia64.diff Modified: glibc-package/branches/glibc-2.4/debian/changelog glibc-package/branches/glibc-2.4/debian/control glibc-package/branches/glibc-2.4/debian/control.in/i386 glibc-package/branches/glibc-2.4/debian/control.in/main glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.config glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.install glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.manpages glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.postinst glibc-package/branches/glibc-2.4/debian/patches/ldconfig-multiarch.diff glibc-package/branches/glibc-2.4/debian/patches/series glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk Log: Merge changes between revisions 1299 (= 2.3.6-4) and 1321 (= 2.3.6-5) into the 2.4 branch. Modified: glibc-package/branches/glibc-2.4/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.4/debian/changelog 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/changelog 2006-04-10 00:45:48 UTC (rev 1373) @@ -38,6 +38,30 @@ -- Clint Adams <[EMAIL PROTECTED]> Mon, 6 Mar 2006 16:49:38 -0500 +glibc (2.3.6-5) unstable; urgency=low + + [ Denis Barbier ] + * Add am_pm formatting information to en_NZ. (Closes: #356328) + * Add interlingua locale. (Closes: #224756) + * Move locale variables from /etc/environment into a dedicated + /etc/default/locale file. (Closes: #214898, #349503) + * Add a new /usr/sbin/update-locale program to handle this new file. + + [ Aurelien Jarno ] + * Fix ldconfig multiarch patch for reiserfs filesystems. + * Make ldconfig look into /lib32 and /usr/lib32 on amd64. Add /lib32 -> + /emul/ia32-linux/lib and /usr/lib32 -> /emul/ia32-linux/usr/lib links. + * Remove glibc235-gcc4-ppc-procfs.diff from debian/patches/series. + (Closes: #360126) + * Add siginfo_h.diff (fixes a typo in ILL_ILLOPN definition), backported + from upstream. (Closes: #358041) + * Replace getcwd_ia64.diff by getcwd_c.diff (fix getcwd on platforms where + PAGE_SIZE >> PATH_MAX), backported from upstream. (Closes: #355109) + * debian/control: drop alternative build-depends on ia32-libs-dev as this + package does not exist anymore. + + -- Denis Barbier <[EMAIL PROTECTED]> Tue, 4 Apr 2006 18:07:21 +0200 + glibc (2.3.6-4) unstable; urgency=low [ Aurelien Jarno ] Modified: glibc-package/branches/glibc-2.4/debian/control =================================================================== --- glibc-package/branches/glibc-2.4/debian/control 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/control 2006-04-10 00:45:48 UTC (rev 1373) @@ -7,7 +7,7 @@ kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64], gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1), autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76), - libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64] | ia32-libs-dev (<= 1.5) [amd64], libc6-dev-powerpc [ppc64], + libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], quilt Build-Depends-Indep: perl, po-debconf Maintainer: GNU Libc Maintainers <[email protected]> @@ -345,6 +345,7 @@ Section: libs Priority: standard Depends: libc6 (= ${Source-Version}) +Replaces: libc6-dev-i386 Conflicts: ia32-libs (<= 1.5) Description: GNU C Library: 32bit shared libraries for AMD64 This package includes shared versions of the standard C Modified: glibc-package/branches/glibc-2.4/debian/control.in/i386 =================================================================== --- glibc-package/branches/glibc-2.4/debian/control.in/i386 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/control.in/i386 2006-04-10 00:45:48 UTC (rev 1373) @@ -3,6 +3,7 @@ Section: libs Priority: standard Depends: libc6 (= ${Source-Version}) +Replaces: libc6-dev-i386 Conflicts: ia32-libs (<= 1.5) Description: GNU C Library: 32bit shared libraries for AMD64 This package includes shared versions of the standard C Modified: glibc-package/branches/glibc-2.4/debian/control.in/main =================================================================== --- glibc-package/branches/glibc-2.4/debian/control.in/main 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/control.in/main 2006-04-10 00:45:48 UTC (rev 1373) @@ -7,7 +7,7 @@ kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64], gcc-4.0 [!m68k], gcc-3.4 [m68k], binutils (>= 2.16.1cvs20051109-1), autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76), - libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64] | ia32-libs-dev (<= 1.5) [amd64], libc6-dev-powerpc [ppc64], + libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], quilt Build-Depends-Indep: perl, po-debconf Maintainer: GNU Libc Maintainers <[email protected]> Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.config =================================================================== --- glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.config 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.config 2006-04-10 00:45:48 UTC (rev 1373) @@ -24,8 +24,9 @@ LG=/dev/null fi DEFAULT_ENVIRONMENT=None -if [ -e /etc/environment ]; then - DEFAULT_ENVIRONMENT=$(awk 'BEGIN {lang="None"} /^LANG=/ {gsub("\"", ""); sub("LANG=", ""); lang=$0;} END {print lang}' /etc/environment) +EE="/etc/default/locale" +if [ -e "$EE" ]; then + DEFAULT_ENVIRONMENT=$(awk 'BEGIN {lang="None"} /^LANG=/ {gsub("\"", ""); sub("LANG=", ""); lang=$0;} END {print lang}' $EE) fi # Add a newline in case /etc/locale.gen has no trailing newline at EOF Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.install =================================================================== --- glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.install 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.install 2006-04-10 00:45:48 UTC (rev 1373) @@ -3,5 +3,6 @@ debian/tmp-libc/usr/share/locale/locale.alias usr/share/locale debian/tmp-libc/usr/share/i18n/* usr/share/i18n debian/local/usr_sbin/locale-gen usr/sbin +debian/local/usr_sbin/update-locale usr/sbin debian/local/usr_sbin/validlocale usr/sbin DEB_SRCDIR/localedata/README usr/share/doc/locales Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.manpages =================================================================== --- glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.manpages 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.manpages 2006-04-10 00:45:48 UTC (rev 1373) @@ -1,3 +1,4 @@ debian/local/manpages/locale-gen.8 debian/local/manpages/locale.gen.5 +debian/local/manpages/update-locale.8 debian/local/manpages/validlocale.8 Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.postinst =================================================================== --- glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.postinst 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.postinst 2006-04-10 00:45:48 UTC (rev 1373) @@ -2,8 +2,32 @@ set -e LG="/etc/locale.gen" -EE="/etc/environment" +EE="/etc/default/locale" +# Until locales 2.3.6-5, locale variables were stored into /etc/environment +if [ "$1" = "configure" ] && [ -e "/etc/environment" ] && dpkg --compare-versions "$2" lt 2.3.6-5 +then + OLDEE="/etc/environment" + exist=1 + if [ ! -e "$EE" ]; then + exist= + found= + echo "# File generated by update-locale" > $EE + fi + for i in LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL + do + if [ -z "$exist" ]; then + if grep "^ *$i=" $OLDEE >> $EE; then + found=1 + fi + fi + sed -i -e "s/^ *$i=/#&/" $OLDEE + done + if [ -z "$exist" ] && [ -z "$found" ]; then + rm -f $EE + fi +fi + if [ "$1" = configure ]; then . /usr/share/debconf/confmodule @@ -65,20 +89,11 @@ # Set default LANG environment variable if [ -e $EE ]; then - sed -e '/^ *LANG=/d' $EE > $EE.tmp || true - # $EE has to be updated if $SELECTED is empty or 'None' - cp -f $EE.tmp $EE - else - :> $EE.tmp + /usr/sbin/update-locale --remove LANG fi if [ -n "$SELECTED" ] && [ "$SELECTED" != "None" ]; then - # Add a newline in case last line does not have one - echo >> $EE.tmp - echo "LANG=$SELECTED" >> $EE.tmp - # Consecutive blank lines are replaced by a single line - cat -s $EE.tmp > $EE + /usr/sbin/update-locale "LANG=$SELECTED" fi - rm -f $EE.tmp fi #DEBHELPER# Added: glibc-package/branches/glibc-2.4/debian/local/manpages/update-locale.8 =================================================================== --- glibc-package/branches/glibc-2.4/debian/local/manpages/update-locale.8 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/local/manpages/update-locale.8 2006-04-10 00:45:48 UTC (rev 1373) @@ -0,0 +1,50 @@ +.TH UPDATE-LOCALE 8 "April 2006" "Debian GNU/Linux" +.SH "NAME" +.LP +update-locale \- Modify global locale settings +.SH "SYNTAX" +.LP +update-locale +.RI [ OPTIONS ] +[\fBLANG\fP=\fIlocale\fP] +[\fBLC_NUMERIC\fP=\fIlocale\fP] +[...] +.br +update-locale +.B --remove +[\fBLANG\fP] +[\fBLC_NUMERIC\fP] +[...] +.SH "DESCRIPTION" +.LP +This program can be called by maintainer scripts when Debian packages are +installed or removed, it updates the \fB/etc/default/locale\fP file to +reflect changes in system configuration related to global locale settings. +Some basic checks are performed to ensure that requested settings are valid. +.SH "OPTIONS" +.TP +.B \-\-help +Display an help message and exit. +.TP +.B \-\-reset +Variables which are not set on command-line are cleared out. +.TP +.B \-\-remove +Remove variables from locale file. +.TP +.B \-\-locale\-file +File containing locale variables. (Default: +.BR /etc/default/locale ) +.TP +.B \-\-no\-checks +Do not perform sanity checks on locale variables. +.SH "FILES" +.TP +.B /etc/default/locale +File where global locale settings are stored. +.SH "AUTHOR" +.LP +Denis Barbier <[EMAIL PROTECTED]> +.SH "SEE ALSO" +.LP +locale\-gen(8), locale(1) Added: glibc-package/branches/glibc-2.4/debian/local/usr_sbin/update-locale =================================================================== --- glibc-package/branches/glibc-2.4/debian/local/usr_sbin/update-locale 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/local/usr_sbin/update-locale 2006-04-10 00:45:48 UTC (rev 1373) @@ -0,0 +1,126 @@ +#! /usr/bin/perl -w + +use strict; +use Getopt::Long; + +my $progname = "update-locale"; +my $locale_file = "/etc/default/locale"; + +my $help = 0; +my $reset = 0; +my $remove = 0; +my $no_checks = 0; + +GetOptions( + 'reset' => \$reset, + 'remove' => \$remove, + 'locale-file' => \$locale_file, + 'no-checks' => \$no_checks, + 'h|help' => \$help, +); + +sub usage +{ + my $rc = shift; + print STDERR "Usage: $progname [OPTIONS] [LANG=locale] [LC_NUMERIC=locale] ... +Options: + --help display this message and exit + --reset ignore variables defined in the locale file + --remove remove variables from locale file + --locale-file file containing locale variables + (Default: /etc/default/locale) + --no-checks do not perform sanity checks on locale variables +"; + exit $rc; +} + +$help && usage(0); + +# Process command-line arguments +my %arg = (); +my $content = ''; +my $mode = 0644; +if (-r $locale_file) +{ + # Keep file mode + $mode = (stat($locale_file))[2] & 07777; + # Read current values + open(IN, "<", $locale_file) + or die "$progname: Unable to read $locale_file: $!\n"; + while (<IN>) + { + $content .= $_; + next unless m/^(\w+)=(.*)/; + $arg{$1} = $2 unless $reset; + } + close(IN) + or die "$progname: Unable to close $locale_file: $!\n"; + $content =~ s/^([^#])/#$1/mg; + $content .= "\n" unless $content =~ m/\n$/s; +} +else +{ + $content = "# File generated by $progname\n"; +} +for (@ARGV) +{ + if (m/(.*?)=(.*)/) + { + $arg{$1} = $2; + } + elsif ($remove) + { + delete $arg{$_}; + } +} + +my $env = ''; +for (qw(LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION LC_ALL)) +{ + if (defined $arg{$_} && $arg{$_} ne '') + { + $env .= " $_=$arg{$_}"; + $content =~ s/^#[#\s]*$_=.*/$_=$arg{$_}/m or + $content .= "$_=$arg{$_}\n"; + } +} + +# Sanity checks +if ($no_checks == 0) +{ + # Check tthat this locale does exist + my $charset = `$env locale charmap 2>&1`; + die "*** $progname: Error: invalid locale settings: $env\n" + if ($charset =~ m/Cannot set/); + # If LANGUAGE is set, its first value must be compatible with LC_MESSAGES + if (defined $arg{LANGUAGE}) + { + my $language = $arg{LANGUAGE}; + $language =~ s/[.:_].*//; + my $msg = ''; + my $var = ''; + for (qw(LANG LC_MESSAGES LC_ALL)) + { + if (defined $arg{$_}) + { + $var = $_; + $msg = $arg{$_}; + } + } + die "*** $progname: Error: LANGUAGE ($arg{LANGUAGE}) is not compatible with $var ($msg)\n" + if ($msg !~ m/^$language/ && $var ne '' + && $msg ne 'C' && $msg ne 'POSIX' + && $language ne 'C' && $language ne 'POSIX'); + } +} + +# Write locale file +open(OUT, ">", $locale_file) + or die "$progname: Unable to write $locale_file: $!\n"; +print OUT $content; +close(OUT) + or die "$progname: Unable to close $locale_file: $!\n"; +chmod($mode, $locale_file) + or die "$progname: Unable to chmod $locale_file: $!\n"; + +1; Added: glibc-package/branches/glibc-2.4/debian/patches/amd64-i386-biarch.diff =================================================================== --- glibc-package/branches/glibc-2.4/debian/patches/amd64-i386-biarch.diff 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/patches/amd64-i386-biarch.diff 2006-04-10 00:45:48 UTC (rev 1373) @@ -0,0 +1,30 @@ +# All lines beginning with `# DP:' are a description of the patch. +# DP: Description: Allow ldconfig to work on x86-64/i386 biarch systems + +--- libc/sysdeps/unix/sysv/linux/x86_64/dl-cache.h.orig 2006-03-27 00:08:28.219686388 +0200 ++++ libc/sysdeps/unix/sysv/linux/x86_64/dl-cache.h 2006-03-27 00:09:23.199203246 +0200 +@@ -22,4 +22,23 @@ + #define _dl_cache_check_flags(flags) \ + ((flags) == _DL_CACHE_DEFAULT_ID) + +-#include <sysdeps/unix/sysv/linux/sparc/dl-cache.h> ++#define add_system_dir(dir) \ ++ do \ ++ { \ ++ size_t len = strlen (dir); \ ++ char path[len + 3]; \ ++ memcpy (path, dir, len + 1); \ ++ if (len >= 6 && ! memcmp (path + len - 6, "/lib32", 6)) \ ++ { \ ++ len -= 2; \ ++ path[len] = '\0'; \ ++ } \ ++ add_dir (path); \ ++ if (len >= 4 && ! memcmp (path + len - 4, "/lib", 4)) \ ++ { \ ++ memcpy (path + len, "32", 3); \ ++ add_dir (path); \ ++ } \ ++ } while (0) ++ ++#include <sysdeps/generic/dl-cache.h> Added: glibc-package/branches/glibc-2.4/debian/patches/getcwd_c.diff =================================================================== --- glibc-package/branches/glibc-2.4/debian/patches/getcwd_c.diff 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/patches/getcwd_c.diff 2006-04-10 00:45:48 UTC (rev 1373) @@ -0,0 +1,19 @@ +Use larger of PATH_MAX and page size when allocating buffer. +See BZ2418 +Note: CVS 1.24 does not build, MAX macro is undefined + +Index: glibc-2.3.6/sysdeps/unix/sysv/linux/getcwd.c +=================================================================== +--- glibc-2.3.6.orig/sysdeps/unix/sysv/linux/getcwd.c ++++ glibc-2.3.6/sysdeps/unix/sysv/linux/getcwd.c +@@ -86,7 +86,9 @@ + return NULL; + } + +- alloc_size = PATH_MAX; ++ alloc_size = __getpagesize (); ++ if (alloc_size < PATH_MAX) ++ alloc_size = PATH_MAX; + } + + if (buf == NULL) Deleted: glibc-package/branches/glibc-2.4/debian/patches/getcwd_ia64.diff =================================================================== --- glibc-package/branches/glibc-2.4/debian/patches/getcwd_ia64.diff 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/patches/getcwd_ia64.diff 2006-04-10 00:45:48 UTC (rev 1373) @@ -1,11 +0,0 @@ ---- libc/sysdeps/unix/sysv/linux/getcwd.c.orig 2006-03-10 17:42:19.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/getcwd.c 2006-03-10 17:45:39.000000000 +0100 -@@ -127,7 +127,7 @@ - /* It should never happen that the `getcwd' syscall failed because - the buffer is too small if we allocated the buffer ourselves - large enough. */ -- assert (errno != ERANGE || buf != NULL || size != 0); -+/* assert (errno != ERANGE || buf != NULL || size != 0); */ - - # ifndef NO_ALLOCATION - if (buf == NULL) Modified: glibc-package/branches/glibc-2.4/debian/patches/ldconfig-multiarch.diff =================================================================== --- glibc-package/branches/glibc-2.4/debian/patches/ldconfig-multiarch.diff 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/patches/ldconfig-multiarch.diff 2006-04-10 00:45:48 UTC (rev 1373) @@ -1,11 +1,6 @@ -2006-02-23 Aurelien Jarno <[EMAIL PROTECTED]> - - * elf/ldconfig.c: add directories pointed from /lib/ldconfig - to the search path. - ---- glibc-2.3.6/elf/ldconfig.c 2006-02-21 16:00:32.000000000 +0100 -+++ glibc-2.3.6/elf/ldconfig.c 2006-02-23 03:08:45.000000000 +0100 -@@ -1052,6 +1027,129 @@ +--- glibc-2.3.6/elf/ldconfig.c.orig 2005-02-16 11:29:34.000000000 +0100 ++++ glibc-2.3.6/elf/ldconfig.c 2006-03-26 23:37:33.665182082 +0200 +@@ -1027,6 +1027,125 @@ fclose (file); } @@ -51,7 +46,7 @@ + { +#ifdef _DIRENT_HAVE_D_TYPE + /* We only look at links. */ -+ if (direntry->d_type != DT_LNK) ++ if (direntry->d_type != DT_UNKNOWN && direntry->d_type != DT_LNK) + continue; +#endif /* _DIRENT_HAVE_D_TYPE */ + @@ -84,11 +79,7 @@ + /* We only look at links. */ + is_link = S_ISLNK (lstat_buf.st_mode); + if (!is_link) -+ { -+ if (opt_verbose) -+ error (0, errno, _("%s is not a symlink"), file_name); + continue; -+ } + + /* Check the symlink refers to a directory. */ + if (__builtin_expect (stat64 (real_file_name, &stat_buf), 0)) @@ -135,7 +126,7 @@ /* Handle one word in an `include' line, a glob pattern of additional config files to read. */ static void -@@ -1240,6 +1338,9 @@ +@@ -1215,6 +1334,9 @@ add_system_dir (SLIBDIR); if (strcmp (SLIBDIR, LIBDIR)) add_system_dir (LIBDIR); Added: glibc-package/branches/glibc-2.4/debian/patches/localedata/locale-en_NZ.diff =================================================================== --- glibc-package/branches/glibc-2.4/debian/patches/localedata/locale-en_NZ.diff 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/patches/localedata/locale-en_NZ.diff 2006-04-10 00:45:48 UTC (rev 1373) @@ -0,0 +1,19 @@ +am/pm strings have been added to en_AU, the same fix should be applied +against en_NZ, as requested in #356328. + +Index: glibc-2.3.6/localedata/locales/en_NZ +=================================================================== +--- glibc-2.3.6.orig/localedata/locales/en_NZ ++++ glibc-2.3.6/localedata/locales/en_NZ +@@ -111,8 +111,9 @@ + d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" + d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>" + t_fmt "<U0025><U0054>" +-am_pm "";"" +-t_fmt_ampm "" ++am_pm "<U0041><U004D>";"<U0050><U004D>" ++t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ ++<U0025><U0070>" + date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ + <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ + <U0025><U005A><U0020><U0025><U0059>" Added: glibc-package/branches/glibc-2.4/debian/patches/localedata/locale-ia.diff =================================================================== --- glibc-package/branches/glibc-2.4/debian/patches/localedata/locale-ia.diff 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/patches/localedata/locale-ia.diff 2006-04-10 00:45:48 UTC (rev 1373) @@ -0,0 +1,162 @@ +Locale definition for the interlingua locale, submitted by +Alberto Mardegan <[EMAIL PROTECTED]> in #224756. +Ulrich Drepper claimed that he will not accept artificial +languages (like interlingua and esperanto), this locale +will thus not be submitted upstream. + +Index: glibc-2.3.6/localedata/locales/ia +=================================================================== +--- /dev/null ++++ glibc-2.3.6/localedata/locales/ia +@@ -0,0 +1,139 @@ ++comment_char % ++escape_char / ++% ++% Interlingua Language Locale ++ ++LC_IDENTIFICATION ++title "Interlingua locale" ++source "" ++address "" ++contact "" ++email "[EMAIL PROTECTED]" ++tel "" ++fax "" ++language "Interlingua" ++territory "" ++revision "1.0" ++date "2003-11-25" ++% ++category "ia:2000";LC_IDENTIFICATION ++category "ia:2000";LC_CTYPE ++category "ia:2000";LC_COLLATE ++category "ia:2000";LC_TIME ++category "ia:2000";LC_NUMERIC ++category "ia:2000";LC_MONETARY ++category "ia:2000";LC_MESSAGES ++category "ia:2000";LC_PAPER ++category "ia:2000";LC_NAME ++category "ia:2000";LC_ADDRESS ++category "ia:2000";LC_TELEPHONE ++ ++END LC_IDENTIFICATION ++ ++LC_COLLATE ++copy "iso14651_t1" ++END LC_COLLATE ++ ++LC_CTYPE ++copy "i18n" ++END LC_CTYPE ++ ++LC_MESSAGES ++yesexpr "<U005E><U005B><U0073><U0053><U0079><U0059><U005D><U002E><U002A>" ++noexpr "<U005E><U005B><U006E><U004E><U005D><U002E><U002A>" ++END LC_MESSAGES ++ ++LC_MONETARY ++int_curr_symbol "<U0045><U0055><U0052><U0020>" ++currency_symbol "<U20AC>" ++mon_decimal_point "<U002C>" ++mon_thousands_sep "<U002E>" ++mon_grouping 3;3 ++positive_sign "" ++negative_sign "<U002D>" ++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 "<U002C>" ++thousands_sep "" ++grouping 0;0 ++END LC_NUMERIC ++ ++LC_TIME ++abday "<U0064><U006F><U006D>";"<U006C><U0075><U006E>";/ ++ "<U006D><U0061><U0072>";"<U006D><U0065><U0072>";/ ++ "<U006A><U006F><U0076>";"<U0076><U0065><U006E>";/ ++ "<U0073><U0061><U0062>" ++day "<U0064><U006F><U006D><U0069><U006E><U0069><U0063><U0061>";/ ++ "<U006C><U0075><U006E><U0065><U0064><U0069>";/ ++ "<U006D><U0061><U0072><U0074><U0065><U0064><U0069>";/ ++ "<U006D><U0065><U0072><U0063><U0075><U0072><U0069><U0064><U0069>";/ ++ "<U006A><U006F><U0076><U0065><U0064><U0069>";/ ++ "<U0076><U0065><U006E><U0065><U0072><U0064><U0069>";/ ++ "<U0073><U0061><U0062><U0062><U0061><U0074><U006F>" ++abmon "<U006A><U0061><U006E>";"<U0066><U0065><U0062>";/ ++ "<U006D><U0061><U0072>";"<U0061><U0070><U0072>";/ ++ "<U006D><U0061><U0069>";"<U006A><U0075><U006E>";/ ++ "<U006A><U0075><U006C>";"<U0061><U0075><U0067>";/ ++ "<U0073><U0065><U0070>";"<U006F><U0063><U0074>";/ ++ "<U006E><U006F><U0076>";"<U0064><U0069><U0063>" ++mon "<U006A><U0061><U006e><U0075><U0061><U0072><U0069><U006f>";/ ++ "<U0066><U0065><U0062><U0072><U0075><U0061><U0072><U0069><U006F>";/ ++ "<U006D><U0061><U0072><U0074><U0069><U006F>";/ ++ "<U0061><U0070><U0072><U0069><U006C>";/ ++ "<U006D><U0061><U0069><U006F>";/ ++ "<U006A><U0075><U006E><U0069><U006F>";/ ++ "<U006A><U0075><U006C><U0069><U006F>";/ ++ "<U0061><U0075><U0067><U0075><U0073><U0074><U006F>";/ ++ "<U0073><U0065><U0070><U0074><U0065><U006D><U0062><U0072><U0065>";/ ++ "<U006f><U0063><U0074><U006F><U0062><U0072><U0065>";/ ++ "<U006E><U006F><U0076><U0065><U006D><U0062><U0072><U0065>";/ ++ "<U0064><U0065><U0063><U0065><U006D><U0062><U0072><U0065>" ++d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>" ++d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0059>" ++t_fmt "<U0025><U0054>" ++am_pm "";"" ++t_fmt_ampm "" ++date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ ++<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ ++<U0025><U005A><U0020><U0025><U0059>" ++END LC_TIME ++ ++LC_PAPER ++% FIXME ++height 297 ++% FIXME ++width 210 ++END LC_PAPER ++ ++LC_TELEPHONE ++tel_int_fmt "<U002B><U0025><U0063><U0020><U0025><U0061><U0020><U0025>/ ++<U006C>" ++int_select "<U0030><U0030>" ++END LC_TELEPHONE ++ ++LC_MEASUREMENT ++% FIXME ++measurement 1 ++END LC_MEASUREMENT ++ ++LC_NAME ++name_fmt "<U0025><U0064><U0025><U0074><U0025><U0067><U0025><U0074>/ ++<U0025><U006D><U0025><U0074><U0025><U0066>" ++END LC_NAME ++ ++LC_ADDRESS ++postal_fmt "<U0025><U0066><U0025><U004E><U0025><U0061><U0025><U004E>/ ++<U0025><U0064><U0025><U004E><U0025><U0062><U0025><U004E><U0025><U0073>/ ++<U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/ ++<U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/ ++<U004E><U0025><U0063><U0025><U004E>" ++END LC_ADDRESS +Index: glibc-2.3.6/localedata/SUPPORTED +=================================================================== +--- glibc-2.3.6.orig/localedata/SUPPORTED ++++ glibc-2.3.6/localedata/SUPPORTED +@@ -221,6 +221,7 @@ + hu_HU.UTF-8/UTF-8 \ + hu_HU/ISO-8859-2 \ + hy_AM.UTF-8/UTF-8 \ ++ia/UTF-8 \ + id_ID.UTF-8/UTF-8 \ + id_ID/ISO-8859-1 \ + is_IS.UTF-8/UTF-8 \ Modified: glibc-package/branches/glibc-2.4/debian/patches/series =================================================================== --- glibc-package/branches/glibc-2.4/debian/patches/series 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-04-10 00:45:48 UTC (rev 1373) @@ -53,7 +53,6 @@ #glibc232-tls-crashfix.diff -p1 glibc23-mips-lazy-eval.diff -p2 glibc235-gcc4-wcstol_l.diff -p1 -glibc235-gcc4-ppc-procfs.diff -p0 #glibc235-gcc4-arm-inline.diff -p1 #glibc235-gcc4-mips-inline.diff -p0 #glibc235-gcc4-mips-sysdeps.diff -p0 @@ -66,6 +65,7 @@ localedata/locale-ro_RO.diff -p0 #glibc235-gcc4-hppa-profile.diff -p0 glibc235-dl-execstack.diff -p0 +amd64-i386-biarch.diff -p1 i386-amd64-biarch.diff -p1 #hppa-iitlbp.diff -p1 #hppa-fenv-align.diff -p1 @@ -102,8 +102,10 @@ localedata/locale-csb_PL.diff localedata/locale-te_IN.diff localedata/locale-nr_ZA.diff +localedata/locale-en_NZ.diff localedata/dz_BT-collation.diff localedata/update-ZA.diff +localedata/locale-ia.diff localedata/tailor-iso14651_t1.diff -p0 localedata/fix-lang.diff localedata/fix-unknown-symbols.diff @@ -121,5 +123,6 @@ #hppa-inlining.diff -p1 strfmon.diff #argp_h.diff -p1 -getcwd_ia64.diff -p1 +getcwd_c.diff -p1 +siginfo_h.diff -p1 Added: glibc-package/branches/glibc-2.4/debian/patches/siginfo_h.diff =================================================================== --- glibc-package/branches/glibc-2.4/debian/patches/siginfo_h.diff 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/patches/siginfo_h.diff 2006-04-10 00:45:48 UTC (rev 1373) @@ -0,0 +1,18 @@ +Fix typo in ILL_ILLOPN definition. + +=================================================================== +RCS file: /cvs/glibc/libc/bits/siginfo.h,v +retrieving revision 1.6 +retrieving revision 1.7 +diff -u -r1.6 -r1.7 +--- libc/sysdeps/generic/bits/siginfo.h 2001/07/06 04:55:50 1.6 ++++ libc/sysdeps/generic/bits/siginfo.h 2006/04/01 19:18:59 1.7 +@@ -76,7 +76,7 @@ + { + ILL_ILLOPC = 1, /* Illegal opcode. */ + # define ILL_ILLOPC ILL_ILLOPC +- ILL_ILL_OPN, /* Illegal operand. */ ++ ILL_ILLOPN, /* Illegal operand. */ + # define ILL_ILLOPN ILL_ILLOPN + ILL_ILLADR, /* Illegal addressing mode. */ + # define ILL_ILLADR ILL_ILLADR Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk =================================================================== --- glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk 2006-04-10 00:37:20 UTC (rev 1372) +++ glibc-package/branches/glibc-2.4/debian/sysdeps/amd64.mk 2006-04-10 00:45:48 UTC (rev 1373) @@ -31,10 +31,11 @@ mkdir -p debian/libc6-dev-i386/usr/include cp -af debian/tmp-i386/usr/include/i486-linux-gnu \ debian/libc6-dev-i386/usr/include -ln -sf /emul/ia32-linux/usr/lib debian/libc6-dev-i386/usr/lib32 endef define libc6-i386_extra_pkg_install mkdir -p debian/libc6-i386/lib ln -sf /emul/ia32-linux/lib/ld-linux.so.2 debian/libc6-i386/lib +ln -sf /emul/ia32-linux/lib debian/libc6-i386/lib32 +ln -sf /emul/ia32-linux/usr/lib debian/libc6-i386/usr/lib32 endef -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
