Author: dan
Date: 2005-05-10 19:13:53 +0000 (Tue, 10 May 2005)
New Revision: 905
Added:
glibc-package/trunk/debian/patches/rtld-vdso-assertion.dpatch
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/00list
glibc-package/trunk/debian/po/da.po
glibc-package/trunk/debian/po/el.po
glibc-package/trunk/debian/po/pl.po
glibc-package/trunk/debian/po/ru.po
glibc-package/trunk/debian/po/tr.po
glibc-package/trunk/debian/po/uk.po
glibc-package/trunk/debian/po/zh_CN.po
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
- debian/patches/rtld-vdso-assertion.dpatch: Fix an assertion failure
running /lib/libc.so.6.
- debian/rules.d/debhelper.mk: Mark runnable libraries +x again.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2005-05-03 02:54:40 UTC (rev
904)
+++ glibc-package/trunk/debian/changelog 2005-05-10 19:13:53 UTC (rev
905)
@@ -1,3 +1,13 @@
+glibc (2.3.2.ds1-22) unstable; urgency=medium
+
+ * Daniel Jacobowitz <[EMAIL PROTECTED]>
+
+ - debian/patches/rtld-vdso-assertion.dpatch: Fix an assertion failure
+ running /lib/libc.so.6.
+ - debian/rules.d/debhelper.mk: Mark runnable libraries +x again.
+
+ -- Daniel Jacobowitz <[EMAIL PROTECTED]> Tue, 10 May 2005 15:11:53 -0400
+
glibc (2.3.2.ds1-21) unstable; urgency=high
* GOTO Masanori <[EMAIL PROTECTED]>
Modified: glibc-package/trunk/debian/patches/00list
===================================================================
--- glibc-package/trunk/debian/patches/00list 2005-05-03 02:54:40 UTC (rev
904)
+++ glibc-package/trunk/debian/patches/00list 2005-05-10 19:13:53 UTC (rev
905)
@@ -124,3 +124,4 @@
glibc232-tls-crashfix
glibc232-clock_settime
glibc23-mips-lazy-eval
+rtld-vdso-assertion
Added: glibc-package/trunk/debian/patches/rtld-vdso-assertion.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/rtld-vdso-assertion.dpatch
2005-05-03 02:54:40 UTC (rev 904)
+++ glibc-package/trunk/debian/patches/rtld-vdso-assertion.dpatch
2005-05-10 19:13:53 UTC (rev 905)
@@ -0,0 +1,157 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: Correct a bit of VDSO support which broke running
+# DP: binaries linked against ld.so directly.
+# DP: Related bugs: 207872, 210840, 274852, 276384
+# DP: Dpatch author: Daniel Jacobowitz <[EMAIL PROTECTED]>
+# DP: Patch author: Daniel Jacobowitz, Roland McGrath, Jakub Jelinek
+# DP: Upstream status: In CVS
+# DP: Status Details: Backported
+# DP: Date: 2005-05-08
+
+PATCHLEVEL=1
+
+if [ $# -ne 2 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
+ -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+2004-02-27 Jakub Jelinek <[EMAIL PROTECTED]>
+
+ * elf/rtld.c (dl_main): Adjust l->l_ld of the vDSO by l->l_addr.
+ * sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Only set
+ GL(dl_sysinfo) if non-zero.
+
+2004-02-26 Jakub Jelinek <[EMAIL PROTECTED]>
+
+ * elf/rtld.c (dl_main): Correctly set up l_map_end and l_addr
+ in vDSO's link_map, don't assume l_addr == 0. Set GL(dl_sysinfo)
+ from e_entry only if AT_SYSINFO not present and adjust by l_addr.
+ Take vDSO into account when inserting rtld into _dl_loaded chain.
+
+2003-10-09 Roland McGrath <[EMAIL PROTECTED]>
+
+ * elf/rtld.c (dl_main): Don't set l_name for sysinfo DSO, since there
+ is no file to name.
+
+2003-10-08 Jakub Jelinek <[EMAIL PROTECTED]>
+
+ * sysdeps/generic/dl-sysdep.c (_dl_important_hwcaps): Don't generate
+ two identical copies of strings.
+
+2003-09-30 Daniel Jacobowitz <[EMAIL PROTECTED]>
+
+ * elf/rtld.c (dl_main): Set l_libname and l_name for the sysinfo DSO
+ to work around kernel problem.
+
+--- glibc-2.3.2/elf/rtld.c.orig 2005-05-08 10:25:33.775671493 -0400
++++ glibc-2.3.2/elf/rtld.c 2005-05-08 10:29:36.631515133 -0400
+@@ -1161,11 +1161,9 @@ of this helper program; chances are you
+ }
+
+ #ifdef NEED_DL_SYSINFO
++ struct link_map *sysinfo_map = NULL;
+ if (GL(dl_sysinfo_dso) != NULL)
+ {
+- /* We have a prelinked DSO preloaded by the system. */
+- GL(dl_sysinfo) = GL(dl_sysinfo_dso)->e_entry;
+-
+ /* Do an abridged version of the work _dl_map_object_from_fd would do
+ to map in the object. It's already mapped and prelinked (and
+ better be, since it's read-only and so we couldn't relocate it).
+@@ -1174,7 +1172,7 @@ of this helper program; chances are you
+ struct link_map *l = _dl_new_object ((char *) "", "", lt_library, NULL);
+ if (__builtin_expect (l != NULL, 1))
+ {
+- static ElfW(Dyn) dyn_temp [DL_RO_DYN_TEMP_CNT];
++ static ElfW(Dyn) dyn_temp[DL_RO_DYN_TEMP_CNT];
+
+ l->l_phdr = ((const void *) GL(dl_sysinfo_dso)
+ + GL(dl_sysinfo_dso)->e_phoff);
+@@ -1188,18 +1186,32 @@ of this helper program; chances are you
+ l->l_ldnum = ph->p_memsz / sizeof (ElfW(Dyn));
+ break;
+ }
+- if (ph->p_type == PT_LOAD)
+- assert ((void *) ph->p_vaddr == GL(dl_sysinfo_dso));
++ else if (ph->p_type == PT_LOAD)
++ {
++ if (! l->l_addr)
++ l->l_addr = ph->p_vaddr;
++ else if (ph->p_vaddr + ph->p_memsz >= l->l_map_end)
++ l->l_map_end = ph->p_vaddr + ph->p_memsz;
++ }
+ }
++ l->l_map_start = (ElfW(Addr)) GL(dl_sysinfo_dso);
++ l->l_addr = l->l_map_start - l->l_addr;
++ l->l_map_end += l->l_addr;
++ l->l_ld = (void *) ((ElfW(Addr)) l->l_ld + l->l_addr);
+ elf_get_dynamic_info (l, dyn_temp);
+ _dl_setup_hash (l);
+ l->l_relocated = 1;
+
+ /* Now that we have the info handy, use the DSO image's soname
+ so this object can be looked up by name. */
+ if (l->l_info[DT_SONAME] != NULL)
+ l->l_libname->name = ((char *) D_PTR (l, l_info[DT_STRTAB])
+ + l->l_info[DT_SONAME]->d_un.d_val);
++
++ /* We have a prelinked DSO preloaded by the system. */
++ if (GL(dl_sysinfo) == DL_SYSINFO_DEFAULT)
++ GL(dl_sysinfo) = GL(dl_sysinfo_dso)->e_entry + l->l_addr;
++ sysinfo_map = l;
+ }
+ }
+ #endif
+@@ -1245,9 +1268,17 @@ of this helper program; chances are you
+ ++i;
+ GL(dl_rtld_map).l_prev = GL(dl_loaded)->l_searchlist.r_list[i - 1];
+ if (__builtin_expect (mode, normal) == normal)
+- GL(dl_rtld_map).l_next = (i + 1 < GL(dl_loaded)->l_searchlist.r_nlist
+- ? GL(dl_loaded)->l_searchlist.r_list[i + 1]
+- : NULL);
++ {
++ GL(dl_rtld_map).l_next = (i + 1 < GL(dl_loaded)->l_searchlist.r_nlist
++ ? GL(dl_loaded)->l_searchlist.r_list[i + 1]
++ : NULL);
++#ifdef NEED_DL_SYSINFO
++ if (sysinfo_map != NULL
++ && GL(dl_rtld_map).l_prev->l_next == sysinfo_map
++ && GL(dl_rtld_map).l_next != sysinfo_map)
++ GL(dl_rtld_map).l_prev = sysinfo_map;
++#endif
++ }
+ else
+ /* In trace mode there might be an invisible object (which we
+ could not find) after the previous one in the search list.
+--- glibc-2.3.2/sysdeps/generic/dl-sysdep.c.orig 2005-05-08
10:16:09.270961000 -0400
++++ glibc-2.3.2/sysdeps/generic/dl-sysdep.c 2005-05-08 10:41:11.607089482
-0400
+@@ -196,7 +196,7 @@ _dl_sysdep_start (void **start_argptr,
+
+ #if defined NEED_DL_SYSINFO
+ /* Only set the sysinfo value if we also have the vsyscall DSO. */
+- if (GL(dl_sysinfo_dso) != 0)
++ if (GL(dl_sysinfo_dso) != 0 && new_sysinfo)
+ GL(dl_sysinfo) = new_sysinfo;
+ #endif
+
+@@ -454,7 +454,7 @@ _dl_important_hwcaps (const char *platfo
+ }
+ else
+ {
+- n = 1 << cnt;
++ n = 1 << (cnt - 1);
+ do
+ {
+ n -= 2;
Modified: glibc-package/trunk/debian/po/da.po
===================================================================
--- glibc-package/trunk/debian/po/da.po 2005-05-03 02:54:40 UTC (rev 904)
+++ glibc-package/trunk/debian/po/da.po 2005-05-10 19:13:53 UTC (rev 905)
@@ -47,9 +47,9 @@
"locale.gen', which you can also edit manually (you need to run `locale-gen' "
"afterwards)."
msgstr ""
-"VÃlg hvilke lokaliteter der skal genereres. Dine valg vil blive gemt til '"
-"/etc/locale.gen', som du ogsà kan redigere manuelt (du skal kÃre
'locale-gen'"
-" bagefter."
+"VÃlg hvilke lokaliteter der skal genereres. Dine valg vil blive gemt til '/"
+"etc/locale.gen', som du ogsà kan redigere manuelt (du skal kÃre
'locale-gen' "
+"bagefter."
#. Type: select
#. Choices
@@ -73,9 +73,9 @@
"generate."
msgstr ""
"Mange pakker i Debian bruger lokaliteter til at vise tekst i det korrekt "
-"sprog til brugerne. Du kan Ãndre standard-lokaliteten hvis engelsk ikke "
-"er dit modersmÃls sprog. Dine valg er baseret pà hvilke lokalitetsfiler "
-"du valgte at generere."
+"sprog til brugerne. Du kan Ãndre standard-lokaliteten hvis engelsk ikke er "
+"dit modersmÃls sprog. Dine valg er baseret pà hvilke lokalitetsfiler du "
+"valgte at generere."
#. Type: select
#. Description
@@ -87,4 +87,5 @@
"default locale."
msgstr ""
"BemÃrk: Dette vil sÃtte sproget for hele systemet. Hvis ikke alle brugerne "
-"pà dit system kan forstà det sprog som du vÃlger, kan de lÃbe ind i
problemer."
+"pà dit system kan forstà det sprog som du vÃlger, kan de lÃbe ind i "
+"problemer."
Modified: glibc-package/trunk/debian/po/el.po
===================================================================
--- glibc-package/trunk/debian/po/el.po 2005-05-03 02:54:40 UTC (rev 904)
+++ glibc-package/trunk/debian/po/el.po 2005-05-10 19:13:53 UTC (rev 905)
@@ -38,9 +38,9 @@
"Locale is a framework to switch between multiple languages for users who can "
"select to use their language, country, characters, collation order, etc."
msgstr ""
-"ÎÎ ÎÎÏÏÏÎÎÏ ÏÎÏÎÎÎÎÎÎÎ (locale) ÎÎÎÎÎ ÎÎÎ
ÏÎÎÎÏÎÎ ÏÏÎÏÏÎÏÎÎÎÏ ÎÎÎÎÎÎÎÎÏ ÏÎÎÎÎÏÎÏÎ "
-"ÎÎÏÏÏÏÎ, ÏÏÏÎ ÎÎ ÏÏÎÏÏÎÏ ÎÎ ÎÏÎÏÎÏÎ ÎÎ
ÏÏÎÏÎÎÎÏÎÎÎÏÎ ÏÎ ÎÎÏÏÏÎ ÏÎÏÏ, ÎÎ ÏÎÎ ÏÎ "
-"ÏÏÎÎÏÎÎÏÎÎÏÎÎ, ÏÎÏÎÎÏÎÏÎÏ, ÎÏÎÎÏÎÎ,
ÏÎÏÎÎÎÏ ÏÏÎÎÎÏÎÎÏ, ÎÎÏ."
+"ÎÎ ÎÎÏÏÏÎÎÏ ÏÎÏÎÎÎÎÎÎÎ (locale) ÎÎÎÎÎ ÎÎÎ
ÏÎÎÎÏÎÎ ÏÏÎÏÏÎÏÎÎÎÏ ÎÎÎÎÎÎÎÎÏ "
+"ÏÎÎÎÎÏÎÏÎ ÎÎÏÏÏÏÎ, ÏÏÏÎ ÎÎ ÏÏÎÏÏÎÏ ÎÎ
ÎÏÎÏÎÏÎ ÎÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎ ÏÎ ÎÎÏÏÏÎ "
+"ÏÎÏÏ, ÎÎ ÏÎÎ ÏÎ ÏÏÎÎÏÎÎÏÎÎÏÎÎ, ÏÎÏÎÎÏÎÏÎÏ,
ÎÏÎÎÏÎÎ, ÏÎÏÎÎÎÏ ÏÏÎÎÎÏÎÎÏ, ÎÎÏ."
#. Type: multiselect
#. Description
@@ -51,8 +51,9 @@
"afterwards)."
msgstr ""
"ÎÏÎÎÎÎÏÎ ÏÎÎÎ ÎÎÏÏÏÎÎÎ ÏÎÏÎÎÎÎÎÎÎÏÎ
ÎÎÎÎÏÎ ÎÎ ÎÎÎÎÎÏÏÎÎÎÎÏÎ. Î ÎÏÎÎÎÎÎ ÎÎ "
-"ÎÏÎÎÎÎÎÏÏÎÎ ÏÏÎ ÎÏÏÎÎÎ '/etc/locale.gen', ÏÎ ÎÏÎÎÎ
ÎÏÎÏÎÎÏÎ ÎÎ ÎÏÎÎÎÏÎÎÏÏÎÎÏÎ ÎÎÎ "
-"ÏÎÎÏÎÎÎÎÎÏÎ (ÎÏÎÎÏÎ ÎÎ ÏÏÎÏÎÎ ÎÎ
ÎÎÏÎÎÎÏÎÏÎ ÏÎÎ ÎÎÏÎÎÎ 'locale-gen')."
+"ÎÏÎÎÎÎÎÏÏÎÎ ÏÏÎ ÎÏÏÎÎÎ '/etc/locale.gen', ÏÎ ÎÏÎÎÎ
ÎÏÎÏÎÎÏÎ ÎÎ "
+"ÎÏÎÎÎÏÎÎÏÏÎÎÏÎ ÎÎÎ ÏÎÎÏÎÎÎÎÎÏÎ (ÎÏÎÎÏÎ ÎÎ
ÏÏÎÏÎÎ ÎÎ ÎÎÏÎÎÎÏÎÏÎ ÏÎÎ ÎÎÏÎÎÎ "
+"'locale-gen')."
#. Type: select
#. Choices
@@ -76,9 +77,9 @@
"generate."
msgstr ""
"ÎÎÎÎÎ ÏÎÎÎÏÎ ÏÏÎ DebiaÎ ÏÏÎÏÎÎÎÏÎÎÎÏÎ ÏÎ
ÎÏÎÎÏÏÏÎÏÎ ÏÏÎ ÎÎÏÏÏÎÎÏÎ "
-"ÏÎÏÎÎÎÎÎÎÎÏÏÎ ÎÎÎ ÎÎ ÎÎÏÎÎÎÎÎÏÎ ÎÎÎÎÎÎÎ
ÏÏÎÎ ÎÏÎÎÎÎÎÎÎÎ ÎÎÏÏÏÎ ÏÎÏ "
-"ÎÎÎÎ ÏÏÎÏÏÎ. ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÎÎÎÏÎ ÏÎ
ÏÏÎÎÎÎÎÏÎÏÎÎÎÎ ÎÎÏÏÏÎÎÏ ÏÎÏÎÎÎÎÎÎÎ "
-"ÎÎ Î ÎÎÎÎÎÎÎ ÎÎÎ ÎÎÎÎÎ Î ÎÎÏÏÎÎÎ ÏÎÏ
ÎÎÏÏÏÎ. ÎÏÏÎÏ ÎÎ ÎÏÎÎÎÎÎÏ ÎÎÏÎÎÎÎÏÎÎ ÏÏÎ "
+"ÏÎÏÎÎÎÎÎÎÎÏÏÎ ÎÎÎ ÎÎ ÎÎÏÎÎÎÎÎÏÎ ÎÎÎÎÎÎÎ
ÏÏÎÎ ÎÏÎÎÎÎÎÎÎÎ ÎÎÏÏÏÎ ÏÎÏ ÎÎÎÎ "
+"ÏÏÎÏÏÎ. ÎÏÎÏÎÎÏÎ ÎÎ ÎÎÎÎÎÎÏÎ ÏÎ
ÏÏÎÎÎÎÎÏÎÏÎÎÎÎ ÎÎÏÏÏÎÎÏ ÏÎÏÎÎÎÎÎÎÎ ÎÎ Î "
+"ÎÎÎÎÎÎÎ ÎÎÎ ÎÎÎÎÎ Î ÎÎÏÏÎÎÎ ÏÎÏ ÎÎÏÏÏÎ.
ÎÏÏÎÏ ÎÎ ÎÏÎÎÎÎÎÏ ÎÎÏÎÎÎÎÏÎÎ ÏÏÎ "
"ÎÎÏÏÏÎÎÎ ÏÎÏÎÎÎÎÎÎÎÏÎ ÏÎÏ ÎÏÎÎÎÎÎÏÎ ÎÎ
ÎÎÎÎÎÏÏÎÎÎÎÏÎ."
#. Type: select
@@ -93,5 +94,5 @@
"ÎÎÎÎÎÏÏÎ: ÎÏÏÎ Î ÎÏÎÎÎÎÎ ÎÎ ÎÏÎÎÎÎÎÎ ÏÎ
ÎÎÏÏÏÎ ÎÎÎ ÎÎÏÎÎÎÏÎ ÏÎ ÏÏÏÏÎÎÎ ÏÎÏ. "
"ÎÎ ÎÏÎÏÎ ÎÎÎ ÏÎÎÏÏÏÎÏÏÎÎÏ ÏÏÏÏÎÎÎ, ÏÏÎ
ÎÏÎÎÎ ÎÎ ÏÏÎÏÏÎÏ ÎÎ ÎÎÎÎÏÎ ÏÎÎÎ ÏÎÎ "
"ÎÎÏÏÏÎ ÏÎÏ ÎÏÎÎÏ ÎÏÎÎÎÎÎÏÎ, ÏÏÏÎ ÏÎÎÎÎÏÎ
ÎÎ ÏÏÎÎÎÏÎÏÎÏÎ ÎÏÏÎÎÎÎÎÏ ÎÎÎ ÎÎÎ ÏÎ "
-"ÎÏÎÎ ÎÏÏÏ ÎÏÏÏ ÎÎ ÎÎ ÏÏÎÏÎÎ ÎÎ ÎÏÎÏÎÏÎ ÎÎÎ
ÏÏÎÎÎÎÎÏÎÏÎÎÎÎ ÎÎÏÏÏÎÎÏ ÏÎÏÎÎÎÎÎÎÎ."
-
+"ÎÏÎÎ ÎÏÏÏ ÎÏÏÏ ÎÎ ÎÎ ÏÏÎÏÎÎ ÎÎ ÎÏÎÏÎÏÎ ÎÎÎ
ÏÏÎÎÎÎÎÏÎÏÎÎÎÎ ÎÎÏÏÏÎÎÏ "
+"ÏÎÏÎÎÎÎÎÎÎ."
Modified: glibc-package/trunk/debian/po/pl.po
===================================================================
--- glibc-package/trunk/debian/po/pl.po 2005-05-03 02:54:40 UTC (rev 904)
+++ glibc-package/trunk/debian/po/pl.po 2005-05-10 19:13:53 UTC (rev 905)
@@ -24,8 +24,9 @@
"Locale is a framework to switch between multiple languages for users who can "
"select to use their language, country, characters, collation order, etc."
msgstr ""
-"Wybierane tutaj ustawienia loklane stanowiÄ podstawowÄ strukturÄ "
-"dajÄcÄ moÅliwoÅÄ pracy systemu w specyficznym dla danego kraju
Årodowisku (jÄzyk, zestaw znakÃw, kolejnoÅÄ sortowania itp.)"
+"Wybierane tutaj ustawienia loklane stanowiÄ podstawowÄ strukturÄ dajÄcÄ "
+"moÅliwoÅÄ pracy systemu w specyficznym dla danego kraju Årodowisku
(jÄzyk, "
+"zestaw znakÃw, kolejnoÅÄ sortowania itp.)"
#. Type: multiselect
#. Description
@@ -34,7 +35,11 @@
"Choose which locales to generate. The selection will be saved to `/etc/"
"locale.gen', which you can also edit manually (you need to run `locale-gen' "
"afterwards)."
-msgstr "Wybierz, ktÃry zestaw ustawieÅ loklanych chcesz wygenerowaÄ. TwÃj
wybÃr zostanie zapisany do pliku `/etc/locale.gen', ktÃry moÅna pÃÅniej
edytowaÄ dowolnym edytorem tekstu (w tym przypadku konieczne bÄdzie
pÃÅniejsze uruchomienie 'locale-gen')."
+msgstr ""
+"Wybierz, ktÃry zestaw ustawieÅ loklanych chcesz wygenerowaÄ. TwÃj wybÃr "
+"zostanie zapisany do pliku `/etc/locale.gen', ktÃry moÅna pÃÅniej
edytowaÄ "
+"dowolnym edytorem tekstu (w tym przypadku konieczne bÄdzie pÃÅniejsze "
+"uruchomienie 'locale-gen')."
#. Type: select
#. Choices
@@ -56,7 +61,12 @@
"for users. You can change the default locale if you're not a native English "
"speaker. These choices are based on which locales you have chosen to "
"generate."
-msgstr "Wiele programÃw dostarczanych w pakietach Debiana wykorzystuje
ustawienia lokalne, aby wyÅwietlaÄ tekst we wÅaÅciwym dla uÅytkownika
jÄzyku. MoÅesz zmieniÄ domyÅlne ustawienia loklane jeÅeli nie chcesz
posÅugiwaÄ siÄ jÄzykiem angielskim. MoÅna wybraÄ tylko te ustawienia
loklane, ktÃre wczeÅniej zostaÅy wygenerowane."
+msgstr ""
+"Wiele programÃw dostarczanych w pakietach Debiana wykorzystuje ustawienia "
+"lokalne, aby wyÅwietlaÄ tekst we wÅaÅciwym dla uÅytkownika jÄzyku.
MoÅesz "
+"zmieniÄ domyÅlne ustawienia loklane jeÅeli nie chcesz posÅugiwaÄ siÄ "
+"jÄzykiem angielskim. MoÅna wybraÄ tylko te ustawienia loklane, ktÃre "
+"wczeÅniej zostaÅy wygenerowane."
#. Type: select
#. Description
@@ -66,5 +76,8 @@
"a multi-user system where not all of your users speak the language of your "
"choice, then they will run into difficulties and you might want not to set a "
"default locale."
-msgstr "ZwrÃÄ uwagÄ na to, Åe wybrany tutaj jÄzyk ma wpÅyw na na caÅy
system i wiÄkszoÅÄ dziaÅajÄcych w nim programÃw. JeÅeli z tego systemu
korzysta wiÄcej uÅytkownikÃw posÅujÄcych siÄ rÃÅnymi jÄzykami
najlepiej bÄdzie pozostawiÄ domyÅlne (angielskie) ustawiania lokalne."
-
+msgstr ""
+"ZwrÃÄ uwagÄ na to, Åe wybrany tutaj jÄzyk ma wpÅyw na na caÅy system i
"
+"wiÄkszoÅÄ dziaÅajÄcych w nim programÃw. JeÅeli z tego systemu korzysta
"
+"wiÄcej uÅytkownikÃw posÅujÄcych siÄ rÃÅnymi jÄzykami najlepiej
bÄdzie "
+"pozostawiÄ domyÅlne (angielskie) ustawiania lokalne."
Modified: glibc-package/trunk/debian/po/ru.po
===================================================================
--- glibc-package/trunk/debian/po/ru.po 2005-05-03 02:54:40 UTC (rev 904)
+++ glibc-package/trunk/debian/po/ru.po 2005-05-10 19:13:53 UTC (rev 905)
@@ -75,8 +75,9 @@
"generate."
msgstr ""
"÷ Debian ÍÎÏÇÉÅ ÐÁËÅÔÙ ÉÓÐÏÌØÚÕÀÔ ÌÏËÁÌØ ÄÌÑ ÏÔÏÂÒÁÖÅÎÉÑ ÔÅËÓÔÁ ÎÁ ×ÙÂÒÁÎÎÏÍ "
-"ÐÏÌØÚÏ×ÁÔÅÌÅÍ ÑÚÙËÅ. ÷Ù ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ÌÏËÁÌØ ÐÏ ÕÍÏÌÞÁÎÉÀ, ÅÓÌÉ ÎÅ ×ÌÁÄÅÅÔÅ
"
-"ÁÎÇÌÉÊÓËÉÍ ÑÚÙËÏÍ. óÐÉÓÏË ÓÏÓÔÁ×ÌÅÎ ÉÚ ÔÅÈ ÌÏËÁÌÅÊ, ËÏÔÏÒÙÅ ÷Ù ÒÅÛÉÌÉ
ÓÇÅÎÅÒÉÒÏ×ÁÔØ."
+"ÐÏÌØÚÏ×ÁÔÅÌÅÍ ÑÚÙËÅ. ÷Ù ÍÏÖÅÔÅ ÉÚÍÅÎÉÔØ ÌÏËÁÌØ ÐÏ ÕÍÏÌÞÁÎÉÀ, ÅÓÌÉ ÎÅ "
+"×ÌÁÄÅÅÔÅ ÁÎÇÌÉÊÓËÉÍ ÑÚÙËÏÍ. óÐÉÓÏË ÓÏÓÔÁ×ÌÅÎ ÉÚ ÔÅÈ ÌÏËÁÌÅÊ, ËÏÔÏÒÙÅ ÷Ù "
+"ÒÅÛÉÌÉ ÓÇÅÎÅÒÉÒÏ×ÁÔØ."
#. Type: select
#. Description
Modified: glibc-package/trunk/debian/po/tr.po
===================================================================
--- glibc-package/trunk/debian/po/tr.po 2005-05-03 02:54:40 UTC (rev 904)
+++ glibc-package/trunk/debian/po/tr.po 2005-05-10 19:13:53 UTC (rev 905)
@@ -29,8 +29,9 @@
"Locale is a framework to switch between multiple languages for users who can "
"select to use their language, country, characters, collation order, etc."
msgstr ""
-"Yerel (locale), kullanÄcÄlarÄn kullanmak istediÄi dil, Ãlke, karakter,
sÄralama Åekli gibi dile "
-"Ãzgà ayarlar arasÄnda kolayca geÃiÅ yapmasÄnÄ saÄlayan bir yapÄdÄr."
+"Yerel (locale), kullanÄcÄlarÄn kullanmak istediÄi dil, Ãlke, karakter, "
+"sÄralama Åekli gibi dile Ãzgà ayarlar arasÄnda kolayca geÃiÅ
yapmasÄnÄ "
+"saÄlayan bir yapÄdÄr."
#. Type: multiselect
#. Description
@@ -40,9 +41,9 @@
"locale.gen', which you can also edit manually (you need to run `locale-gen' "
"afterwards)."
msgstr ""
-"OluÅturulacak yerelleri seÃiniz. YapÄlan seÃim '/etc/locale.gen'
dosyasÄ iÃinde "
-"saklanacaktÄr. Daha sonra bu dosyayÄ elle deÄiÅtirebilirsiniz (bunu
yaptÄktan sonra "
-"`locale-gen' komutunu ÃalÄÅtÄrmanÄz gerekecektir)."
+"OluÅturulacak yerelleri seÃiniz. YapÄlan seÃim '/etc/locale.gen'
dosyasÄ "
+"iÃinde saklanacaktÄr. Daha sonra bu dosyayÄ elle deÄiÅtirebilirsiniz
(bunu "
+"yaptÄktan sonra `locale-gen' komutunu ÃalÄÅtÄrmanÄz gerekecektir)."
#. Type: select
#. Choices
@@ -65,8 +66,10 @@
"speaker. These choices are based on which locales you have chosen to "
"generate."
msgstr ""
-"ÃoÄu Debian paketi mesajlarÄ gÃstermekte kullanacaÄÄ dili belirlemek
iÃin yerelleri kullanÄr. Ana diliniz Ängilizce deÄil ise ÃntanÄmlÄ
yereli deÄiÅtirebilirsiniz. "
-"BÃtÃn bu seÃimler, oluÅturulmak Ãzere seÃtiÄiniz yerellere gÃre
belirlenir."
+"ÃoÄu Debian paketi mesajlarÄ gÃstermekte kullanacaÄÄ dili belirlemek
iÃin "
+"yerelleri kullanÄr. Ana diliniz Ängilizce deÄil ise ÃntanÄmlÄ yereli "
+"deÄiÅtirebilirsiniz. BÃtÃn bu seÃimler, oluÅturulmak Ãzere
seÃtiÄiniz "
+"yerellere gÃre belirlenir."
#. Type: select
#. Description
@@ -77,6 +80,7 @@
"choice, then they will run into difficulties and you might want not to set a "
"default locale."
msgstr ""
-"Not: Bu ayar, sisteminizin bÃtÃnÃnde kullanÄlacak dili seÃecektir. EÄer
farklÄ dilleri "
-"konuÅan kullanÄcÄlarÄn da bulunduÄu Ãok kullanÄcÄlÄ bir sistem
ÃalÄÅtÄrÄyorsanÄz, bu kullanÄcÄlar bazÄ zorluklarla karÅÄlaÅabilir.
Bu nedenle ÃntanÄmlÄ bir yerel belirlememeyi isteyebilirsiniz."
-
+"Not: Bu ayar, sisteminizin bÃtÃnÃnde kullanÄlacak dili seÃecektir. EÄer
"
+"farklÄ dilleri konuÅan kullanÄcÄlarÄn da bulunduÄu Ãok kullanÄcÄlÄ
bir "
+"sistem ÃalÄÅtÄrÄyorsanÄz, bu kullanÄcÄlar bazÄ zorluklarla
karÅÄlaÅabilir. "
+"Bu nedenle ÃntanÄmlÄ bir yerel belirlememeyi isteyebilirsiniz."
Modified: glibc-package/trunk/debian/po/uk.po
===================================================================
--- glibc-package/trunk/debian/po/uk.po 2005-05-03 02:54:40 UTC (rev 904)
+++ glibc-package/trunk/debian/po/uk.po 2005-05-10 19:13:53 UTC (rev 905)
@@ -38,8 +38,8 @@
"select to use their language, country, characters, collation order, etc."
msgstr ""
"ÐÐÐÐÐÑ -- ÑÐ ÐÐÑÐÐÑÐÐ, ÑÐ ÐÐÐÐÐÐÑÑ
ÐÐÑÐÐÐÐÐÑÐÑÑ ÐÑÐ ÐÑÐÑÐÐÐÐ ÐÐÐÐÐÐ ÐÐÑ "
-"ÐÐÑÐÑÑÑÐÐÑÑÐ, ÑÐÑ ÐÐÐÑÑÑ ÐÐÐÐÑÐÑÑÐÐÑÐÐÑÐ
ÑÐÐÑ ÐÐÐÑ, ÐÑÐÑÐÑ, ÑÐÐÐÐÐÐ "
-"ÐÐÑÑÐÐÐ ÑÐÑÑÑÐÐÐÐÑ Ñ Ñ.Ð."
+"ÐÐÑÐÑÑÑÐÐÑÑÐ, ÑÐÑ ÐÐÐÑÑÑ ÐÐÐÐÑÐÑÑÐÐÑÐÐÑÐ
ÑÐÐÑ ÐÐÐÑ, ÐÑÐÑÐÑ, ÑÐÐÐÐÐÐ ÐÐÑÑÐÐÐ "
+"ÑÐÑÑÑÐÐÐÐÑ Ñ Ñ.Ð."
#. Type: multiselect
#. Description
@@ -49,9 +49,9 @@
"locale.gen', which you can also edit manually (you need to run `locale-gen' "
"afterwards)."
msgstr ""
-"ÐÐÐÐÑÑÑ, ÑÐÑ ÐÐÐÐÐÑ ÐÐÑÑÑÐÐÐ ÑÑÐÐÑÐÑÐ. ÐÐÑ
ÐÐÐÑÑ ÐÑÐÐ ÐÐÐÑÐÐÐÐÐÐ Ñ "
-"ÑÐÐÐÑ \"/etc/locale.gen\", ÑÐÐÐ ÐÐ ÑÐÐÐÐ ÐÐÐÐÑÐ
ÑÐÐÐÐÑÐÐÑÐ ÐÑÑÑÐÑ "
-"(ÐÑÑÐÑ ÑÑÐÐÐ ÐÐÑÑÑÐÐÐ ÐÐÐÑÑÐÐÑÐ \"locale-gen\")."
+"ÐÐÐÐÑÑÑ, ÑÐÑ ÐÐÐÐÐÑ ÐÐÑÑÑÐÐÐ ÑÑÐÐÑÐÑÐ. ÐÐÑ
ÐÐÐÑÑ ÐÑÐÐ ÐÐÐÑÐÐÐÐÐÐ Ñ ÑÐÐÐÑ \"/"
+"etc/locale.gen\", ÑÐÐÐ ÐÐ ÑÐÐÐÐ ÐÐÐÐÑÐ ÑÐÐÐÐÑÐÐÑÐ
ÐÑÑÑÐÑ (ÐÑÑÐÑ ÑÑÐÐÐ "
+"ÐÐÑÑÑÐÐÐ ÐÐÐÑÑÐÐÑÐ \"locale-gen\")."
#. Type: select
#. Choices
@@ -74,10 +74,10 @@
"speaker. These choices are based on which locales you have chosen to "
"generate."
msgstr ""
-"Ð Debian ÐÐÐÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÑÑÐÐÑÑÑÑ
ÐÐÐÐÐÑ ÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÑ "
-"ÑÐÐÑÑÑ ÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐÑÑÑÐÐÑÐÐ ÐÐÐÑ.
ÐÐÑÐ ÐÐÑÐ ÑÑÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÑÐÑÑÐÐ, ÑÐ "
-"ÐÐ ÐÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÑÐÐÐÑÐ.
ÐÐÐÑÐÐ ÑÐÐÐÐÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐ "
-"ÑÐÑ ÐÐ ÐÐÑÑÑÐÐÐ ÐÐÐÐÐÑÑÐÐÑÐ."
+"Ð Debian ÐÐÐÐÑÐ ÐÐÐÑÐÐÑÐ ÐÐÐÐÑÐÑÑÐÐÑÑÑÑ
ÐÐÐÐÐÑ ÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÑ ÑÐÐÑÑÑ ÐÐ "
+"ÐÐÐÑÐÐÑÐ ÐÐÑÐÑÑÑÐÐÑÐÐ ÐÐÐÑ. ÐÐÑÐ ÐÐÑÐ
ÑÑÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÐÑÐÑÑÐÐ, ÑÐ ÐÐ ÐÐÐÐÑÐ "
+"ÐÐÑÐÐÑÐ ÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÑÐÐÐÑÐ. ÐÐÐÑÐÐ
ÑÐÐÐÐÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐ ÑÐÑ ÐÐ ÐÐÑÑÑÐÐÐ "
+"ÐÐÐÐÐÑÑÐÐÑÐ."
#. Type: select
#. Description
@@ -89,7 +89,6 @@
"default locale."
msgstr ""
"ÐÑÐÐÑÑÐÐ: ÑÐÐ ÐÑÐÐÑ ÐÐÐÐÑÐÑ ÐÐÐÑ ÐÐÑ ÐÑÑÑÑ
ÑÐÑÑÐÐÐ. ÐÐÑÐ Ð ÐÐÑÑÐ ÑÐÑÑÐÐÑ "
-"ÐÑÐÑÑÑÑÑ ÐÐÐÑÐÑÐÐ ÐÐÑÐÑÑÑÐÐÑÑÐ, ÑÐÑ ÐÐ
ÑÐÐÐÐÐÐÑÑÑÑ ÐÐÐÐÑ, ÑÐÑ ÐÐ ÐÐÐÑÐÐÐ, "
-"ÑÐ ÐÐÐÐ ÐÐÐÑÑÑ ÐÑÑÐÐÑÑÐÑÑ ÑÐ ÑÑÑÐÐÐÑÐÐÐ, Ñ
ÑÐÐÑ, ÐÐÐÐÐÐÐ, ÐÐÐ ÐÑÐÑÐ "
-"ÐÐ ÐÑÑÐÐÐÐÐÑÐÐÑÐ ÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÑÐÐÐÑÐ."
-
+"ÐÑÐÑÑÑÑÑ ÐÐÐÑÐÑÐÐ ÐÐÑÐÑÑÑÐÐÑÑÐ, ÑÐÑ ÐÐ
ÑÐÐÐÐÐÐÑÑÑÑ ÐÐÐÐÑ, ÑÐÑ ÐÐ ÐÐÐÑÐÐÐ, ÑÐ "
+"ÐÐÐÐ ÐÐÐÑÑÑ ÐÑÑÐÐÑÑÐÑÑ ÑÐ ÑÑÑÐÐÐÑÐÐÐ, Ñ
ÑÐÐÑ, ÐÐÐÐÐÐÐ, ÐÐÐ ÐÑÐÑÐ ÐÐ "
+"ÐÑÑÐÐÐÐÐÑÐÐÑÐ ÐÐÐÐÐÑ ÐÐ ÐÐÐÐÐÑÐÐÐÑÐ."
Modified: glibc-package/trunk/debian/po/zh_CN.po
===================================================================
--- glibc-package/trunk/debian/po/zh_CN.po 2005-05-03 02:54:40 UTC (rev
904)
+++ glibc-package/trunk/debian/po/zh_CN.po 2005-05-10 19:13:53 UTC (rev
905)
@@ -24,7 +24,7 @@
"Language-Team: Chinese/Simplified <[EMAIL PROTECTED]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#. Type: multiselect
#. Description
@@ -50,8 +50,8 @@
"locale.gen', which you can also edit manually (you need to run `locale-gen' "
"afterwards)."
msgstr ""
-"èéæéèçæçååèç(locale)ãéæçæåèäååâ/etc/locale.genâïæå"
-"äååèèæåçè(æéèåçèçæåèèâlocale-genâ)ã"
+"èéæéèçæçååèç(locale)ãéæçæåèäååâ/etc/locale.genâïæåä"
+"ååèèæåçè(æéèåçèçæåèèâlocale-genâ)ã"
#. Type: select
#. Choices
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2005-05-03 02:54:40 UTC
(rev 904)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2005-05-10 19:13:53 UTC
(rev 905)
@@ -108,8 +108,15 @@
dh_compress -p$(curpass)
dh_fixperms -p$(curpass) -Xpt_chown
# Use this instead of -X to dh_fixperms so that we can use
- # an unescaped regular expression.
- find debian/$(curpass) -type f -regex '.*lib.*/ld.*so.*' \
+ # an unescaped regular expression. ld.so must be executable;
+ # libc.so and NPTL's libpthread.so print useful version
+ # information when executed.
+ # FIXME: LinuxThread's libpthread.so doesn't. It would be good
+ # to either fix that, or use a more robust method than searching
+ # for /tls/ in the path to identify NPTL.
+ find debian/$(curpass) -type f \( -regex '.*lib.*/ld.*so.*' \
+ -o -regex '.*lib.*/tls/.*libpthread.*so.*' \
+ -o -regex '.*lib.*/libc[.-].*so.*' \) \
-exec chmod a+x '{}' ';'
dh_makeshlibs -p$(curpass) -V "$(call xx,shlib_dep)"
@@ -130,7 +137,9 @@
dh_strip -p$(curpass)
dh_compress -p$(curpass)
dh_fixperms -p$(curpass)
- find debian/$(curpass) -type f -regex '.*lib.*/ld.*so.*' \
+ find debian/$(curpass) -type f \( -regex '.*lib.*/ld.*so.*' \
+ -o -regex '.*lib.*/tls/.*libpthread.*so.*' \
+ -o -regex '.*lib.*/libc[.-].*so.*' \) \
-exec chmod a+x '{}' ';'
# dh_makeshlibs -p$(curpass) -V "$(call xx,shlib_dep)"
dh_installdeb -p$(curpass)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
