update trunk to 2.5-1

svn path=/glibc-package/trunk/; revision=2040

diff --git a/debian/debhelper.in/glibc-doc.links b/debian/debhelper.in/glibc-doc.links
index 71a74cdb055eff47e5004ae33e48092f94f9e509..f78c845c71ecb8219fcde213cb15f26c0b286fd1 100644 (file)
--- a/debian/debhelper.in/glibc-doc.links
+++ b/debian/debhelper.in/glibc-doc.links
@@ -14,3 +14,6 @@ usr/share/man/man3/pthread_mutex_init.3.gz usr/share/man/man3/pthread_mutex_dest
 usr/share/man/man3/pthread_mutexattr_init.3.gz usr/share/man/man3/pthread_mutexattr_destroy.3.gz
 usr/share/man/man3/pthread_mutexattr_init.3.gz usr/share/man/man3/pthread_mutexattr_settype.3.gz
 usr/share/man/man3/pthread_mutexattr_init.3.gz usr/share/man/man3/pthread_mutexattr_gettype.3.gz
+usr/share/man/man3/pthread_cancel.3.gz usr/share/man/man3/pthread_setcanceltype.3.gz
+usr/share/man/man3/pthread_cancel.3.gz usr/share/man/man3/pthread_setcancelstate.3.gz
+usr/share/man/man3/pthread_cancel.3.gz usr/share/man/man3/pthread_testcancel.3.gz