Author: adconrad Date: 2012-11-25 11:45:50 +0000 (Sun, 25 Nov 2012) New Revision: 5408
Modified: glibc-package/branches/eglibc-2.16/debian/changelog glibc-package/branches/eglibc-2.16/debian/control glibc-package/branches/eglibc-2.16/debian/control.in/amd64 glibc-package/branches/eglibc-2.16/debian/control.in/opt Log: Merge from unstable Modified: glibc-package/branches/eglibc-2.16/debian/changelog =================================================================== --- glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-25 10:33:15 UTC (rev 5407) +++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-25 11:45:50 UTC (rev 5408) @@ -431,6 +431,22 @@ -- Aurelien Jarno <aure...@debian.org> Tue, 20 Nov 2012 08:48:56 +0100 +eglibc (2.13-38) UNRELEASED; urgency=low + + [ Adam Conrad ] + * debian/patches/arm/cvs-ldconfig-cache-abi.diff: Backport upstream + patch to re-enable ldconfig cache tagging for armhf binaries again. + * debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff: Re-enable + and adjust to account for changes in cvs-ldconfig-cache-abi.diff. + * debian/debhelper.in/libc.preinst: Remove old ld.so.cache on upgrade. + * debian/control.in/amd64: Move libc6-amd64 from standard to optional. + + [ Jonathan Nieder ] + * control.in/opt: correct misspelling of "Ezra" in descriptions of + *-i686 variants. Thanks to Thorsten Glaser. + + -- Adam Conrad <adcon...@0c3.net> Mon, 19 Nov 2012 14:23:26 -0700 + eglibc (2.13-37) unstable; urgency=low [ Aurelien Jarno ] Modified: glibc-package/branches/eglibc-2.16/debian/control =================================================================== --- glibc-package/branches/eglibc-2.16/debian/control 2012-11-25 10:33:15 UTC (rev 5407) +++ glibc-package/branches/eglibc-2.16/debian/control 2012-11-25 11:45:50 UTC (rev 5408) @@ -598,7 +598,7 @@ Package: libc6-amd64 Architecture: i386 x32 Section: libs -Priority: standard +Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} Conflicts: amd64-libs (<= 1.2) Description: Embedded GNU C Library: 64bit Shared libraries for AMD64 @@ -818,7 +818,7 @@ used on an i686 class CPU (check the output of `uname -m'). This includes Pentium Pro, Pentium II/III/IV, Celeron CPU's and similar class CPU's (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA - C3 Ezla). + C3 Ezra). Package: libc6-xen Architecture: i386 @@ -851,7 +851,7 @@ used on an i686 class CPU (check the output of `uname -m'). This includes Pentium Pro, Pentium II/III/IV, Celeron CPU's and similar class CPU's (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA - C3 Ezla). + C3 Ezra). Package: libc0.3-i686 Architecture: hurd-i386 @@ -869,7 +869,7 @@ used on an i686 class CPU (check the output of `uname -m'). This includes Pentium Pro, Pentium II/III/IV, Celeron CPU's and similar class CPU's (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA - C3 Ezla). + C3 Ezra). Package: libc0.3-xen Architecture: hurd-i386 Modified: glibc-package/branches/eglibc-2.16/debian/control.in/amd64 =================================================================== --- glibc-package/branches/eglibc-2.16/debian/control.in/amd64 2012-11-25 10:33:15 UTC (rev 5407) +++ glibc-package/branches/eglibc-2.16/debian/control.in/amd64 2012-11-25 11:45:50 UTC (rev 5408) @@ -1,7 +1,7 @@ Package: libc6-amd64 Architecture: i386 x32 Section: libs -Priority: standard +Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} Conflicts: amd64-libs (<= 1.2) Description: Embedded GNU C Library: 64bit Shared libraries for AMD64 Modified: glibc-package/branches/eglibc-2.16/debian/control.in/opt =================================================================== --- glibc-package/branches/eglibc-2.16/debian/control.in/opt 2012-11-25 10:33:15 UTC (rev 5407) +++ glibc-package/branches/eglibc-2.16/debian/control.in/opt 2012-11-25 11:45:50 UTC (rev 5408) @@ -14,7 +14,7 @@ used on an i686 class CPU (check the output of `uname -m'). This includes Pentium Pro, Pentium II/III/IV, Celeron CPU's and similar class CPU's (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA - C3 Ezla). + C3 Ezra). Package: libc6-xen Architecture: i386 @@ -47,7 +47,7 @@ used on an i686 class CPU (check the output of `uname -m'). This includes Pentium Pro, Pentium II/III/IV, Celeron CPU's and similar class CPU's (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA - C3 Ezla). + C3 Ezra). Package: libc0.3-i686 Architecture: hurd-i386 @@ -65,7 +65,7 @@ used on an i686 class CPU (check the output of `uname -m'). This includes Pentium Pro, Pentium II/III/IV, Celeron CPU's and similar class CPU's (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA - C3 Ezla). + C3 Ezra). Package: libc0.3-xen Architecture: hurd-i386 -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1tcael-0004zy...@vasks.debian.org