r1886 - in glibc-package/branches/glibc-2.5/debian: . patches patches/hurd-i386 po wrapper
Author: aurel32
Date: 2006-12-07 11:56:31 +0100 (Thu, 07 Dec 2006)
New Revision: 1886
Added:
glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/cvs-futimes.diff
glibc-package/branches/glibc-2.5/debian/po/eu.po
Removed:
glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/submitted-futimes.diff
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/series
glibc-package/branches/glibc-2.5/debian/wrapper/objcopy
Log:
Update from unstable
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-12-07 10:46:59 UTC (rev 1885)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2006-12-07 10:56:31 UTC (rev 1886)
@@ -234,11 +234,20 @@
glibc (2.3.6.ds1-9) unstable; urgency=low
+ [ Aurelien Jarno ]
* patches/kfreebsd/local-sysdeps.diff: update to revision 1745 (from
glibc-bsd).
+ * debian/po/eu.po: new file, thanks to Piarres Beobide. Closes: #398984.
+ * debian/wrapper/objcopy: remove useless .debug_loc (patch from Daniel
+ Jacobowitz). Closes: #399217.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 13 Nov 2006 07:37:02 +0100
+ [ Michael Banck ]
+ * patches/hurd-i386/submitted-futimes.diff: Moved to ...
+ * patches/hurd-i386/cvs-futimes.diff: ... here, updated with the
+ version committed upstream by Roland McGrath.
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 7 Dec 2006 11:27:42 +0100
+
glibc (2.3.6.ds1-8) unstable; urgency=high
* any/local-iconv-fix-trampoline.diff: new patch (fix iconvconfig segfault
Added: glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/cvs-futimes.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/cvs-futimes.diff 2006-12-07 10:46:59 UTC (rev 1885)
+++ glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/cvs-futimes.diff 2006-12-07 10:56:31 UTC (rev 1886)
@@ -0,0 +1,130 @@
+2006-10-10 Roland McGrath <roland@frob.com>
+
+ * sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast.
+ * sysdeps/mach/hurd/futimes.c: Likewise.
+ * sysdeps/mach/hurd/lutimes.c: Likewise.
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/futimes.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- libc/sysdeps/mach/hurd/futimes.c 2002/08/27 02:09:20 1.1
++++ libc/sysdeps/mach/hurd/futimes.c 2006/10/10 09:28:40 1.2
+@@ -28,20 +28,24 @@
+ int
+ __futimes (int fd, const struct timeval tvp[2])
+ {
+- struct timeval timevals[2];
++ union tv
++ {
++ struct timeval tv;
++ time_value_t tvt;
++ };
++ const union tv *u = (const union tv *) tvp;
++ union tv nulltv[2];
+ error_t err;
+
+ if (tvp == NULL)
+ {
+ /* Setting the number of microseconds to `-1' tells the
+ underlying filesystems to use the current time. */
+- timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1;
+- tvp = timevals;
++ nulltv[0].tvt.microseconds = nulltv[1].tvt.microseconds = -1;
++ u = nulltv;
+ }
+
+- err = HURD_DPORT_USE (fd, __file_utimes (port,
+- *(time_value_t *) &tvp[0],
+- *(time_value_t *) &tvp[1]));
++ err = HURD_DPORT_USE (fd, __file_utimes (port, u[0].tvt, u[1].tvt));
+ return err ? __hurd_dfail (fd, err) : 0;
+ }
+ weak_alias (__futimes, futimes)
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/lutimes.c,v
+retrieving revision 1.1
+retrieving revision 1.2
+diff -u -r1.1 -r1.2
+--- libc/sysdeps/mach/hurd/lutimes.c 2002/08/27 02:09:20 1.1
++++ libc/sysdeps/mach/hurd/lutimes.c 2006/10/10 09:28:40 1.2
+@@ -28,7 +28,13 @@
+ int
+ __lutimes (const char *file, const struct timeval tvp[2])
+ {
+- struct timeval timevals[2];
++ union tv
++ {
++ struct timeval tv;
++ time_value_t tvt;
++ };
++ const union tv *u = (const union tv *) tvp;
++ union tv nulltv[2];
+ error_t err;
+ file_t port;
+
+@@ -36,15 +42,14 @@
+ {
+ /* Setting the number of microseconds to `-1' tells the
+ underlying filesystems to use the current time. */
+- timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1;
+- tvp = timevals;
++ nulltv[0].tvt.microseconds = nulltv[1].tvt.microseconds = -1;
++ u = nulltv;
+ }
+
+ port = __file_name_lookup (file, O_NOLINK, 0);
+ if (port == MACH_PORT_NULL)
+ return -1;
+- err = __file_utimes (port,
+- *(time_value_t *) &tvp[0], *(time_value_t *) &tvp[1]);
++ err = __file_utimes (port, u[0].tvt, u[1].tvt);
+ __mach_port_deallocate (__mach_task_self (), port);
+ if (err)
+ return __hurd_fail (err);
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/utimes.c,v
+retrieving revision 1.10
+retrieving revision 1.11
+diff -u -r1.10 -r1.11
+--- libc/sysdeps/mach/hurd/utimes.c 2001/07/06 04:55:57 1.10
++++ libc/sysdeps/mach/hurd/utimes.c 2006/10/10 09:28:40 1.11
+@@ -28,7 +29,13 @@
+ const char *file;
+ const struct timeval tvp[2];
+ {
+- struct timeval timevals[2];
++ union tv
++ {
++ struct timeval tv;
++ time_value_t tvt;
++ };
++ const union tv *u = (const union tv *) tvp;
++ union tv nulltv[2];
+ error_t err;
+ file_t port;
+
+@@ -36,19 +43,17 @@
+ {
+ /* Setting the number of microseconds to `-1' tells the
+ underlying filesystems to use the current time. */
+- timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1;
+- tvp = timevals;
++ nulltv[0].tvt.microseconds = nulltv[1].tvt.microseconds = -1;
++ u = nulltv;
+ }
+
+ port = __file_name_lookup (file, 0, 0);
+ if (port == MACH_PORT_NULL)
+ return -1;
+- err = __file_utimes (port,
+- *(time_value_t *) &tvp[0], *(time_value_t *) &tvp[1]);
++ err = __file_utimes (port, u[0].tvt, u[1].tvt);
+ __mach_port_deallocate (__mach_task_self (), port);
+ if (err)
+ return __hurd_fail (err);
+ return 0;
+ }
+-
+ weak_alias (__utimes, utimes)
Deleted: glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/submitted-futimes.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/submitted-futimes.diff 2006-12-07 10:46:59 UTC (rev 1885)
+++ glibc-package/branches/glibc-2.5/debian/patches/hurd-i386/submitted-futimes.diff 2006-12-07 10:56:31 UTC (rev 1886)
@@ -1,38 +0,0 @@
-Index: sysdeps/mach/hurd/futimes.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/futimes.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 futimes.c
---- sysdeps/mach/hurd/futimes.c 27 Aug 2002 02:09:20 -0000 1.1
-+++ sysdeps/mach/hurd/futimes.c 23 Sep 2006 12:29:52 -0000
-@@ -28,20 +28,22 @@
- int
- __futimes (int fd, const struct timeval tvp[2])
- {
-- struct timeval timevals[2];
- error_t err;
-+ time_value_t new_atime, new_mtime;
-
- if (tvp == NULL)
-- {
- /* Setting the number of microseconds to `-1' tells the
- underlying filesystems to use the current time. */
-- timevals[1].tv_usec = timevals[0].tv_usec = (time_t)-1;
-- tvp = timevals;
-+ new_atime.microseconds = new_mtime.microseconds = -1;
-+ else
-+ {
-+ new_atime.seconds = tvp[0].tv_sec;
-+ new_atime.microseconds = tvp[0].tv_usec;
-+ new_mtime.seconds = tvp[1].tv_sec;
-+ new_mtime.microseconds = tvp[1].tv_usec;
- }
-
-- err = HURD_DPORT_USE (fd, __file_utimes (port,
-- *(time_value_t *) &tvp[0],
-- *(time_value_t *) &tvp[1]));
-+ err = HURD_DPORT_USE (fd, __file_utimes (port, new_atime, new_mtime));
- return err ? __hurd_dfail (fd, err) : 0;
- }
- weak_alias (__futimes, futimes)
-
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2006-12-07 10:46:59 UTC (rev 1885)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2006-12-07 10:56:31 UTC (rev 1886)
@@ -54,10 +54,10 @@
hppa/submitted-nptl-carlos.diff -p0
hppa/local-inlining.diff -p0
+hurd-i386/cvs-futimes.diff -p1
hurd-i386/cvs-getsid.diff -p1
hurd-i386/local-enable-ldconfig.diff -p1
hurd-i386/local-mlock.diff -p1
-hurd-i386/submitted-futimes.diff -p0
hurd-i386/submitted-ioctl-decode-argument.diff -p0
hurd-i386/submitted-sysvshm.diff -p1
Added: glibc-package/branches/glibc-2.5/debian/po/eu.po
===================================================================
--- glibc-package/branches/glibc-2.5/debian/po/eu.po 2006-12-07 10:46:59 UTC (rev 1885)
+++ glibc-package/branches/glibc-2.5/debian/po/eu.po 2006-12-07 10:56:31 UTC (rev 1886)
@@ -0,0 +1,101 @@
+# translation of eu.po to librezale
+# Piarres Beobide <pi@beobide.net>, 2006.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+msgid ""
+msgstr ""
+"Project-Id-Version: eu\n"
+"Report-Msgid-Bugs-To: debian-glibc@lists.debian.org\n"
+"POT-Creation-Date: 2006-06-26 21:47+0200\n"
+"PO-Revision-Date: 2006-11-16 23:57+0100\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: librezale <librezale@librezale.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. Type: multiselect
+#. Choices
+#: ../debhelper.in/locales.templates:1001
+msgid "All locales"
+msgstr "locale guztiak"
+
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1002
+msgid "Locales to be generated:"
+msgstr "Sortu behar diren locale-ak:"
+
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1003
+msgid ""
+"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-ak hizkuntza anitz artean aldatzeko ingurugiroa da erabiltzaileek beren "
+"hizkuntza, herrialdea, karaktere-jokoa, erkatze ordena etabar ezarri ahal izateko."
+
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1004
+msgid ""
+"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 ""
+"Hautatu zein locale sortu behar diren. Hautapena `/etc/locale.gen'-en gordeko "
+"da, zein eskuz editatu dezakezu (editatu ondoren `locale-gen' exekutatu."
+
+#. Type: multiselect
+#. Description
+#: ../debhelper.in/locales.templates:1005
+msgid ""
+"When `All locales' is selected, /etc/locale.gen will be set as a symlink to /"
+"usr/share/i18n/SUPPORTED."
+msgstr ""
+"`locale guztiak' hautatu ezkero, /etc/locale.gen /usr/share/i18n/SUPPORTED-ra "
+"lotura sinboliko bat bezala ezarriko da."
+
+#. Type: select
+#. Choices
+#: ../debhelper.in/locales.templates:2001
+msgid "None"
+msgstr "Batez"
+
+#. Type: select
+#. Description
+#: ../debhelper.in/locales.templates:2002
+msgid "Default locale for the system environment:"
+msgstr "Sistema inguruneko locale lehenetsia:"
+
+#. Type: select
+#. Description
+#: ../debhelper.in/locales.templates:2003
+msgid ""
+"Many packages in Debian use locales to display text in the correct language "
+"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 ""
+"Debian pakete anitzek locale-ak erabiltzen dituzte erabiltzaileari dagokion "
+"hizkuntzan testuak bistaratzeko. Locale lehenetsia alda dezakezu ez bazara "
+"jatorrizko ingeles hiztuna. Aukerak sortu behar diren locale-etan oinarriturik "
+"daude."
+
+#. Type: select
+#. Description
+#: ../debhelper.in/locales.templates:2004
+msgid ""
+"Note: This will select the language for your whole system. If you're running "
+"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 ""
+"Oharra: Honek zure sistemako hizkuntza aukeratuko du. Hautatutako hizkuntza "
+"denek erabiltzen ez duten erabiltzaile anitzeko sistema bat bada, agian erabiltzaile "
+"horiek arazoetan aurki daitezke eta nahiago dezakezu locale lehenetsirik ez "
+"ezartzea."
+
Modified: glibc-package/branches/glibc-2.5/debian/wrapper/objcopy
===================================================================
--- glibc-package/branches/glibc-2.5/debian/wrapper/objcopy 2006-12-07 10:46:59 UTC (rev 1885)
+++ glibc-package/branches/glibc-2.5/debian/wrapper/objcopy 2006-12-07 10:56:31 UTC (rev 1886)
@@ -4,7 +4,7 @@
*" --only-keep-debug "*)
exec /usr/bin/objcopy -R .debug_info -R .debug_aranges -R .debug_pubnames \
-R .debug_abbrev -R .debug_line -R .debug_str -R .debug_ranges \
- -R .comment -R .note "$@"
+ -R .debug_loc -R .comment -R .note "$@"
;;
esac
Reply to: