summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/libpthread_mutex-no-include.patch20
2 files changed, 1 insertions, 20 deletions
diff --git a/debian/changelog b/debian/changelog
index 95444821..ea4e1041 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ hurd (20080921-1) UNRELEASED; urgency=low
* New snapshot from CVS.
+ debian/patches/diskfs_lookup_error_fix.patch: Removed, applies upstream.
+ + debian/patches/libpthread_mutex-no-include.patch: Likewise.
* debian/hurd.postinst: Install w and ps alternatives links in /bin, not
/usr/bin.
diff --git a/debian/patches/libpthread_mutex-no-include.patch b/debian/patches/libpthread_mutex-no-include.patch
deleted file mode 100644
index edd5e2c8..00000000
--- a/debian/patches/libpthread_mutex-no-include.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: libpthread/sysdeps/generic/bits/mutex.h
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/bits/mutex.h,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -p -r1.6 -r1.7
---- libpthread/sysdeps/generic/bits/mutex.h 1 Jul 2008 11:43:16 -0000 1.6
-+++ libpthread/sysdeps/generic/bits/mutex.h 2 Aug 2008 20:21:20 -0000 1.7
-@@ -57,11 +57,4 @@ struct __pthread_mutex
- # endif
- #endif /* Not __pthread_mutex_defined. */
-
--#ifdef _BITS_MUTEX_H
--
--#include <errno.h>
--#include <stddef.h>
--
--#endif
--
- #endif /* bits/mutex.h */