Please allow glibc_2.3.6.ds1-10
Hi,
glibc 2.3.6.ds1-10 is in Etch for 12 days and is only missing the alpha
build.
The diff is attached below, the changes are either translation updates
or bugfixes that I would like to see for Etch. Not that I have stripped
hunk that only changes files from non-release architectures (Hurd and
GNU/kFreeBSD) for better readability.
Could you please unblock it, so that it can move to Etch when the alpha
build is uploaded or when alpha is removed from release architectures?
Thanks,
Aurelien
diff -u glibc-2.3.6.ds1/debian/wrapper/objcopy glibc-2.3.6.ds1/debian/wrapper/objcopy
--- glibc-2.3.6.ds1/debian/wrapper/objcopy
+++ glibc-2.3.6.ds1/debian/wrapper/objcopy
@@ -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
diff -u glibc-2.3.6.ds1/debian/control glibc-2.3.6.ds1/debian/control
--- glibc-2.3.6.ds1/debian/control
+++ glibc-2.3.6.ds1/debian/control
@@ -79,7 +79,7 @@
Package: libc6-dev
Architecture: amd64 arm arm-softfloat armeb i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
-Priority: standard
+Priority: optional
Depends: libc6 (= ${Source-Version})
Recommends: gcc | c-compiler
Description: GNU C Library: Development Libraries and Header Files
@@ -151,7 +151,7 @@
Package: libc6.1-dev
Architecture: alpha ia64
Section: libdevel
-Priority: standard
+Priority: optional
Depends: libc6.1 (= ${Source-Version})
Recommends: gcc | c-compiler
Description: GNU C Library: Development Libraries and Header Files
@@ -223,7 +223,7 @@
Package: libc0.3-dev
Architecture: hurd-i386
Section: libdevel
-Priority: standard
+Priority: optional
Depends: libc0.3 (= ${Source-Version})
Recommends: gcc | c-compiler
Description: GNU C Library: Development Libraries and Header Files
@@ -295,7 +295,7 @@
Package: libc0.1-dev
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
-Priority: standard
+Priority: optional
Depends: libc0.1 (= ${Source-Version})
Recommends: gcc | c-compiler
Description: GNU C Library: Development Libraries and Header Files
diff -u glibc-2.3.6.ds1/debian/control.in/libc glibc-2.3.6.ds1/debian/control.in/libc
--- glibc-2.3.6.ds1/debian/control.in/libc
+++ glibc-2.3.6.ds1/debian/control.in/libc
@@ -12,7 +12,7 @@
Package: @libc@-dev
Architecture: @archs@
Section: libdevel
-Priority: standard
+Priority: optional
Depends: @libc@ (= ${Source-Version})
Recommends: gcc | c-compiler
Description: GNU C Library: Development Libraries and Header Files
diff -u glibc-2.3.6.ds1/debian/patches/series glibc-2.3.6.ds1/debian/patches/series
--- glibc-2.3.6.ds1/debian/patches/series
+++ glibc-2.3.6.ds1/debian/patches/series
@@ -71,10 +71,12 @@
hppa/submitted-iitlbp.diff -p1
hppa/submitted-fenv-align.diff -p1
hppa/submitted-fpu.diff -p1
+hppa/cvs-clone.diff -p1
hppa/cvs-pie-relocs.diff -p1
hppa/cvs-no-ldbl-128.diff -p1
hppa/local-inlining.diff -p1
+hurd-i386/cvs-futimes.diff -p1
hurd-i386/cvs-getresuid-dyslexia.diff -p0
hurd-i386/cvs-getsid.diff -p1
hurd-i386/cvs-ioctl-pfinet.diff -p0
@@ -148,6 +149,7 @@
any/cvs-tls-crashfix.diff -p1
any/cvs-tst-setcontext_c.diff -p1
any/cvs-resource_h.diff -p1
+any/cvs-zdump-64-bit.diff -p1
any/local-asserth-decls.diff -p0
#any/local-base.diff -p0 # g: suspended
any/local-bashisms.diff -p1
diff -u glibc-2.3.6.ds1/debian/changelog glibc-2.3.6.ds1/debian/changelog
--- glibc-2.3.6.ds1/debian/changelog
+++ glibc-2.3.6.ds1/debian/changelog
@@ -1,3 +1,44 @@
+glibc (2.3.6.ds1-10) unstable; urgency=low
+
+ * sysdeps/kfreebsd.mk: Link all machine*/ directories to support
+ new bi-arch headers.
+ * Add bi-arch support on kfreebsd-amd64:
+ - debian/sysdeps/kfreebsd-amd64.mk: New pass for 32-bit glibc
+ - debian/control.in/main: Add build-depends on libc0.1-dev-i386
+ - debian/control.in/kfreebsd-i386: add libc0.1-dev-i386 and
+ libc0.1-i386 packages
+ * patches/kfreebsd/local-sysdeps.diff: update to revision 1853 (from
+ glibc-bsd).
+ * debian/control.in/libc: downgrade priority of libc-dev to optional
+ from standard to match overrides.
+ * debian/patches/hppa/cvs-clone.diff: new patch by Helge Deller
+ <deller@gmx.de> inspired from upstream CVS code (fix LTP clone04 and
+ clone06 test). Closes: #405411.
+ * debian/patches/any/cvs-zdump-64-bit.diff: new patch from CVS to fix zdump
+ on 64-bit architectures. Closes: #402776.
+ * debian/quitlrc: new file.
+ * debian/rules.d/quilt.mk: use debian/quitlrc instead of default ~/.quiltrc.
+ Closes: #406136.
+
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 8 Jan 2007 22:29:37 +0100
+
+glibc (2.3.6.ds1-9) unstable; urgency=low
+
+ [ Aurelien Jarno ]
+ * patches/kfreebsd/local-sysdeps.diff: update to revision 1775 (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.
+ * debian/po/de.po: Fix German translation. Closes: #372817.
+
+ [ 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
diff -u glibc-2.3.6.ds1/debian/rules.d/quilt.mk glibc-2.3.6.ds1/debian/rules.d/quilt.mk
--- glibc-2.3.6.ds1/debian/rules.d/quilt.mk
+++ glibc-2.3.6.ds1/debian/rules.d/quilt.mk
@@ -3,12 +3,16 @@
# -*- Makefile -*-, you silly Emacs!
# vim: set ft=make:
+DEBQUILTRC = debian/quiltrc
+QUILTOPT = --quiltrc $(DEBQUILTRC)
+QUILT = quilt $(QUILTOPT)
+
patch: $(stamp)patch-stamp
$(stamp)patch-stamp: $(stamp)unpack quilt
@cd $(DEB_SRCDIR); \
- if quilt next >/dev/null 2>&1; then \
+ if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \
- if quilt push -a -v > ${stamp}patch-log 2>&1; then \
+ if $(QUILT) push -a -v > ${stamp}patch-log 2>&1; then \
echo "successful."; \
mv ${stamp}patch-log $@; \
else \
@@ -42,8 +46,8 @@
unpatch: quilt
@echo -n "Unapplying patches..."
@cd $(DEB_SRCDIR); \
- if quilt top >/dev/null 2>&1; then \
- if quilt pop -a -v > $(stamp)unpatch-log 2>&1; then \
+ if $(QUILT) top >/dev/null 2>&1; then \
+ if $(QUILT) pop -a -v > $(stamp)unpatch-log 2>&1; then \
echo "successful."; \
else \
echo "failed! (check $(stamp)unpatch-log for details)"; \
diff -u glibc-2.3.6.ds1/debian/po/de.po glibc-2.3.6.ds1/debian/po/de.po
--- glibc-2.3.6.ds1/debian/po/de.po
+++ glibc-2.3.6.ds1/debian/po/de.po
@@ -42,9 +42,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 ""
-"Standorteinstellungen ist ein Rahmen, um zwischen mehreren Sprachen zu "
-"wechseln, für Benutzer, die Ihre Sprache, Ihr Land, Ihren Zeichensatz, Ihre "
-"Sortierreihenfolge usw. auswählen können."
+"Standorteinstellungen ist ein System, um zwischen verschiedenen "
+"Sprachen umzuschalten. Nutzer können damit ihre Sprache, ihr Land, "
+"ihren Zeichensatz, die Sortierreihenfolge und anderes mehr festlegen."
#. Type: multiselect
#. Description
--- glibc-2.3.6.ds1.orig/debian/quiltrc
+++ glibc-2.3.6.ds1/debian/quiltrc
@@ -0,0 +1 @@
+QUILT_PATCHES="debian/patches"
only in patch2:
unchanged:
--- glibc-2.3.6.ds1.orig/debian/patches/hppa/cvs-clone.diff
+++ glibc-2.3.6.ds1/debian/patches/hppa/cvs-clone.diff
@@ -0,0 +1,38 @@
+--- glibc-2.3.6.orig/debian/sysdeps/unix/sysv/linux/hppa/clone.S 2006-12-29 08:49:25.000000000 +0100
++++ glibc-2.3.6/debian/sysdeps/unix/sysv/linux/hppa/clone.S 2007-01-01 19:53:00.000000000 +0100
+@@ -32,6 +32,11 @@
+ ENTRY(__clone)
+ /* FIXME: I have no idea how profiling works on hppa. */
+
++ /* Save the PIC register. */
++#ifdef PIC
++ stw %r19,-32(%sr0, %sp) /* parent */
++#endif
++
+ /* Sanity check arguments. */
+ comib,= 0,%arg0,.Lerror /* no NULL function pointers */
+ ldi -EINVAL,%ret0
+@@ -41,10 +46,8 @@
+ /* Save the fn ptr and arg on the new stack. */
+ stwm %arg0,64(%arg1)
+ stw %arg3,-60(%arg1)
+-
+- /* Save the PIC register. */
+ #ifdef PIC
+- stw %r19,-32(%sr0, %sp) /* parent */
++ stw %r19,-32(%arg1) /* save PIC on child's stack */
+ #endif
+
+ /* Do the system call */
+@@ -88,6 +91,11 @@
+ bl $$dyncall,%r31
+ copy %r31,%rp
+
++ /* Restore PIC register for exit() */
++#ifdef PIC
++ ldw -32(%sr0, %sp), %r19 /* parent */
++#endif
++
+ bl _exit,%rp
+ copy %ret0,%arg0
+
--- glibc-2.3.6.ds1.orig/debian/patches/any/cvs-zdump-64-bit.diff
+++ glibc-2.3.6.ds1/debian/patches/any/cvs-zdump-64-bit.diff
@@ -0,0 +1,37 @@
+Fix for 64-bit architectures.
+
+===================================================================
+RCS file: /cvs/glibc/libc/timezone/zdump.c,v
+retrieving revision 1.14
+retrieving revision 1.15
+diff -u -r1.14 -r1.15
+--- libc/timezone/zdump.c 2006/09/21 03:57:30 1.14
++++ libc/timezone/zdump.c 2006/11/11 02:04:43 1.15
+@@ -418,14 +414,21 @@
+ }
+ } else if (0 > (time_t) -1) {
+ /*
+- ** time_t is signed.
++ ** time_t is signed. Assume overflow wraps around.
+ */
+- register time_t hibit;
++ time_t t = 0;
++ time_t t1 = 1;
+
+- for (hibit = 1; (hibit * 2) != 0; hibit *= 2)
+- continue;
+- absolute_min_time = hibit;
+- absolute_max_time = -(hibit + 1);
++ while (t < t1) {
++ t = t1;
++ t1 = 2 * t1 + 1;
++ }
++
++ absolute_max_time = t;
++ t = -t;
++ absolute_min_time = t - 1;
++ if (t < absolute_min_time)
++ absolute_min_time = t;
+ } else {
+ /*
+ ** time_t is unsigned.
only in patch2:
unchanged:
--- glibc-2.3.6.ds1.orig/debian/po/eu.po
+++ glibc-2.3.6.ds1/debian/po/eu.po
@@ -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."
+
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' aurel32@debian.org | aurelien@aurel32.net
`- people.debian.org/~aurel32 | www.aurel32.net
Reply to: