r1350 - in glibc-package/trunk/debian: . control.in patches patches/sparc
Author: aurel32
Date: 2006-04-08 15:38:06 +0000 (Sat, 08 Apr 2006)
New Revision: 1350
Removed:
glibc-package/trunk/debian/patches/sparc/local-sparc64-fixups.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/patches/series
Log:
* Remove sparc/local-sparc64-fixups.diff as /lib64 and /usr/lib64 are now a
default search path on 32/64-bit architectures.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-04-08 15:26:46 UTC (rev 1349)
+++ glibc-package/trunk/debian/changelog 2006-04-08 15:38:06 UTC (rev 1350)
@@ -7,6 +7,8 @@
into libc-bin-dev. (Closes: #330735)
* Put each test log file in the corresponding package instead of putting all
of them in libc6.
+ * Remove sparc/local-sparc64-fixups.diff as /lib64 and /usr/lib64 are now a
+ default search path on 32/64-bit architectures.
[ Denis Barbier ]
* debian/debhelper.in/locales.config: /etc/locale.gen was not generated at
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-04-08 15:26:46 UTC (rev 1349)
+++ glibc-package/trunk/debian/control.in/main 2006-04-08 15:38:06 UTC (rev 1350)
@@ -73,6 +73,15 @@
This package contains data files with rules for various timezones around
the world.
+Package: tzdata
+Architecture: all
+Section: libs
+Priority: required
+Replaces: libc0.1, libc0.3, libc6, libc6.1
+Description: GNU C Library: Timezone data
+ This package contains data files with rules for various timezones around
+ the world.
+
Package: nscd
Architecture: @threads_archs@
Section: admin
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-04-08 15:26:46 UTC (rev 1349)
+++ glibc-package/trunk/debian/patches/series 2006-04-08 15:38:06 UTC (rev 1350)
@@ -101,7 +101,6 @@
sparc/cvs-datastart.diff -p0
sparc/cvs-gcc4-inline.diff -p0
sparc/local-gcc4-mv8.diff -p0
-sparc/local-sparc64-fixups.diff -p1
sparc/local-sparcv8-target.diff -p0
sparc/submitted-socket-weakalias.diff -p0
sparc/submitted-timing.diff -p1
Deleted: glibc-package/trunk/debian/patches/sparc/local-sparc64-fixups.diff
===================================================================
--- glibc-package/trunk/debian/patches/sparc/local-sparc64-fixups.diff 2006-04-08 15:26:46 UTC (rev 1349)
+++ glibc-package/trunk/debian/patches/sparc/local-sparc64-fixups.diff 2006-04-08 15:38:06 UTC (rev 1350)
@@ -1,31 +0,0 @@
-# DP: Fix ldconfig so that lib64 searches are implicit.
-
---- glibc-2.2.3/elf/ldconfig.c~ Tue Mar 20 11:44:35 2001
-+++ glibc-2.2.3/elf/ldconfig.c Tue Apr 24 18:14:05 2001
-@@ -287,6 +287,26 @@
- dir_entries = entry;
- else if (ptr == NULL)
- prev->next = entry;
-+#ifdef __sparc__
-+#define MSUBDIR "64"
-+ if (ptr == NULL) {
-+ int si = strlen(entry->path) - strlen(MSUBDIR);
-+ if (strcmp (entry->path + (si <= 0 ? 0 : si), MSUBDIR) != 0) {
-+ /* Handle subdirectory later. */
-+ struct dir_entry *new_entry;
-+
-+ new_entry = xmalloc (sizeof (struct dir_entry));
-+ new_entry->path = xmalloc(strlen(entry->path)+strlen(MSUBDIR)+1);
-+ new_entry->flag = entry->flag;
-+ new_entry->next = NULL;
-+ sprintf(new_entry->path, "%s%s", entry->path, MSUBDIR);
-+ if (opt_verbose)
-+ printf("Adding implicit multilib directory:\n\t%s\n", new_entry->path);
-+ add_single_dir (new_entry, 0);
-+ }
-+ }
-+#undef MSUBDIR
-+#endif
- }
-
- /* Add one directory to the list of directories to process. */
Reply to: