r1344 - in glibc-package/trunk/debian/patches: . any
Author: aurel32
Date: 2006-04-08 12:07:41 +0000 (Sat, 08 Apr 2006)
New Revision: 1344
Added:
glibc-package/trunk/debian/patches/any/cvs-tls-crashfix.diff
glibc-package/trunk/debian/patches/any/local-fhs-linux-paths.diff
Removed:
glibc-package/trunk/debian/patches/any/cvs-fhs-linux-paths.diff
glibc-package/trunk/debian/patches/any/cvs-tls-crash.diff
Modified:
glibc-package/trunk/debian/patches/series
Log:
Fixes to previous commits:
- locale, localdata and hppa patches should be applied in a specific order
- various typo in patch names
Deleted: glibc-package/trunk/debian/patches/any/cvs-fhs-linux-paths.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-fhs-linux-paths.diff 2006-04-08 11:50:43 UTC (rev 1343)
+++ glibc-package/trunk/debian/patches/any/cvs-fhs-linux-paths.diff 2006-04-08 12:07:41 UTC (rev 1344)
@@ -1,17 +0,0 @@
-# DP: Description: Correct linux paths for FHS
-# DP: Author: Unknown
-# DP: Upstream status: Debian-Specific
-# DP: Status Details: GNU doesn't follow the FHS.
-# DP: Date: Unknown
-
---- glibc-2.1.1/sysdeps/unix/sysv/linux/paths.h~ Thu May 27 13:16:33 1999
-+++ glibc-2.1.1/sysdeps/unix/sysv/linux/paths.h Thu May 27 13:17:55 1999
-@@ -71,7 +71,7 @@
- /* Provide trailing slash, since mostly used for building pathnames. */
- #define _PATH_DEV "/dev/"
- #define _PATH_TMP "/tmp/"
--#define _PATH_VARDB "/var/db/"
-+#define _PATH_VARDB "/var/lib/misc/"
- #define _PATH_VARRUN "/var/run/"
- #define _PATH_VARTMP "/var/tmp/"
-
Deleted: glibc-package/trunk/debian/patches/any/cvs-tls-crash.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-tls-crash.diff 2006-04-08 11:50:43 UTC (rev 1343)
+++ glibc-package/trunk/debian/patches/any/cvs-tls-crash.diff 2006-04-08 12:07:41 UTC (rev 1344)
@@ -1,61 +0,0 @@
-# DP: Description: TLS fixes for xmms/nvidia crash
-# DP: Related bugs: #219352
-# DP: Dpatch author: Jeff Bailey
-# DP: Patch author:
-# DP: Upstream status: In CVS
-# DP: Status Details:
-# DP: Date: 2005-03-22, 2005-04-16 updated by gotom
-
-2005-03-15 Jakub Jelinek <jakub@redhat.com>
-
- [BZ#786]
- * sysdeps/generic/dl-tls.c (_dl_next_tls_modid): Handle
- GL(dl_tls_static_nelem) == GL(dl_tls_max_dtv_idx).
-
---- libc/sysdeps/generic/dl-tls.c.jj 2005-02-25 14:45:06.000000000 +0100
-+++ libc/sysdeps/generic/dl-tls.c 2005-03-15 15:36:55.593127093 +0100
-@@ -71,26 +71,24 @@ _dl_next_tls_modid (void)
- NB: the offset +1 is due to the fact that DTV[0] is used
- for something else. */
- result = GL(dl_tls_static_nelem) + 1;
-- /* If the following would not be true we mustn't have assumed
-- there is a gap. */
-- assert (result <= GL(dl_tls_max_dtv_idx));
-- do
-- {
-- while (result - disp < runp->len)
-- {
-- if (runp->slotinfo[result - disp].map == NULL)
-- break;
--
-- ++result;
-- assert (result <= GL(dl_tls_max_dtv_idx) + 1);
-- }
--
-- if (result - disp < runp->len)
-- break;
--
-- disp += runp->len;
-- }
-- while ((runp = runp->next) != NULL);
-+ if (result <= GL(dl_tls_max_dtv_idx))
-+ do
-+ {
-+ while (result - disp < runp->len)
-+ {
-+ if (runp->slotinfo[result - disp].map == NULL)
-+ break;
-+
-+ ++result;
-+ assert (result <= GL(dl_tls_max_dtv_idx) + 1);
-+ }
-+
-+ if (result - disp < runp->len)
-+ break;
-+
-+ disp += runp->len;
-+ }
-+ while ((runp = runp->next) != NULL);
-
- if (result > GL(dl_tls_max_dtv_idx))
- {
Copied: glibc-package/trunk/debian/patches/any/cvs-tls-crashfix.diff (from rev 1342, glibc-package/trunk/debian/patches/any/cvs-tls-crash.diff)
Copied: glibc-package/trunk/debian/patches/any/local-fhs-linux-paths.diff (from rev 1342, glibc-package/trunk/debian/patches/any/cvs-fhs-linux-paths.diff)
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-04-08 11:50:43 UTC (rev 1343)
+++ glibc-package/trunk/debian/patches/series 2006-04-08 12:07:41 UTC (rev 1344)
@@ -1,48 +1,47 @@
-locale/LC_COLLATE-keywords-ordering.diff
-locale/LC_IDENTIFICATION-optional-fields.diff
-#locale/check-unknown-symbols.diff # locales have to be fixed first
-locale/complex-collate.diff
+localedata/cvs-localedata.diff -p0
+localedata/locale-de_CH.diff -p1
+localedata/locale-eo_EO.diff -p1
+localedata/locale-no_NO.diff -p0
+localedata/locale-eu_FR.diff -p0
locale/cvs-iso4217.diff -p0
locale/cvs-iso639.diff -p0
-locale/fix-C-first_weekday.diff -p0
-locale/fix-LC_COLLATE-rules.diff
-locale/fix-exhausted-memory.diff
locale/iso4217-RON.diff -p0
-locale/locale-print-LANGUAGE.diff
-locale/preprocessor-collate.diff
-
-localedata/cvs-localedata.diff -p0
+localedata/locale-ro_RO.diff -p0
+localedata/locale-ku_TR.diff -p0
#localedata/discard-dz_BT.diff # not needed when complex-collate is applied
-localedata/dz_BT-collation.diff
-localedata/first_weekday.diff -p0
-localedata/fix-lang.diff
-localedata/fix-unknown-symbols.diff
+locale/complex-collate.diff
+locale/fix-exhausted-memory.diff
+#locale/check-unknown-symbols.diff # locales have to be fixed first
+locale/fix-LC_COLLATE-rules.diff
+locale/preprocessor-collate.diff
+locale/LC_IDENTIFICATION-optional-fields.diff
+locale/LC_COLLATE-keywords-ordering.diff
+locale/locale-print-LANGUAGE.diff
+locale/fix-C-first_weekday.diff -p0
+localedata/tl_PH-yesexpr.diff
localedata/fo_FO-date_fmt.diff
-localedata/locale-csb_PL.diff
-localedata/locale-de_CH.diff -p1
+localedata/locales_CH.diff
+localedata/locales-fr.diff
+localedata/locales_GB.diff -p0
+localedata/supported.diff
+localedata/locale-sa_IN.diff -p0
localedata/locale-en_DK.diff
-localedata/locale-en_NZ.diff
-localedata/locale-eo_EO.diff -p1
-localedata/locale-eu_FR.diff -p0
localedata/locale-hy_AM.diff
-localedata/locale-ia.diff
-localedata/locale-ku_TR.diff -p0
-localedata/locale-no_NO.diff -p0
-localedata/locale-nr_ZA.diff
localedata/locale-pl_PL.diff -p0
-localedata/locale-ro_RO.diff -p0
-localedata/locale-sa_IN.diff -p0
-localedata/locale-te_IN.diff
localedata/locale-wo_SN.diff -p0
-localedata/locales-fr.diff
-localedata/locales_CH.diff
-localedata/locales_GB.diff -p0
localedata/new-catalan-locales.diff
-localedata/sort-UTF8-first.diff -p0
-localedata/supported.diff
-localedata/tailor-iso14651_t1.diff -p0
-localedata/tl_PH-yesexpr.diff
+localedata/locale-csb_PL.diff
+localedata/locale-te_IN.diff
+localedata/locale-nr_ZA.diff
+localedata/locale-en_NZ.diff
+localedata/dz_BT-collation.diff
localedata/update-ZA.diff
+localedata/locale-ia.diff
+localedata/tailor-iso14651_t1.diff -p0
+localedata/fix-lang.diff
+localedata/fix-unknown-symbols.diff
+localedata/first_weekday.diff -p0
+localedata/sort-UTF8-first.diff -p0
all/cvs-manual-memory.diff -p1
all/cvs-manual-string.diff -p1
@@ -80,21 +79,19 @@
arm/local-no-hwcap.diff -p0
#arm/local-output-format.diff -p0 # g: suspended
-hppa/cvs-linesep.diff -p0
-hppa/cvs-no-ldbl-128.diff -p1
-hppa/cvs-pie-relocs.diff -p1
hppa/local-Rminkernel.diff -p0
-hppa/local-gcc-4-profile.diff -p0
-hppa/local-inlining.diff -p1
-#hppa/local-remove-mallocdef.diff -p0 # g: this should be replaced by Carlos' new patch.
hppa/submitted-drop-utimes.diff -p1
-hppa/submitted-fenv-align.diff -p1
-hppa/submitted-fpu.diff -p1
-hppa/submitted-full-nptl-2003-10-22.diff
-hppa/submitted-full-nptl-2004-12-20.diff
-hppa/submitted-iitlbp.diff -p1
+hppa/cvs-linesep.diff -p0
+#hppa/local-remove-mallocdef.diff -p0 # g: this should be replaced by Carlos' new patch.
hppa/submitted-lt.diff -p1
hppa/submitted-sysdeps.diff -p1
+hppa/local-gcc-4-profile.diff -p0
+hppa/submitted-iitlbp.diff -p1
+hppa/submitted-fenv-align.diff -p1
+hppa/submitted-fpu.diff -p1
+hppa/cvs-pie-relocs.diff -p1
+hppa/cvs-no-ldbl-128.diff -p1
+hppa/local-inlining.diff -p1
hurd-i386/cvs-getresuid-dyslexia.diff -p0
hurd-i386/cvs-ioctl-pfinet.diff -p0
@@ -111,11 +108,10 @@
m68k/local-fpic.diff -p1
m68k/local-reloc.diff -p1
m68k/submitted-gcc34-seccomment.diff -p0
-m68k/submitted-linuxthreads-fPIC.diff -p1
mips/cvs-gcc4-inline.diff -p0
mips/cvs-gcc4-sysdeps.diff -p0
-mips/local-mips.diff -p0
+mips/local-librt.diff -p0
mips/local-lazy-eval.diff -p2
mips/submitted-msq.diff -p0
Reply to: