Author: aurel32
Date: 2008-10-12 21:06:28 +0000 (Sun, 12 Oct 2008)
New Revision: 3157

Modified:
   glibc-package/branches/glibc-2.8/debian/changelog
   glibc-package/branches/glibc-2.8/debian/patches/series
Log:
Merge trunk (up to revision 3156)


Modified: glibc-package/branches/glibc-2.8/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.8/debian/changelog   2008-10-12 21:05:19 UTC 
(rev 3156)
+++ glibc-package/branches/glibc-2.8/debian/changelog   2008-10-12 21:06:28 UTC 
(rev 3157)
@@ -142,8 +142,10 @@
 
   * debhelper.in/locales.config, debhelper.in/locales.postinst: modify
     /etc/locale.gen instead of regenerating it.  Closes: bug#494468.
+  * any/cvs-nscd-getservbyport.diff: new patch from upstream to fix 
getservbyport()
+    when nscd is used.  Closes: bug#500055.
 
- -- Aurelien Jarno <[EMAIL PROTECTED]>  Sun, 12 Oct 2008 18:00:22 +0200
+ -- Aurelien Jarno <[EMAIL PROTECTED]>  Sun, 12 Oct 2008 23:04:27 +0200
 
 glibc (2.7-14) unstable; urgency=low
 

Modified: glibc-package/branches/glibc-2.8/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.8/debian/patches/series      2008-10-12 
21:05:19 UTC (rev 3156)
+++ glibc-package/branches/glibc-2.8/debian/patches/series      2008-10-12 
21:06:28 UTC (rev 3157)
@@ -128,6 +128,7 @@
 
 any/cvs-getaddrinfo.diff 
 any/cvs-iconv-braces.diff
+any/cvs-nscd-getservbyport.diff
 any/cvs-tst-regex.diff 
 any/cvs-regex_anchor.diff
 any/local-asserth-decls.diff 


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to