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

r3363 - in glibc-package/trunk/debian: . patches patches/hurd-i386



Author: sthibaul-guest
Date: 2009-03-03 00:12:01 +0000 (Tue, 03 Mar 2009)
New Revision: 3363

Added:
   glibc-package/trunk/debian/patches/hurd-i386/submitted-ECANCELED.diff
Removed:
   glibc-package/trunk/debian/patches/hurd-i386/cvs-ECANCELED.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
  * debian/patches/hurd-i386/cvs-ECANCELED.diff: rename into
    submitted-ECANCELED.diff


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2009-03-03 00:01:24 UTC (rev 3362)
+++ glibc-package/trunk/debian/changelog	2009-03-03 00:12:01 UTC (rev 3363)
@@ -16,6 +16,10 @@
     - debhelper.in/locales.config: use previous debconf settings if 
       /etc/locales does not exists. Closes: bug#517884.
 
+  [ Samuel Thibault ]
+  * debian/patches/hurd-i386/cvs-ECANCELED.diff: rename into
+    submitted-ECANCELED.diff
+
  -- Aurelien Jarno <aurel32@debian.org>  Tue, 03 Mar 2009 00:54:27 +0100
 
 glibc (2.9-4) unstable; urgency=low

Deleted: glibc-package/trunk/debian/patches/hurd-i386/cvs-ECANCELED.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/cvs-ECANCELED.diff	2009-03-03 00:01:24 UTC (rev 3362)
+++ glibc-package/trunk/debian/patches/hurd-i386/cvs-ECANCELED.diff	2009-03-03 00:12:01 UTC (rev 3363)
@@ -1,26 +0,0 @@
----
- sysdeps/mach/hurd/bits/errno.h |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/sysdeps/mach/hurd/bits/errno.h
-+++ b/sysdeps/mach/hurd/bits/errno.h
-@@ -212,8 +212,8 @@
- #define	EPROTO          _HURD_ERRNO (116)/* Protocol error */
- 	ETIME           = _HURD_ERRNO (117),
- #define	ETIME           _HURD_ERRNO (117)/* Timer expired */
--	ECANCELED       = _HURD_ERRNO (118),
--#define	ECANCELED       _HURD_ERRNO (118)/* Operation canceled */
-+	ECANCELED       = _HURD_ERRNO (119),
-+#define	ECANCELED       _HURD_ERRNO (119)/* Operation canceled */
- 
- 	/* Errors from <mach/message.h>.  */
- 	EMACH_SEND_IN_PROGRESS          = 0x10000001,
-@@ -297,7 +297,7 @@
- 
- };
- 
--#define	_HURD_ERRNOS	119
-+#define	_HURD_ERRNOS	120
- 
- /* User-visible type of error codes.  It is ok to use `int' or
-    `kern_return_t' for these, but with `error_t' the debugger prints

Copied: glibc-package/trunk/debian/patches/hurd-i386/submitted-ECANCELED.diff (from rev 3361, glibc-package/trunk/debian/patches/hurd-i386/cvs-ECANCELED.diff)
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-ECANCELED.diff	                        (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-ECANCELED.diff	2009-03-03 00:12:01 UTC (rev 3363)
@@ -0,0 +1,26 @@
+---
+ sysdeps/mach/hurd/bits/errno.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/sysdeps/mach/hurd/bits/errno.h
++++ b/sysdeps/mach/hurd/bits/errno.h
+@@ -212,8 +212,8 @@
+ #define	EPROTO          _HURD_ERRNO (116)/* Protocol error */
+ 	ETIME           = _HURD_ERRNO (117),
+ #define	ETIME           _HURD_ERRNO (117)/* Timer expired */
+-	ECANCELED       = _HURD_ERRNO (118),
+-#define	ECANCELED       _HURD_ERRNO (118)/* Operation canceled */
++	ECANCELED       = _HURD_ERRNO (119),
++#define	ECANCELED       _HURD_ERRNO (119)/* Operation canceled */
+ 
+ 	/* Errors from <mach/message.h>.  */
+ 	EMACH_SEND_IN_PROGRESS          = 0x10000001,
+@@ -297,7 +297,7 @@
+ 
+ };
+ 
+-#define	_HURD_ERRNOS	119
++#define	_HURD_ERRNOS	120
+ 
+ /* User-visible type of error codes.  It is ok to use `int' or
+    `kern_return_t' for these, but with `error_t' the debugger prints


Property changes on: glibc-package/trunk/debian/patches/hurd-i386/submitted-ECANCELED.diff
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series	2009-03-03 00:01:24 UTC (rev 3362)
+++ glibc-package/trunk/debian/patches/series	2009-03-03 00:12:01 UTC (rev 3363)
@@ -84,7 +84,7 @@
 hurd-i386/submitted-strtoul.diff
 hurd-i386/submitted-sysvshm.diff
 hurd-i386/submitted-ioctl-unsigned-size_t.diff
-hurd-i386/cvs-ECANCELED.diff
+hurd-i386/submitted-ECANCELED.diff
 hurd-i386/submitted-IPV6_PKTINFO.diff
 hurd-i386/submitted-extern_inline.diff
 hurd-i386/cvs-resource-prio.diff


Reply to: