[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r3214 - in glibc-package/branches/glibc-2.9/debian: . patches/alpha patches/any patches/arm patches/hppa patches/hurd-i386 patches/i386 patches/locale patches/localedata patches/sparc



Author: aurel32
Date: 2009-01-07 07:52:00 +0000 (Wed, 07 Jan 2009)
New Revision: 3214

Modified:
   glibc-package/branches/glibc-2.9/debian/changelog
   glibc-package/branches/glibc-2.9/debian/patches/alpha/submitted-fdatasync.diff
   glibc-package/branches/glibc-2.9/debian/patches/any/local-fhs-nscd.diff
   glibc-package/branches/glibc-2.9/debian/patches/any/local-ldso-disable-hwcap.diff
   glibc-package/branches/glibc-2.9/debian/patches/any/local-libgcc-compat-main.diff
   glibc-package/branches/glibc-2.9/debian/patches/any/local-rtld.diff
   glibc-package/branches/glibc-2.9/debian/patches/arm/local-ioperm.diff
   glibc-package/branches/glibc-2.9/debian/patches/hppa/submitted-nptl-carlos.diff
   glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/local-tls-support.diff
   glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-extern_inline.diff
   glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-ioctl-decode-argument.diff
   glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-ioctl-unsigned-size_t.diff
   glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-libc_once.diff
   glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-report-wait.diff
   glibc-package/branches/glibc-2.9/debian/patches/i386/submitted-i686-timing.diff
   glibc-package/branches/glibc-2.9/debian/patches/locale/LC_COLLATE-keywords-ordering.diff
   glibc-package/branches/glibc-2.9/debian/patches/locale/check-unknown-symbols.diff
   glibc-package/branches/glibc-2.9/debian/patches/locale/fix-LC_COLLATE-rules.diff
   glibc-package/branches/glibc-2.9/debian/patches/locale/preprocessor-collate-uli-sucks.diff
   glibc-package/branches/glibc-2.9/debian/patches/locale/preprocessor-collate.diff
   glibc-package/branches/glibc-2.9/debian/patches/localedata/el_CY_euro.diff
   glibc-package/branches/glibc-2.9/debian/patches/localedata/local-all-no-archive.diff
   glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-de_LI.diff
   glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-en_DK.diff
   glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-eo_EO.diff
   glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-eu_FR.diff
   glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-ia.diff
   glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-ku_TR.diff
   glibc-package/branches/glibc-2.9/debian/patches/localedata/mt_MT_euro.diff
   glibc-package/branches/glibc-2.9/debian/patches/localedata/sk_SK_euro.diff
   glibc-package/branches/glibc-2.9/debian/patches/localedata/supported.diff
   glibc-package/branches/glibc-2.9/debian/patches/localedata/tailor-iso14651_t1-common.diff
   glibc-package/branches/glibc-2.9/debian/patches/sparc/local-sparcv9-target.diff
Log:
Refresh all patches



Modified: glibc-package/branches/glibc-2.9/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.9/debian/changelog	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/changelog	2009-01-07 07:52:00 UTC (rev 3214)
@@ -40,7 +40,7 @@
   * testsuite-checking/compare.sh: don't assume expected and current 
     testsuite results in same order.  Closes: bug#504031.
 
- -- Aurelien Jarno <aurel32@debian.org>  Tue, 06 Jan 2009 22:58:45 +0100
+ -- Aurelien Jarno <aurel32@debian.org>  Wed, 07 Jan 2009 08:51:40 +0100
 
 glibc (2.8+20080809-3) experimental; urgency=low
 

Modified: glibc-package/branches/glibc-2.9/debian/patches/alpha/submitted-fdatasync.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/alpha/submitted-fdatasync.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/alpha/submitted-fdatasync.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -100,8 +100,8 @@
 +
 --- a/sysdeps/unix/sysv/linux/syscalls.list
 +++ b/sysdeps/unix/sysv/linux/syscalls.list
-@@ -10,7 +10,6 @@
- epoll_create	EXTRA	epoll_create	i:i	epoll_create
+@@ -11,7 +11,6 @@
+ epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
  epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
  epoll_wait	EXTRA	epoll_wait	Ci:ipii	epoll_wait
 -fdatasync	-	fdatasync	Ci:i	fdatasync

Modified: glibc-package/branches/glibc-2.9/debian/patches/any/local-fhs-nscd.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/any/local-fhs-nscd.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/any/local-fhs-nscd.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -4,7 +4,7 @@
 
 --- a/nscd/nscd.h
 +++ b/nscd/nscd.h
-@@ -101,10 +101,10 @@
+@@ -103,10 +103,10 @@
  
  
  /* Paths of the file for the persistent storage.  */

Modified: glibc-package/branches/glibc-2.9/debian/patches/any/local-ldso-disable-hwcap.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/any/local-ldso-disable-hwcap.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/any/local-ldso-disable-hwcap.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -14,7 +14,7 @@
 
 --- a/elf/dl-sysdep.c
 +++ b/elf/dl-sysdep.c
-@@ -409,6 +409,20 @@
+@@ -410,6 +410,20 @@
    /* For TLS enabled builds always add 'tls'.  */
    ++cnt;
  
@@ -35,7 +35,7 @@
    /* Create temporary data structure to generate result table.  */
    temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp));
    m = 0;
-@@ -483,8 +497,11 @@
+@@ -484,8 +498,11 @@
    *sz = 1 << cnt;
    result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + total);
    if (result == NULL)

Modified: glibc-package/branches/glibc-2.9/debian/patches/any/local-libgcc-compat-main.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/any/local-libgcc-compat-main.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/any/local-libgcc-compat-main.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -253,9 +253,9 @@
 +#endif
 --- a/sysdeps/sparc/sparc32/Makefile
 +++ b/sysdeps/sparc/sparc32/Makefile
-@@ -20,6 +20,14 @@
- sysdep_routines = dotmul umul $(divrem) alloca
- endif	# gnulib
+@@ -24,6 +24,14 @@
+ CFLAGS-initfini.s += -mcpu=v7
+ endif
  
 +ifeq ($(subdir),csu)
 +ifeq (yes,$(build-shared))

Modified: glibc-package/branches/glibc-2.9/debian/patches/any/local-rtld.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/any/local-rtld.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/any/local-rtld.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -37,7 +37,7 @@
  ifndef link-libc
 --- a/elf/Makefile
 +++ b/elf/Makefile
-@@ -314,7 +314,7 @@
+@@ -319,7 +319,7 @@
  	  | $(AWK) '($$7 ~ /^UND(|EF)$$/ && $$1 != "0:" && $$4 != "REGISTER") { print; p=1 } END { exit p != 0 }'
  
  # interp.c exists just to get this string into the libraries.

Modified: glibc-package/branches/glibc-2.9/debian/patches/arm/local-ioperm.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/arm/local-ioperm.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/arm/local-ioperm.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -27,4 +27,4 @@
 +  static int ioshift_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_SHIFT };
    size_t len = sizeof(io.base);
  
-   if (! sysctl (iobase_name, 3, &io.io_base, &len, NULL, 0)
+   if (! __sysctl (iobase_name, 3, &io.io_base, &len, NULL, 0)

Modified: glibc-package/branches/glibc-2.9/debian/patches/hppa/submitted-nptl-carlos.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/hppa/submitted-nptl-carlos.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/hppa/submitted-nptl-carlos.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -225,7 +225,7 @@
  
 --- a/stdio-common/Makefile
 +++ b/stdio-common/Makefile
-@@ -79,7 +79,7 @@
+@@ -80,7 +80,7 @@
  	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
  endif
  
@@ -236,7 +236,7 @@
  CFLAGS-tstdiomisc.c = -Wno-format
 --- a/sunrpc/clnt_udp.c
 +++ b/sunrpc/clnt_udp.c
-@@ -420,7 +420,7 @@
+@@ -462,7 +462,7 @@
        while (inlen < 0 && errno == EINTR);
        if (inlen < 0)
  	{

Modified: glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/local-tls-support.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/local-tls-support.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/local-tls-support.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -7,7 +7,7 @@
  sysdeps/generic/thread_state.h      |    1 
  sysdeps/mach/alpha/thread_state.h   |    1 
  sysdeps/mach/hurd/bits/libc-lock.h  |    3 +
- sysdeps/mach/hurd/bits/libc-tsd.h   |   34 --------------------
+ sysdeps/mach/hurd/bits/libc-tsd.h   |   35 ---------------------
  sysdeps/mach/hurd/fork.c            |    7 +++-
  sysdeps/mach/hurd/i386/init-first.c |   60 ++++++++++++++++++++++--------------
  sysdeps/mach/hurd/i386/tls.h        |   43 ++++++++++++++++++++++---
@@ -18,7 +18,7 @@
  sysdeps/mach/i386/thread_state.h    |   11 ++++++
  sysdeps/mach/powerpc/thread_state.h |    1 
  sysdeps/mach/thread_state.h         |    3 +
- 19 files changed, 144 insertions(+), 69 deletions(-)
+ 19 files changed, 144 insertions(+), 70 deletions(-)
 
 --- a/csu/libc-start.c
 +++ b/csu/libc-start.c

Modified: glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-extern_inline.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-extern_inline.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-extern_inline.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -226,7 +226,7 @@
  #endif	/* hurd/port.h */
 --- a/hurd/hurd/signal.h
 +++ b/hurd/hurd/signal.h
-@@ -130,15 +130,17 @@
+@@ -131,15 +131,17 @@
  #define _HURD_SIGNAL_H_EXTERN_INLINE __extern_inline
  #endif
  
@@ -245,7 +245,7 @@
  
  /* Thread listening on our message port; also called the "signal thread".  */
  
-@@ -165,10 +167,13 @@
+@@ -166,10 +168,13 @@
     interrupted lest the signal handler try to take the same lock and
     deadlock result.  */
  
@@ -260,7 +260,7 @@
      (void *) __hurd_threadvar_location (_HURD_THREADVAR_SIGSTATE);
    struct hurd_sigstate *ss = *location;
    if (ss == NULL)
-@@ -190,7 +195,11 @@
+@@ -191,7 +196,11 @@
       _hurd_critical_section_unlock to unlock it.  */
    return ss;
  }
@@ -272,7 +272,7 @@
  _HURD_SIGNAL_H_EXTERN_INLINE void
  _hurd_critical_section_unlock (void *our_lock)
  {
-@@ -200,7 +209,7 @@
+@@ -201,7 +210,7 @@
    else
      {
        /* It was us who acquired the critical section lock.  Unlock it.  */
@@ -281,7 +281,7 @@
        sigset_t pending;
        __spin_lock (&ss->lock);
        __spin_unlock (&ss->critical_section_lock);
-@@ -213,6 +222,7 @@
+@@ -214,6 +223,7 @@
  	__msg_sig_post (_hurd_msgport, 0, 0, __mach_task_self ());
      }
  }
@@ -609,9 +609,9 @@
  _EXTERN_INLINE void
  __spin_unlock (__spin_lock_t *__lock)
  {
-@@ -42,9 +45,13 @@
-    __asm__ __volatile ("xchgl %0, %1"
- 		       : "=&r" (__unlocked), "=m" (*__lock) : "0" (0));
+@@ -43,9 +46,13 @@
+ 		       : "=&r" (__unlocked), "=m" (*__lock) : "0" (0)
+ 		       : "memory");
  }
 +#endif
  
@@ -623,8 +623,8 @@
  _EXTERN_INLINE int
  __spin_try_lock (__spin_lock_t *__lock)
  {
-@@ -53,14 +60,19 @@
- 		      : "=&r" (__locked), "=m" (*__lock) : "0" (1));
+@@ -55,14 +62,19 @@
+ 		      : "memory");
    return !__locked;
  }
 +#endif

Modified: glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-ioctl-decode-argument.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-ioctl-decode-argument.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-ioctl-decode-argument.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -53,7 +53,7 @@
      /* Check for a registered handler for REQUEST.  */
 --- a/sysdeps/mach/hurd/bits/ioctls.h
 +++ b/sysdeps/mach/hurd/bits/ioctls.h
-@@ -118,6 +118,7 @@
+@@ -158,6 +158,7 @@
     _IOT_foobar is defined either in this file,
     or where struct foobar is defined.  */
  #define	_IO(g, n)	_IOC (IOC_VOID, (g), (n), 0)

Modified: glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-ioctl-unsigned-size_t.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-ioctl-unsigned-size_t.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-ioctl-unsigned-size_t.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -4,7 +4,7 @@
 
 --- a/sysdeps/mach/hurd/bits/ioctls.h
 +++ b/sysdeps/mach/hurd/bits/ioctls.h
-@@ -109,9 +109,17 @@
+@@ -149,9 +149,17 @@
  #define	_IOT_SIMPLE(type)	_IOT (_IOTS (type), 1, 0, 0, 0, 0)
  
  /* Basic C types.  */
@@ -23,7 +23,7 @@
  
  
  /* Standard flavors of ioctls.
-@@ -134,6 +142,10 @@
+@@ -174,6 +182,10 @@
  #define _IOC_ENCODE_TYPE_1(typespec)	_IOC_ENCODE_TYPE_2(typespec)
  #define _IOC_ENCODE_TYPE_2(typespec)	_IOT_##typespec
  

Modified: glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-libc_once.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-libc_once.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-libc_once.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -67,7 +67,7 @@
     used as argument to __libc_cleanup_region_start.  */
 --- a/sysdeps/posix/getaddrinfo.c
 +++ b/sysdeps/posix/getaddrinfo.c
-@@ -2281,7 +2281,7 @@
+@@ -2333,7 +2333,7 @@
  	  __libc_lock_define_initialized (static, lock);
  
  	  __libc_lock_lock (lock);

Modified: glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-report-wait.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-report-wait.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/hurd-i386/submitted-report-wait.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -1,11 +1,10 @@
-Index: glibc/hurd/report-wait.c
-===================================================================
-RCS file: /cvs/glibc/libc/hurd/report-wait.c,v
-retrieving revision 1.15
-diff -u -p -r1.15 report-wait.c
---- glibc/hurd/report-wait.c	29 Dec 2005 10:38:12 -0000	1.15
-+++ glibc/hurd/report-wait.c	15 Dec 2008 09:23:18 -0000
-@@ -30,7 +30,7 @@ static char *
+---
+ hurd/report-wait.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/hurd/report-wait.c
++++ b/hurd/report-wait.c
+@@ -30,7 +30,7 @@
  describe_number (string_t description, const char *flavor, long int i)
  {
    unsigned long int j;

Modified: glibc-package/branches/glibc-2.9/debian/patches/i386/submitted-i686-timing.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/i386/submitted-i686-timing.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/i386/submitted-i686-timing.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -33,7 +33,7 @@
 
 --- a/sysdeps/generic/ldsodefs.h
 +++ b/sysdeps/generic/ldsodefs.h
-@@ -406,7 +406,7 @@
+@@ -407,7 +407,7 @@
    /* The object to be initialized first.  */
    EXTERN struct link_map *_dl_initfirst;
  
@@ -42,7 +42,7 @@
    /* Start time on CPU clock.  */
    EXTERN hp_timing_t _dl_cpuclock_offset;
  #endif
-@@ -612,7 +612,7 @@
+@@ -613,7 +613,7 @@
    /* All search directories defined at startup.  */
    EXTERN struct r_search_path_elem *_dl_init_all_dirs;
  

Modified: glibc-package/branches/glibc-2.9/debian/patches/locale/LC_COLLATE-keywords-ordering.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/locale/LC_COLLATE-keywords-ordering.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/locale/LC_COLLATE-keywords-ordering.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -70,7 +70,7 @@
  	    goto err_label;
  
  	  arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3052,7 +3058,7 @@
+@@ -3051,7 +3057,7 @@
  	      break;
  	    }
  
@@ -79,7 +79,7 @@
  	    goto err_label;
  
  	  arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3198,7 +3204,7 @@
+@@ -3197,7 +3203,7 @@
  	      break;
  	    }
  
@@ -88,7 +88,7 @@
  	    goto err_label;
  
  	  arg = lr_token (ldfile, charmap, result, repertoire, verbose);
-@@ -3322,7 +3328,7 @@
+@@ -3318,7 +3324,7 @@
  	      break;
  	    }
  
@@ -97,7 +97,7 @@
  	    goto err_label;
  	  state = 1;
  
-@@ -3632,8 +3638,6 @@
+@@ -3628,8 +3634,6 @@
  %s: missing `reorder-end' keyword"), "LC_COLLATE"));
  	      state = 4;
  	    }

Modified: glibc-package/branches/glibc-2.9/debian/patches/locale/check-unknown-symbols.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/locale/check-unknown-symbols.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/locale/check-unknown-symbols.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -14,7 +14,7 @@
 
 --- a/locale/programs/ld-collate.c
 +++ b/locale/programs/ld-collate.c
-@@ -3646,8 +3646,20 @@
+@@ -3642,8 +3642,20 @@
  	    }
  	  else if (arg != NULL)
  	    {

Modified: glibc-package/branches/glibc-2.9/debian/patches/locale/fix-LC_COLLATE-rules.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/locale/fix-LC_COLLATE-rules.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/locale/fix-LC_COLLATE-rules.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -42,7 +42,7 @@
  	{
  	  WITH_CUR_LOCALE (error (0, 0, _("\
  %s: `position' must be used for a specific level in all sections or none"),
-@@ -3507,6 +3518,9 @@
+@@ -3503,6 +3514,9 @@
  		      no_error = 0;
  		    }
  		}

Modified: glibc-package/branches/glibc-2.9/debian/patches/locale/preprocessor-collate-uli-sucks.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/locale/preprocessor-collate-uli-sucks.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/locale/preprocessor-collate-uli-sucks.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -133,7 +133,7 @@
    if (nowtok == tok_copy)
      {
        now = lr_token (ldfile, charmap, result, NULL, verbose);
-@@ -3915,7 +3828,6 @@
+@@ -3911,7 +3824,6 @@
  	  break;
  
  	case tok_end:
@@ -141,7 +141,7 @@
  	  /* Next we assume `LC_COLLATE'.  */
  	  if (!ignore_content)
  	    {
-@@ -3956,182 +3868,6 @@
+@@ -3952,182 +3864,6 @@
  	  lr_ignore_rest (ldfile, arg->tok == tok_lc_collate);
  	  return;
  
@@ -324,7 +324,7 @@
  	default:
  	err_label:
  	  SYNTAX_ERROR (_("%s: syntax error"), "LC_COLLATE");
-@@ -4142,7 +3878,6 @@
+@@ -4138,7 +3874,6 @@
        nowtok = now->tok;
      }
  

Modified: glibc-package/branches/glibc-2.9/debian/patches/locale/preprocessor-collate.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/locale/preprocessor-collate.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/locale/preprocessor-collate.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -200,7 +200,7 @@
    if (nowtok == tok_copy)
      {
        now = lr_token (ldfile, charmap, result, NULL, verbose);
-@@ -3827,6 +3976,125 @@
+@@ -3823,6 +3972,125 @@
  			  repertoire, result, nowtok);
  	  break;
  
@@ -326,7 +326,7 @@
  	case tok_end:
  	  /* Next we assume `LC_COLLATE'.  */
  	  if (!ignore_content)
-@@ -3856,6 +4124,13 @@
+@@ -3852,6 +4120,13 @@
  	      else if (state == 5)
  		WITH_CUR_LOCALE (error (0, 0, _("\
  %s: missing `reorder-sections-end' keyword"), "LC_COLLATE"));

Modified: glibc-package/branches/glibc-2.9/debian/patches/localedata/el_CY_euro.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/localedata/el_CY_euro.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/localedata/el_CY_euro.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -1,10 +1,12 @@
 Cyprus joined the Euro zone.
 
-diff --git a/localedata/locales/el_CY b/localedata/locales/el_CY
-index 66acb12..7213924 100644
+---
+ localedata/locales/el_CY |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 --- a/localedata/locales/el_CY
 +++ b/localedata/locales/el_CY
-@@ -44,8 +44,8 @@ copy "el_GR"
+@@ -44,8 +44,8 @@
  END LC_MESSAGES
  
  LC_MONETARY

Modified: glibc-package/branches/glibc-2.9/debian/patches/localedata/local-all-no-archive.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/localedata/local-all-no-archive.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/localedata/local-all-no-archive.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -4,7 +4,7 @@
 
 --- a/localedata/Makefile
 +++ b/localedata/Makefile
-@@ -223,7 +223,7 @@
+@@ -224,7 +224,7 @@
  	echo -n `echo $$locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \

Modified: glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-de_LI.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-de_LI.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-de_LI.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -108,5 +108,5 @@
  de_DE@euro/ISO-8859-15 \
 +de_LI.UTF-8/UTF-8 \
  de_LU.UTF-8/UTF-8 \
+ de_LU/ISO-8859-1 \
  de_LU@euro/ISO-8859-15 \
- de_LU/ISO-8859-1 \

Modified: glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-en_DK.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-en_DK.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-en_DK.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -14,7 +14,7 @@
 
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -112,6 +112,7 @@
+@@ -113,6 +113,7 @@
  en_CA.UTF-8/UTF-8 \
  en_CA/ISO-8859-1 \
  en_DK.UTF-8/UTF-8 \

Modified: glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-eo_EO.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-eo_EO.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-eo_EO.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -232,7 +232,7 @@
 +END LC_ADDRESS
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -134,6 +134,8 @@
+@@ -135,6 +135,8 @@
  en_ZA/ISO-8859-1 \
  en_ZW.UTF-8/UTF-8 \
  en_ZW/ISO-8859-1 \

Modified: glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-eu_FR.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-eu_FR.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-eu_FR.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -100,7 +100,7 @@
 +END LC_ADDRESS
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -183,6 +183,9 @@
+@@ -184,6 +184,9 @@
  eu_ES.UTF-8/UTF-8 \
  eu_ES/ISO-8859-1 \
  eu_ES@euro/ISO-8859-15 \

Modified: glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-ia.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-ia.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-ia.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -153,7 +153,7 @@
 +END LC_ADDRESS
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -239,6 +239,7 @@
+@@ -241,6 +241,7 @@
  hu_HU/ISO-8859-2 \
  hy_AM/UTF-8 \
  hy_AM.ARMSCII-8/ARMSCII-8 \

Modified: glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-ku_TR.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-ku_TR.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/localedata/locale-ku_TR.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -161,7 +161,7 @@
  LC_ADDRESS
 @@ -199,17 +194,16 @@
  <U0020><U0025><U0068><U0020><U0025><U0065><U0020><U0025><U0072><U0025>/
- <U004E><U0025><U0025><U007A><U0020><U0025><U0054><U0025>/
+ <U004E><U0025><U007A><U0020><U0025><U0054><U0025>/
  <U004E><U0025><U0063><U0025><U004E>"
 -% TODO
 -country_name	"<U0054><U0075><U0072><U006B><U0065><U0079>"

Modified: glibc-package/branches/glibc-2.9/debian/patches/localedata/mt_MT_euro.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/localedata/mt_MT_euro.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/localedata/mt_MT_euro.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -1,10 +1,12 @@
 Malta joined the Euro zone.
 
-diff --git a/localedata/locales/mt_MT b/localedata/locales/mt_MT
-index a882de4..8f0e839 100644
+---
+ localedata/locales/mt_MT |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 --- a/localedata/locales/mt_MT
 +++ b/localedata/locales/mt_MT
-@@ -131,8 +131,8 @@ LC_MONETARY
+@@ -131,8 +131,8 @@
  % These are generated based on XML base Locale defintion file
  % for IBM Class for Unicode.
  %

Modified: glibc-package/branches/glibc-2.9/debian/patches/localedata/sk_SK_euro.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/localedata/sk_SK_euro.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/localedata/sk_SK_euro.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -1,10 +1,12 @@
 Slovakia joined the Euro zone.
 
-diff --git a/localedata/locales/sk_SK b/localedata/locales/sk_SK
-index 45d7da8..6a45858 100644
+---
+ localedata/locales/sk_SK |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
 --- a/localedata/locales/sk_SK
 +++ b/localedata/locales/sk_SK
-@@ -91,8 +91,8 @@ END LC_MESSAGES
+@@ -91,8 +91,8 @@
  
  LC_MONETARY
  

Modified: glibc-package/branches/glibc-2.9/debian/patches/localedata/supported.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/localedata/supported.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/localedata/supported.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -10,12 +10,12 @@
 # DP: Date: 2006-01-10
 
 ---
- localedata/SUPPORTED |   21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
+ localedata/SUPPORTED |    5 +++++
+ 1 file changed, 5 insertions(+)
 
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -113,6 +113,7 @@
+@@ -114,6 +114,7 @@
  en_DK/ISO-8859-1 \
  en_GB.UTF-8/UTF-8 \
  en_GB/ISO-8859-1 \
@@ -23,7 +23,7 @@
  en_HK.UTF-8/UTF-8 \
  en_HK/ISO-8859-1 \
  en_IE.UTF-8/UTF-8 \
-@@ -128,6 +129,7 @@
+@@ -129,6 +130,7 @@
  en_SG/ISO-8859-1 \
  en_US.UTF-8/UTF-8 \
  en_US/ISO-8859-1 \
@@ -31,7 +31,7 @@
  en_ZA.UTF-8/UTF-8 \
  en_ZA/ISO-8859-1 \
  en_ZW.UTF-8/UTF-8 \
-@@ -319,6 +321,7 @@
+@@ -323,6 +325,7 @@
  ru_RU.UTF-8/UTF-8 \
  ru_RU.KOI8-R/KOI8-R \
  ru_RU/ISO-8859-5 \
@@ -39,7 +39,7 @@
  ru_UA.UTF-8/UTF-8 \
  ru_UA/KOI8-U \
  rw_RW/UTF-8 \
-@@ -352,6 +355,7 @@
+@@ -358,6 +361,7 @@
  sv_FI@euro/ISO-8859-15 \
  sv_SE.UTF-8/UTF-8 \
  sv_SE/ISO-8859-1 \
@@ -47,7 +47,7 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
-@@ -376,6 +380,7 @@
+@@ -382,6 +386,7 @@
  uk_UA.UTF-8/UTF-8 \
  uk_UA/KOI8-U \
  ur_PK/UTF-8 \

Modified: glibc-package/branches/glibc-2.9/debian/patches/localedata/tailor-iso14651_t1-common.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/localedata/tailor-iso14651_t1-common.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/localedata/tailor-iso14651_t1-common.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -4,7 +4,7 @@
 
 --- a/localedata/locales/iso14651_t1_common
 +++ b/localedata/locales/iso14651_t1_common
-@@ -657,7 +657,11 @@
+@@ -916,7 +916,11 @@
  # SYMB. N°
  #
  <RES-1>
@@ -16,7 +16,7 @@
  # forme de base (bas de casse, arabe intrinsèque,
  # hébreu intrinsèque, etc.
  # basic form (lower case, intrinsic Arabic
-@@ -676,14 +680,21 @@
+@@ -935,14 +939,21 @@
  <AME> # medial/m<e'>dian
  # 6
  #

Modified: glibc-package/branches/glibc-2.9/debian/patches/sparc/local-sparcv9-target.diff
===================================================================
--- glibc-package/branches/glibc-2.9/debian/patches/sparc/local-sparcv9-target.diff	2009-01-06 21:59:10 UTC (rev 3213)
+++ glibc-package/branches/glibc-2.9/debian/patches/sparc/local-sparcv9-target.diff	2009-01-07 07:52:00 UTC (rev 3214)
@@ -11,7 +11,7 @@
 
 --- a/configure
 +++ b/configure
-@@ -2307,6 +2307,11 @@
+@@ -2309,6 +2309,11 @@
    machine="powerpc"
  fi
  


Reply to: