Author: aurel32 Date: 2015-12-03 23:26:24 +0000 (Thu, 03 Dec 2015) New Revision: 6770
Modified: glibc-package/branches/glibc-2.22/debian/changelog glibc-package/branches/glibc-2.22/debian/control glibc-package/branches/glibc-2.22/debian/control.in/opt Log: Merge from trunk Modified: glibc-package/branches/glibc-2.22/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-03 23:24:41 UTC (rev 6769) +++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-03 23:26:24 UTC (rev 6770) @@ -114,6 +114,13 @@ -- Aurelien Jarno <aure...@debian.org> Wed, 02 Dec 2015 00:06:13 +0100 +glibc (2.21-3) unstable; urgency=medium + + [ Aurelien Jarno ] + * debian/control.in/opt: drop libc0.3-i686 and libc0.3-xen entries. + + -- Aurelien Jarno <aure...@debian.org> Fri, 04 Dec 2015 00:22:07 +0100 + glibc (2.21-2) unstable; urgency=medium [ Aurelien Jarno ] Modified: glibc-package/branches/glibc-2.22/debian/control =================================================================== --- glibc-package/branches/glibc-2.22/debian/control 2015-12-03 23:24:41 UTC (rev 6769) +++ glibc-package/branches/glibc-2.22/debian/control 2015-12-03 23:26:24 UTC (rev 6770) @@ -866,41 +866,6 @@ (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezra). -Package: libc0.3-i686 -Architecture: hurd-i386 -Section: libs -Priority: extra -Multi-Arch: same -Pre-Depends: libc0.3 (= ${binary:Version}) -Depends: ${misc:Depends} -Build-Profiles: <!stage1> -Description: GNU C Library: Shared libraries [i686 optimized] - Contains the standard libraries that are used by nearly all programs on - the system. This package includes shared versions of the standard C - library and the standard math library, as well as many others. - . - This set of libraries is optimized for i686 machines, and will only be - 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 Ezra). - -Package: libc0.3-xen -Architecture: hurd-i386 -Section: libs -Priority: extra -Multi-Arch: same -Pre-Depends: libc0.3 (= ${binary:Version}) -Depends: ${misc:Depends} -Build-Profiles: <!stage1> -Description: GNU C Library: Shared libraries [Xen version] - Contains the standard libraries that are used by nearly all programs on - the system. This package includes shared versions of the standard C - library and the standard math library, as well as many others. - . - This set of libraries is optimized for the Xen hypervisor, and will be - selected instead when running under Xen. - Package: libc6.1-alphaev67 Architecture: alpha Section: libs Modified: glibc-package/branches/glibc-2.22/debian/control.in/opt =================================================================== --- glibc-package/branches/glibc-2.22/debian/control.in/opt 2015-12-03 23:24:41 UTC (rev 6769) +++ glibc-package/branches/glibc-2.22/debian/control.in/opt 2015-12-03 23:26:24 UTC (rev 6770) @@ -52,41 +52,6 @@ (including clones such as AMD Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezra). -Package: libc0.3-i686 -Architecture: hurd-i386 -Section: libs -Priority: extra -Multi-Arch: same -Pre-Depends: libc0.3 (= ${binary:Version}) -Depends: ${misc:Depends} -Build-Profiles: <!stage1> -Description: GNU C Library: Shared libraries [i686 optimized] - Contains the standard libraries that are used by nearly all programs on - the system. This package includes shared versions of the standard C - library and the standard math library, as well as many others. - . - This set of libraries is optimized for i686 machines, and will only be - 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 Ezra). - -Package: libc0.3-xen -Architecture: hurd-i386 -Section: libs -Priority: extra -Multi-Arch: same -Pre-Depends: libc0.3 (= ${binary:Version}) -Depends: ${misc:Depends} -Build-Profiles: <!stage1> -Description: GNU C Library: Shared libraries [Xen version] - Contains the standard libraries that are used by nearly all programs on - the system. This package includes shared versions of the standard C - library and the standard math library, as well as many others. - . - This set of libraries is optimized for the Xen hypervisor, and will be - selected instead when running under Xen. - Package: libc6.1-alphaev67 Architecture: alpha Section: libs