r2625 - in glibc-package/branches/glibc-2.7/debian: . patches patches/hurd-i386
Author: aurel32
Date: 2007-10-27 13:40:05 +0000 (Sat, 27 Oct 2007)
New Revision: 2625
Removed:
glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/cvs-ioctl-delay.diff
Modified:
glibc-package/branches/glibc-2.7/debian/changelog
glibc-package/branches/glibc-2.7/debian/patches/series
Log:
* Remove hurd-i386/cvs-ioctl-delay.diff (merged).
Modified: glibc-package/branches/glibc-2.7/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 13:37:03 UTC (rev 2624)
+++ glibc-package/branches/glibc-2.7/debian/changelog 2007-10-27 13:40:05 UTC (rev 2625)
@@ -17,8 +17,9 @@
* Remove hppa/submitted-threaddb.diff (merged).
* Update hppa/submitted-nptl-carlos.diff.
* Update hurd-i386/submitted-libc_once.diff.
+ * Remove hurd-i386/cvs-ioctl-delay.diff (merged).
- -- Aurelien Jarno <aurel32@debian.org> Sat, 27 Oct 2007 15:36:20 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 27 Oct 2007 15:39:26 +0200
glibc (2.7-0exp1) experimental; urgency=low
@@ -60,7 +61,6 @@
- Disable hurd-i386/local-tls-support.diff.
- Remove hurd-i386/cvs-sigsuspend-nocancel.diff (merged).
- Remove hurd-i386/cvs-lock-intern.diff (merged).
- - Disable hurd-i386/cvs-ioctl-delay.diff.
- Remove sparc/local-undefined-registers.diff (obsolete).
- Remove all/local-pt_BR.diff (merged).
- Remove any/cvs-ld_library_path.diff (merged).
Deleted: glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/cvs-ioctl-delay.diff
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/cvs-ioctl-delay.diff 2007-10-27 13:37:03 UTC (rev 2624)
+++ glibc-package/branches/glibc-2.7/debian/patches/hurd-i386/cvs-ioctl-delay.diff 2007-10-27 13:40:05 UTC (rev 2625)
@@ -1,50 +0,0 @@
-Index: sysdeps/mach/hurd/bits/ioctls.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/bits/ioctls.h,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -p -r1.8 -r1.9
---- sysdeps/mach/hurd/bits/ioctls.h 7 Jan 2006 23:29:39 -0000 1.8
-+++ sysdeps/mach/hurd/bits/ioctls.h 10 Aug 2007 22:50:53 -0000 1.9
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1992,93,96,97,98,99,2001 Free Software Foundation, Inc.
-+/* Copyright (C) 1992,93,96,97,98,99,2001,2007 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -284,25 +284,30 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_
- #define ODDP 0x00000040 /* get/send odd parity */
- #define EVENP 0x00000080 /* get/send even parity */
- #define ANYP 0x000000c0 /* get any parity/send none */
--#define NLDELAY 0x00000300 /* \n delay */
-+#define NLDLY 0x00000300 /* \n delay */
-+#define NLDELAY NLDLY /* traditional BSD name */
- #define NL0 0x00000000
- #define NL1 0x00000100 /* tty 37 */
- #define NL2 0x00000200 /* vt05 */
- #define NL3 0x00000300
--#define TBDELAY 0x00000c00 /* horizontal tab delay */
-+#define TABDLY 0x00000c00 /* horizontal tab delay */
-+#define TBDELAY TABDLY /* traditional BSD name */
- #define TAB0 0x00000000
- #define TAB1 0x00000400 /* tty 37 */
- #define TAB2 0x00000800
- #define XTABS 0x00000c00 /* expand tabs on output */
--#define CRDELAY 0x00003000 /* \r delay */
-+#define CRDLY 0x00003000 /* \r delay */
-+#define CRDELAY CRDLY /* traditional BSD name */
- #define CR0 0x00000000
- #define CR1 0x00001000 /* tn 300 */
- #define CR2 0x00002000 /* tty 37 */
- #define CR3 0x00003000 /* concept 100 */
--#define VTDELAY 0x00004000 /* vertical tab delay */
-+#define VTDLY 0x00004000 /* vertical tab delay */
-+#define VTDELAY VTDLY /* traditional BSD name */
- #define FF0 0x00000000
- #define FF1 0x00004000 /* tty 37 */
--#define BSDELAY 0x00008000 /* \b delay */
-+#define BSDLY 0x00008000 /* \b delay */
-+#define BSDELAY BSDLY /* traditional BSD name */
- #define BS0 0x00000000
- #define BS1 0x00008000
- #define ALLDELAY (NLDELAY|TBDELAY|CRDELAY|VTDELAY|BSDELAY)
Modified: glibc-package/branches/glibc-2.7/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27 13:37:03 UTC (rev 2624)
+++ glibc-package/branches/glibc-2.7/debian/patches/series 2007-10-27 13:40:05 UTC (rev 2625)
@@ -79,7 +79,6 @@
hurd-i386/submitted-trivial.diff -p0
hurd-i386/submitted-ioctl-unsigned-size_t.diff -p0
hurd-i386/cvs-ECANCELED.diff
-# hurd-i386/cvs-ioctl-delay.diff -p0
hurd-i386/submitted-IPV6_PKTINFO.diff
i386/local-biarch.diff
Reply to: