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

r4277 - in glibc-package/branches/eglibc-2.11/debian: . control.in debhelper.in patches patches/kfreebsd patches/mips rules.d script.in source sysdeps testsuite-checking



Author: aurel32
Date: 2010-05-24 15:25:17 +0000 (Mon, 24 May 2010)
New Revision: 4277

Added:
   glibc-package/branches/eglibc-2.11/debian/patches/mips/submitted-rld_map.diff
   glibc-package/branches/eglibc-2.11/debian/source/
   glibc-package/branches/eglibc-2.11/debian/source/format
   glibc-package/branches/eglibc-2.11/debian/source/lintian-overrides
   glibc-package/branches/eglibc-2.11/debian/sysdeps/powerpcspe.mk
Modified:
   glibc-package/branches/eglibc-2.11/debian/changelog
   glibc-package/branches/eglibc-2.11/debian/control
   glibc-package/branches/eglibc-2.11/debian/control.in/libc
   glibc-package/branches/eglibc-2.11/debian/control.in/main
   glibc-package/branches/eglibc-2.11/debian/debhelper.in/nscd.init
   glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-sysdeps.diff
   glibc-package/branches/eglibc-2.11/debian/patches/series
   glibc-package/branches/eglibc-2.11/debian/rules.d/control.mk
   glibc-package/branches/eglibc-2.11/debian/script.in/nsscheck.sh
   glibc-package/branches/eglibc-2.11/debian/testsuite-checking/expected-results-sparcv9b-linux-gnu-sparcv9b
Log:
Update from unstable


Modified: glibc-package/branches/eglibc-2.11/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/changelog	2010-05-20 21:29:23 UTC (rev 4276)
+++ glibc-package/branches/eglibc-2.11/debian/changelog	2010-05-24 15:25:17 UTC (rev 4277)
@@ -12,43 +12,45 @@
     - Remove debian/patches/alpha/submitted-procfs_h.diff (merged)
     - Remove debian/patches/any/cvs-broken-dns.diff (merged)
     - Remove debian/patches/any/cvs-getutmpx-compat.diff (merged)
+    - Remove debian/patches/any/cvs-ksm.diff (merged)
     - Remove debian/patches/any/cvs-malloc_info-output.diff (merged)
+    - Remove debian/patches/any/cvs-nis-not-configured.diff (merged)
     - Remove debian/patches/any/cvs-nptl-init.diff (merged)
     - Remove debian/patches/any/cvs-resolv-edns0.diff (merged)
     - Remove debian/patches/any/cvs-resolv-init.diff (merged)
     - Remove debian/patches/any/cvs-resolv-uninitialized.diff (merged)
     - Remove debian/patches/any/cvs-resolv-v6mapped.diff (merged)
+    - Remove debian/patches/any/cvs-sched_h.diff (merged)
     - Remove debian/patches/any/local-dynamic-resolvconf.diff (merged)
     - Update debian/patches/any/local-libgcc-compat-main.diff
     - Remove debian/patches/any/submitted-getent-gshadow.diff (merged)
     - Update debian/patches/any/submitted-missing-etc-hosts.diff.
+    - Remove debian/patches/arm/cvs-setjmp-longjmp-fpu.diff (merged)
     - Update debian/patches/hppa/cvs-nptl-compat.diff.
+    - Update debian/patches/hppa/local-stack-grows-up.diff from
+      Carlos O'Donell.
+    - Remove debian/patches/hppa/submitted-pie.diff (merged)
+    - Remove debian/patches/hppa/submitted-sock_nonblock.diff (merged)
+    - Update debian/patches/hurd-i386/cvs-setsid.diff.
     - Remove debian/patches/hurd-i386/cvs-termios-IXANY.patch (merged)
+    - Remove debian/patches/hurd-i386/submitted-getnprocs.diff (merged)
     - Update debian/patches/hurd-i386/submitted-readlinkat.diff
+    - Remove debian/patches/ia64/submitted-siginfo.diff (merged)
+    - Remove debian/patches/ia64/cvs-memchr.diff (merged)
+    - Remove debian/patches/locale/cvs-C-first_weekday.diff (merged)
     - Update debian/patches/localedata/first_weekday.diff
-    - Remove debian/patches/locale/cvs-C-first_weekday.diff (merged)
+    - Update debian/patches/localedata/tailor-iso14651_t1.diff
     - Remove debian/patches/mips/local-lazy-eval.diff (obsolete)
-    - Remove debian/patches/ia64/submitted-siginfo.diff (merged)
-    - Remove debian/patches/ia64/cvs-memchr.diff (merged)
     - Remove debian/patches/s390/submitted-siginfo.diff (merged)
-    - Remove debian/patches/any/cvs-malloc-check.diff (merged)
-    - Remove debian/patches/hppa/submitted-sock_nonblock.diff (merged)
-    - Remove debian/patches/hppa/submitted-pie.diff (merged)
-    - Remove debian/patches/any/cvs-ksm.diff (merged)
-    - Remove debian/patches/any/cvs-sched_h.diff (merged)
     - testsuite-checking/expected-results-ia64-linux-gnu-libc: update
-    - Update debian/patches/localedata/tailor-iso14651_t1.diff
-    - Add debian/patches/localedata/locale-hsb_DE.diff
     - Update testsuite-checking/expected-results-sparc-linux-gnu-libc
     - Update testsuite-checking/expected-results-sparcv9b-linux-gnu-sparcv9b
-    - Remove debian/patches/any/cvs-nis-not-configured.diff (merged)
-    - Update debian/patches/hppa/local-stack-grows-up.diff from
-      Carlos O'Donell.
-    - Update debian/patches/hurd-i386/cvs-setsid.diff.
+
   * Add debian/patches/alpha/local-fcntl_h.diff.
   * Add debian/patches/hppa/local-ELF_MACHINE_BEFORE_RTLD_RELOC.diff from
     Carlos O'Donell.
   * Add debian/patches/hppa/local-_dl_fptr_init.diff from Carlos O'Donnell.
+  * Add debian/patches/localedata/locale-hsb_DE.diff
 
   [ Aurelien Jarno ]
   * Enable multi-arch.
@@ -62,7 +64,8 @@
   * Add debian/patches/mips/local-lowlevellock.diff to fix the testsuite
     on mips.
   * Re-enable the testsuite on mips/mipsel build daemons.
-  * Add debian/patches/arm/local-atomic.diff to fix the testsuite on arm.
+  * Add debian/patches/arm/local-atomic.diff and 
+    debian/patches/arm/local-lowlevellock.diff to fix the testsuite on arm.
   * Add debian/patches/hppa/local-longjmp-chk.diff to fix FTBFS on hppa.
   * Add debian/patches/hppa/local-lowlevellock.diff to fix the testsuite
     on hppa.
@@ -84,14 +87,39 @@
 
  -- Clint Adams <schizo@debian.org>  Sun, 28 Feb 2010 13:58:17 -0500
 
-eglibc (2.10.2-8) UNSTABLE; urgency=low
+eglibc (2.10.2-9) unstable; urgency=low
 
+  [ Aurelien Jarno ]
+  * Add powerpcspe port support. Closes: #579778.
+
   [ Petr Salinger ]
+  * kfreebsd/local-sysdeps.diff: update to revision 3038 (from glibc-bsd).
+    Closes: #581545. 
+
+  [ Aurelien Jarno ]
+  * debian/control.in/libc: don't make libc0.1/0.3/6/6.1 depends on 
+    ${misc:Depends} as suggested by lintian, as it is turned out into a 
+    debconf depends.  Closes: #581835.
+  * debian/debhelper.in/nscd.init: stop supporting the reload argument.
+    Closes: #578870.
+  * debian/script.in/nsscheck.sh: correctly detect stopped and running 
+    services. Closes: #573247, #575868.
+  * debian/patches/mips/submitted-rld_map.diff: don't segfault for MIPS
+    binaries with RLD_MAP set to 0. Closes: #579917.
+  * Add debian/source/format and debian/source/lintian-overrides files.
+
+ -- Aurelien Jarno <aurel32@debian.org>  Thu, 20 May 2010 12:09:58 +0200
+
+eglibc (2.10.2-8) unstable; urgency=low
+
+  [ Petr Salinger ]
   * kfreebsd/local-sysdeps.diff: update to revision 3036 (from glibc-bsd).
 
   [ Clint Adams ]
   * Spanish debconf translation update from Omar Campagne Polaino.
     closes: #579351.
+  * Add patches/arm/cvs-setjmp-longjmp-fpu.diff.  closes: #580529
+    ("setjmp/longjmp broken on ARM w/ FPU").
 
  -- Clint Adams <schizo@debian.org>  Tue, 27 Apr 2010 20:33:40 -0400
 

Modified: glibc-package/branches/eglibc-2.11/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control	2010-05-20 21:29:23 UTC (rev 4276)
+++ glibc-package/branches/eglibc-2.11/debian/control	2010-05-24 15:25:17 UTC (rev 4277)
@@ -11,7 +11,7 @@
  g++-4.3 [i386], g++-4.3-multilib [i386]
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
-Uploaders: GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
+Uploaders: GOTO Masanori <gotom@debian.org>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
 Standards-Version: 3.8.4
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/
 Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/
@@ -110,10 +110,10 @@
  slow Services like LDAP, NIS or NIS+
 
 Package: libc6
-Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
 Section: libs
 Priority: required
-Depends: libc-bin (= ${binary:Version}), ${misc:Depends}, hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
 Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
 Provides: ${locale-compat:Depends}
@@ -125,7 +125,7 @@
  and the standard math library, as well as many others.
 
 Package: libc6-dev
-Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
 Section: libdevel
 Priority: optional
 Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
@@ -138,7 +138,7 @@
  and link programs which use the standard C library.
 
 Package: libc6-dbg
-Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
 Section: debug
 Priority: extra
 Provides: libc-dbg
@@ -148,7 +148,7 @@
  library.
 
 Package: libc6-prof
-Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
 Section: libdevel
 Priority: extra
 Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@ -157,7 +157,7 @@
  with gprof.
 
 Package: libc6-pic
-Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
 Section: libdevel
 Priority: optional
 Conflicts: libc-pic
@@ -172,7 +172,7 @@
 
 Package: libc6-udeb
 XC-Package-Type: udeb
-Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
 Section: debian-installer
 Priority: extra
 Provides: libc6, libc-udeb, ${locale-compat:Depends}
@@ -188,7 +188,7 @@
 Architecture: alpha ia64
 Section: libs
 Priority: required
-Depends: libc-bin (= ${binary:Version}), ${misc:Depends}, hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
 Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
 Provides: ${locale-compat:Depends}
@@ -263,7 +263,7 @@
 Architecture: hurd-i386
 Section: libs
 Priority: required
-Depends: libc-bin (= ${binary:Version}), ${misc:Depends}, hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
 Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
 Provides: ${locale-compat:Depends}
@@ -338,7 +338,7 @@
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Section: libs
 Priority: required
-Depends: libc-bin (= ${binary:Version}), ${misc:Depends}, hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
 Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
 Provides: ${locale-compat:Depends}

Modified: glibc-package/branches/eglibc-2.11/debian/control.in/libc
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/libc	2010-05-20 21:29:23 UTC (rev 4276)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/libc	2010-05-24 15:25:17 UTC (rev 4277)
@@ -2,7 +2,7 @@
 Architecture: @archs@
 Section: libs
 Priority: required
-Depends: libc-bin (= ${binary:Version}), ${misc:Depends}, hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
 Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386]
 Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
 Provides: ${locale-compat:Depends}

Modified: glibc-package/branches/eglibc-2.11/debian/control.in/main
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/control.in/main	2010-05-20 21:29:23 UTC (rev 4276)
+++ glibc-package/branches/eglibc-2.11/debian/control.in/main	2010-05-24 15:25:17 UTC (rev 4277)
@@ -11,7 +11,7 @@
  g++-4.3 [i386], g++-4.3-multilib [i386]
 Build-Depends-Indep: perl, po-debconf (>= 1.0)
 Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
-Uploaders: GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
+Uploaders: GOTO Masanori <gotom@debian.org>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Aurelien Jarno <aurel32@debian.org>, Pierre Habouzit <madcoder@debian.org>
 Standards-Version: 3.8.4
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/
 Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/

Modified: glibc-package/branches/eglibc-2.11/debian/debhelper.in/nscd.init
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/debhelper.in/nscd.init	2010-05-20 21:29:23 UTC (rev 4276)
+++ glibc-package/branches/eglibc-2.11/debian/debhelper.in/nscd.init	2010-05-24 15:25:17 UTC (rev 4277)
@@ -89,7 +89,7 @@
 		*) log_end_msg 1 ; exit 1 ;;
 	esac
 	;;
-restart|force-reload|reload)
+restart|force-reload)
 	log_daemon_msg "Restarting $DESC" "$NAME"
 	for table in passwd group hosts ; do
 		$DAEMON --invalidate $table
@@ -119,7 +119,7 @@
 	esac
 	;;
 *)
-	echo "Usage: /etc/init.d/$NAME {start|stop|reload|force-reload|restart|status}" >&2
+	echo "Usage: /etc/init.d/$NAME {start|stop|force-reload|restart|status}" >&2
 	exit 1
 	;;
 esac

Modified: glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-sysdeps.diff	2010-05-20 21:29:23 UTC (rev 4276)
+++ glibc-package/branches/eglibc-2.11/debian/patches/kfreebsd/local-sysdeps.diff	2010-05-24 15:25:17 UTC (rev 4277)
@@ -3539,7 +3539,7 @@
 +
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/in.h
-@@ -0,0 +1,307 @@
+@@ -0,0 +1,308 @@
 +/* Copyright (C) 1997, 2000, 2002 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
 +
@@ -3570,6 +3570,7 @@
 +#define	IMPLINK_LOWEXPER	156
 +#define	IMPLINK_HIGHEXPER	158
 +
++#define IPPROTO_DIVERT          258             /* divert pseudo-protocol */
 +
 +/* To select the IP level.  */
 +#define SOL_IP	0

Added: glibc-package/branches/eglibc-2.11/debian/patches/mips/submitted-rld_map.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/mips/submitted-rld_map.diff	                        (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/patches/mips/submitted-rld_map.diff	2010-05-24 15:25:17 UTC (rev 4277)
@@ -0,0 +1,19 @@
+2010-05-20  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* sysdeps/mips/dl-machine.h (ELF_MACHINE_DEBUG_SETUP): test for
+	RLD_MAP pointer before using it.
+
+diff --git a/ports/sysdeps/mips/dl-machine.h b/ports/sysdeps/mips/dl-machine.h
+index 123b4d6..3bed59c 100644
+--- a/ports/sysdeps/mips/dl-machine.h
++++ b/ports/sysdeps/mips/dl-machine.h
+@@ -70,7 +70,8 @@
+ /* If there is a DT_MIPS_RLD_MAP entry in the dynamic section, fill it in
+    with the run-time address of the r_debug structure  */
+ #define ELF_MACHINE_DEBUG_SETUP(l,r) \
+-do { if ((l)->l_info[DT_MIPS (RLD_MAP)]) \
++do { if ((l)->l_info[DT_MIPS (RLD_MAP)] && \
++	 (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) \
+        *(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \
+        (ElfW(Addr)) (r); \
+    } while (0)

Modified: glibc-package/branches/eglibc-2.11/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/series	2010-05-20 21:29:23 UTC (rev 4276)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series	2010-05-24 15:25:17 UTC (rev 4277)
@@ -140,6 +140,7 @@
 
 mips/local-lowlevellock.diff
 mips/local-r10k.diff
+mips/submitted-rld_map.diff
 
 s390/submitted-nexttowardf.diff
 s390/cvs-longjmp.diff

Modified: glibc-package/branches/eglibc-2.11/debian/rules.d/control.mk
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/rules.d/control.mk	2010-05-20 21:29:23 UTC (rev 4276)
+++ glibc-package/branches/eglibc-2.11/debian/rules.d/control.mk	2010-05-24 15:25:17 UTC (rev 4277)
@@ -2,7 +2,7 @@
 
 debian/control.in/libc6: debian/control.in/libc debian/rules.d/control.mk
 	sed -e 's%@libc@%libc6%g' \
-	    -e 's%@archs@%amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb%g' < $< > $@
+	    -e 's%@archs@%amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb%g' < $< > $@
 
 debian/control.in/libc6.1: debian/control.in/libc debian/rules.d/control.mk
 	sed -e 's%@libc@%libc6.1%g;s%@archs@%alpha ia64%g' < $< > $@

Modified: glibc-package/branches/eglibc-2.11/debian/script.in/nsscheck.sh
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/script.in/nsscheck.sh	2010-05-20 21:29:23 UTC (rev 4276)
+++ glibc-package/branches/eglibc-2.11/debian/script.in/nsscheck.sh	2010-05-24 15:25:17 UTC (rev 4277)
@@ -17,8 +17,8 @@
 	    rl=$(runlevel | sed 's/.*\ //')
 	    for service in $check; do
 	    	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-	    	    invoke-rc.d ${service} status 2>/dev/null || status=$?
-	    	    if [ "$status" = "0" ] || [ "$status" = "1" ] ; then
+	    	    invoke-rc.d ${service} status 2>/dev/null && status=0 || status=$?
+	    	    if [ "$status" = "0" ] || [ "$status" = "2" ] ; then
 	    	    	services="$service $services"
 	    	    elif [ "$status" = "100" ] ; then
 	    	    	echo "WARNING: init script for $service not found."

Added: glibc-package/branches/eglibc-2.11/debian/source/format
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/source/format	                        (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/source/format	2010-05-24 15:25:17 UTC (rev 4277)
@@ -0,0 +1 @@
+1.0

Added: glibc-package/branches/eglibc-2.11/debian/source/lintian-overrides
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/source/lintian-overrides	                        (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/source/lintian-overrides	2010-05-24 15:25:17 UTC (rev 4277)
@@ -0,0 +1,7 @@
+eglibc source: debhelper-but-no-misc-depends libc0.1
+eglibc source: debhelper-but-no-misc-depends libc6
+eglibc source: debhelper-but-no-misc-depends libc6.1
+eglibc source: debhelper-but-no-misc-depends libc0.3
+eglibc source: outdated-autotools-helper-file scripts/config.sub 2006-02-27
+eglibc source: outdated-autotools-helper-file scripts/config.guess 2006-02-27
+

Added: glibc-package/branches/eglibc-2.11/debian/sysdeps/powerpcspe.mk
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/sysdeps/powerpcspe.mk	                        (rev 0)
+++ glibc-package/branches/eglibc-2.11/debian/sysdeps/powerpcspe.mk	2010-05-24 15:25:17 UTC (rev 4277)
@@ -0,0 +1 @@
+libc_add-ons = ports nptl $(add-ons)

Modified: glibc-package/branches/eglibc-2.11/debian/testsuite-checking/expected-results-sparcv9b-linux-gnu-sparcv9b
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/testsuite-checking/expected-results-sparcv9b-linux-gnu-sparcv9b	2010-05-20 21:29:23 UTC (rev 4276)
+++ glibc-package/branches/eglibc-2.11/debian/testsuite-checking/expected-results-sparcv9b-linux-gnu-sparcv9b	2010-05-24 15:25:17 UTC (rev 4277)
@@ -6,4 +6,5 @@
 annexc.out, Error 1 (ignored)
 check-localplt.out, Error 1
 tst-backtrace2.out, Error 1
+tst-cpuclock2.out, Error 1
 tst-longjmp_chk2.out, Error 1


Reply to: