r1281 - in glibc-package/branches/glibc-2.4/debian: . patches
Author: schizo
Date: 2006-03-09 17:58:20 +0000 (Thu, 09 Mar 2006)
New Revision: 1281
Removed:
glibc-package/branches/glibc-2.4/debian/patches/glibc-manual-memory.diff
glibc-package/branches/glibc-2.4/debian/patches/glibc-manual-string.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
- Remove glibc-manual-memory.diff (merged upstream).
- Remove glibc-manual-string.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-03-09 04:36:31 UTC (rev 1280)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-03-09 17:58:20 UTC (rev 1281)
@@ -8,6 +8,8 @@
- Remove glibc235-gcc4-sparc-mv8.diff (merged upstream).
- Remove glibc-235-sparc-datastart.diff (merged upstream).
- Remove tst-setcontext_c.diff (merged upstream).
+ - Remove glibc-manual-memory.diff (merged upstream).
+ - Remove glibc-manual-string.diff (merged upstream).
- debian/shlibver: Bump up to 2.4-1.
-- Clint Adams <schizo@debian.org> Mon, 6 Mar 2006 16:49:38 -0500
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc-manual-memory.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/glibc-manual-memory.diff 2006-03-09 04:36:31 UTC (rev 1280)
+++ glibc-package/branches/glibc-2.4/debian/patches/glibc-manual-memory.diff 2006-03-09 17:58:20 UTC (rev 1281)
@@ -1,52 +0,0 @@
-2005-01-14 GOTO Masanori <gotom@debian.or.jp>
-
- * manual/memory.texi (sbrk): Fix definition.
-
-===================================================================
-RCS file: /cvs/glibc/libc/manual/memory.texi,v
-retrieving revision 1.78
-retrieving revision 1.79
-diff -u -r1.78 -r1.79
---- libc/manual/memory.texi 2004/10/18 00:53:12 1.78
-+++ libc/manual/memory.texi 2005/01/26 02:39:11 1.79
-@@ -2384,7 +2384,7 @@
-
- @comment unistd.h
- @comment BSD
--@deftypefun int sbrk (ptrdiff_t @var{delta})
-+@deftypefun void *sbrk (ptrdiff_t @var{delta})
- This function is the same as @code{brk} except that you specify the new
- end of the data segment as an offset @var{delta} from the current end
- and on success the return value is the address of the resulting end of
-
-2005-08-29 Thomas Schwinge <schwinge@nic-nac-project.de>
-
- [BZ #1261]
- * manual/memory.texi (Hooks for Malloc): Correct prototype of
- my_init_hook() and definition of my_free_hook.
-
-===================================================================
-RCS file: /cvs/glibc/libc/manual/memory.texi,v
-retrieving revision 1.79
-retrieving revision 1.80
-diff -u -r1.79 -r1.80
---- libc/manual/memory.texi 2005/01/26 02:39:11 1.79
-+++ libc/manual/memory.texi 2005/09/13 17:46:01 1.80
-@@ -948,7 +948,7 @@
- #include <malloc.h>
-
- /* Prototypes for our hooks. */
--static void *my_init_hook (void);
-+static void my_init_hook (void);
- static void *my_malloc_hook (size_t, const void *);
- static void my_free_hook (void*, const void *);
-
-@@ -984,7 +984,7 @@
- return result;
- @}
-
--static void *
-+static void
- my_free_hook (void *ptr, const void *caller)
- @{
- /* Restore all old hooks */
Deleted: glibc-package/branches/glibc-2.4/debian/patches/glibc-manual-string.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/glibc-manual-string.diff 2006-03-09 04:36:31 UTC (rev 1280)
+++ glibc-package/branches/glibc-2.4/debian/patches/glibc-manual-string.diff 2006-03-09 17:58:20 UTC (rev 1281)
@@ -1,23 +0,0 @@
-2005-01-14 GOTO Masanori <gotom@debian.or.jp>
-
- * manual/string.texi (strcasestr): Fix example typo.
-
-===================================================================
-RCS file: /cvs/glibc/libc/manual/string.texi,v
-retrieving revision 1.69
-retrieving revision 1.70
-diff -u -r1.69 -r1.70
---- libc/manual/string.texi 2004/07/14 17:10:28 1.69
-+++ libc/manual/string.texi 2005/01/26 02:39:11 1.70
-@@ -1781,9 +1781,9 @@
-
- For example,
- @smallexample
--strstr ("hello, world", "L")
-+strcasestr ("hello, world", "L")
- @result{} "llo, world"
--strstr ("hello, World", "wo")
-+strcasestr ("hello, World", "wo")
- @result{} "World"
- @end smallexample
- @end deftypefun
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-03-09 04:36:31 UTC (rev 1280)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-03-09 17:58:20 UTC (rev 1281)
@@ -114,9 +114,7 @@
#hppa-pie-relocs.diff -p1
#hurd-getresuid-dyslexia.diff -p0
#hppa-no-ldbl-128.diff -p1
-#glibc-manual-memory.diff -p1
hurd-ioctl-decode-argument.diff -p0
-#glibc-manual-string.diff -p1
ld-multiarch.diff -p1
ldconfig-multiarch.diff -p1
#rtld.diff -p1
Reply to: