[glibc] 01/01: debian/control.in/libc: Force i686 variants off the system on upgrade.
This is an automated email from the git hooks/post-receive script.
adconrad pushed a commit to branch sid
in repository glibc.
commit c3fd688f9e3e5dc55be1f23844f7633044cf2c16
Author: Adam Conrad <adconrad@0c3.net>
Date: Sun May 8 13:59:55 2016 -0600
debian/control.in/libc: Force i686 variants off the system on upgrade.
---
debian/changelog | 3 +++
debian/control | 20 ++++++++++++++++----
debian/control.in/libc | 5 ++++-
3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 172f7c3..b733f63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,9 @@ glibc (2.22-8) UNRELEASED; urgency=medium
- debian/patches/i386/submitted-i686-timing.diff: drop. Closes:
#218519.
+ [ Adam Conrad ]
+ * debian/control.in/libc: Force i686 variants off the system on upgrade.
+
-- Samuel Thibault <sthibault@debian.org> Tue, 19 Apr 2016 23:28:29 +0200
glibc (2.22-7) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 4970b6c..8780730 100644
--- a/debian/control
+++ b/debian/control
@@ -167,10 +167,13 @@ Multi-Arch: same
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
-Conflicts: libc6-loongson2f [mipsel]
+Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
+ libc0.1-i686 [kfreebsd-i386],
+ libc0.3-i686 [hurd-i386],
+ libc6-i686 [i386],
libc6-x32 [x32],
libc0.1-i386 [kfreebsd-i386],
libc6-powerpc [powerpc],
@@ -252,10 +255,13 @@ Multi-Arch: same
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
-Conflicts: libc6-loongson2f [mipsel]
+Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
+ libc0.1-i686 [kfreebsd-i386],
+ libc0.3-i686 [hurd-i386],
+ libc6-i686 [i386],
libc6-x32 [x32],
libc0.1-i386 [kfreebsd-i386],
libc6-powerpc [powerpc],
@@ -337,10 +343,13 @@ Multi-Arch: same
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
-Conflicts: libc6-loongson2f [mipsel]
+Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
+ libc0.1-i686 [kfreebsd-i386],
+ libc0.3-i686 [hurd-i386],
+ libc6-i686 [i386],
libc6-x32 [x32],
libc0.1-i386 [kfreebsd-i386],
libc6-powerpc [powerpc],
@@ -422,10 +431,13 @@ Multi-Arch: same
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
-Conflicts: libc6-loongson2f [mipsel]
+Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
+ libc0.1-i686 [kfreebsd-i386],
+ libc0.3-i686 [hurd-i386],
+ libc6-i686 [i386],
libc6-x32 [x32],
libc0.1-i386 [kfreebsd-i386],
libc6-powerpc [powerpc],
diff --git a/debian/control.in/libc b/debian/control.in/libc
index fb0fad7..376833d 100644
--- a/debian/control.in/libc
+++ b/debian/control.in/libc
@@ -6,10 +6,13 @@ Multi-Arch: same
Depends: ${shlibs:Depends}, ${libgcc:Depends}
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
-Conflicts: libc6-loongson2f [mipsel]
+Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
Breaks: nscd (<< @GLIBC_VERSION@), locales (<< @GLIBC_VERSION@), locales-all (<< @GLIBC_VERSION@), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
Replaces: libc6-amd64 [amd64],
libc6-i386 [i386],
+ libc0.1-i686 [kfreebsd-i386],
+ libc0.3-i686 [hurd-i386],
+ libc6-i686 [i386],
libc6-x32 [x32],
libc0.1-i386 [kfreebsd-i386],
libc6-powerpc [powerpc],
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: