Author: adconrad Date: 2014-01-11 10:11:02 +0000 (Sat, 11 Jan 2014) New Revision: 5913
Modified: glibc-package/branches/eglibc-2.18/debian/changelog glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/libpthread_version.diff Log: debian/patches/hurd-i386/libpthread_version.diff: Remove stderr vomit. Modified: glibc-package/branches/eglibc-2.18/debian/changelog =================================================================== --- glibc-package/branches/eglibc-2.18/debian/changelog 2014-01-11 09:26:43 UTC (rev 5912) +++ glibc-package/branches/eglibc-2.18/debian/changelog 2014-01-11 10:11:02 UTC (rev 5913) @@ -1,6 +1,6 @@ eglibc (2.18-0experimental2) UNRELEASED; urgency=medium - * + * debian/patches/hurd-i386/libpthread_version.diff: Remove stderr vomit. -- Adam Conrad <adcon...@0c3.net> Sat, 11 Jan 2014 02:26:05 -0700 Modified: glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/libpthread_version.diff =================================================================== --- glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/libpthread_version.diff 2014-01-11 09:26:43 UTC (rev 5912) +++ glibc-package/branches/eglibc-2.18/debian/patches/hurd-i386/libpthread_version.diff 2014-01-11 10:11:02 UTC (rev 5913) @@ -2,7 +2,14 @@ --- a/libpthread/Versions 2013-09-21 22:32:47.069176263 +0200 +++ b/libpthread/Versions 2014-01-01 19:08:01.701025627 +0100 -@@ -131,8 +131,4 @@ +@@ -1,5 +1,5 @@ + libc { +- GLIBC_2.13 { ++ GLIBC_2.13_DEBIAN_31 { + pthread_attr_destroy; pthread_attr_getdetachstate; + pthread_attr_getinheritsched; pthread_attr_getschedparam; + pthread_attr_getschedpolicy; pthread_attr_getscope; pthread_attr_init; +@@ -131,8 +131,10 @@ __pthread_spin_lock; __pthread_spin_trylock; __pthread_spin_unlock; _pthread_spin_lock; } @@ -10,9 +17,24 @@ - pthread_hurd_cond_wait_np; - pthread_hurd_cond_timedwait_np; - } ++ GLIBC_2.13_DEBIAN_38 { ++ pthread_hurd_cond_wait_np; ++ } ++ GLIBC_2.13_DEBIAN_39 { ++ pthread_hurd_cond_timedwait_np; ++ } } --- a/Versions.def +++ b/Versions.def +@@ -30,6 +30,8 @@ + GLIBC_2.11 + GLIBC_2.12 + GLIBC_2.13 ++ GLIBC_2.13_DEBIAN_38 ++ GLIBC_2.13_DEBIAN_39 + GLIBC_2.14 + GLIBC_2.15 + GLIBC_2.16 @@ -39,6 +39,7 @@ %endif GLIBC_PRIVATE @@ -21,76 +43,12 @@ } libcrypt { GLIBC_2.0 ---- a/libpthread/Versions -+++ b/libpthread/Versions -@@ -1,5 +1,5 @@ - libc { -- GLIBC_2.13 { -+ GLIBC_2.13_DEBIAN_31 { - pthread_attr_destroy; pthread_attr_getdetachstate; - pthread_attr_getinheritsched; pthread_attr_getschedparam; - pthread_attr_getschedpolicy; pthread_attr_getscope; pthread_attr_init; -Index: eglibc-2.18/Versions.def -=================================================================== ---- eglibc-2.18.orig/Versions.def 2013-10-09 10:42:41.000000000 +0000 -+++ eglibc-2.18/Versions.def 2013-10-09 22:19:48.000000000 +0000 -@@ -30,6 +30,7 @@ - GLIBC_2.11 - GLIBC_2.12 - GLIBC_2.13 -+ GLIBC_2.13_DEBIAN_38 - GLIBC_2.14 - GLIBC_2.15 - GLIBC_2.16 -@@ -105,6 +106,7 @@ +@@ -105,6 +106,8 @@ GLIBC_2.6 GLIBC_2.11 GLIBC_2.12 + GLIBC_2.13_DEBIAN_38 - GLIBC_2.18 - GLIBC_PRIVATE - } -Index: eglibc-2.18/libpthread/Versions -=================================================================== ---- eglibc-2.18.orig/libpthread/Versions 2013-10-09 10:42:41.000000000 +0000 -+++ eglibc-2.18/libpthread/Versions 2013-10-09 22:19:32.000000000 +0000 -@@ -129,4 +129,7 @@ - __pthread_spin_lock; __pthread_spin_trylock; __pthread_spin_unlock; - _pthread_spin_lock; - } -+ GLIBC_2.13_DEBIAN_38 { -+ pthread_hurd_cond_wait_np; -+ } - } -Index: eglibc-2.18/Versions.def -=================================================================== ---- eglibc-2.18.orig/Versions.def 2013-10-09 10:42:41.000000000 +0000 -+++ eglibc-2.18/Versions.def 2013-10-09 22:15:02.000000000 +0000 -@@ -31,6 +31,7 @@ - GLIBC_2.12 - GLIBC_2.13 - GLIBC_2.13_DEBIAN_38 + GLIBC_2.13_DEBIAN_39 - GLIBC_2.14 - GLIBC_2.15 - GLIBC_2.16 -@@ -106,6 +107,7 @@ - GLIBC_2.11 - GLIBC_2.12 - GLIBC_2.13_DEBIAN_38 -+ GLIBC_2.13_DEBIAN_39 GLIBC_2.18 GLIBC_PRIVATE } -Index: eglibc-2.18/libpthread/Versions -=================================================================== ---- eglibc-2.18.orig/libpthread/Versions 2013-10-09 10:42:41.000000000 +0000 -+++ eglibc-2.18/libpthread/Versions 2013-10-09 10:42:41.000000000 +0000 -@@ -133,4 +133,7 @@ - GLIBC_2.13_DEBIAN_38 { - pthread_hurd_cond_wait_np; - } -+ GLIBC_2.13_DEBIAN_39 { -+ pthread_hurd_cond_timedwait_np; -+ } - } -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1w1vww-000760...@moszumanska.debian.org