[glibc] 01/01: re-add libc0.1-i686, libc0.3-i686, libc6-i686 as a dummy package to ease the upgrades
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 2228d3b8e97118a5f73c438d09394f7394aaab7e
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sat Jun 4 15:14:33 2016 +0200
re-add libc0.1-i686, libc0.3-i686, libc6-i686 as a dummy package to ease the upgrades
* debian/control: re-add libc0.1-i686, libc0.3-i686, libc6-i686 as a
dummy package to ease the upgrades. Closes: #825421, #826290.
* debian/sysdeps/i386.mk: add libc6-i686 dummy package.
* debian/sysdeps/hurd-i386.mk: add libc0.1-i686 dummy package.
* debian/sysdeps/kfreebsd-i386.mk: add libc0.3-i686 dummy package.
* debian/debhelper.in/libc.NEWS: drop the new about libc6-i686, libc0.1-i686
and libc0.3-i686 packages removal.
---
debian/changelog | 9 +++++++++
debian/control | 35 +++++++++++++++++++++++++++++++----
debian/control.in/libc | 2 +-
debian/control.in/opt | 27 +++++++++++++++++++++++++++
debian/debhelper.in/libc.NEWS | 9 ---------
debian/sysdeps/hurd-i386.mk | 3 +++
debian/sysdeps/i386.mk | 3 +++
debian/sysdeps/kfreebsd-i386.mk | 2 ++
8 files changed, 76 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 35da1cd..23f77f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,15 @@ glibc (2.22-11) UNRELEASED; urgency=medium
* hurd-i386/tg-poll_errors_fixes.diff: Fix crash when calling poll or select
on a fd which had never been allocated. Closes: #826175.
+ [ Aurelien Jarno ]
+ * debian/control: re-add libc0.1-i686, libc0.3-i686, libc6-i686 as a
+ dummy package to ease the upgrades. Closes: #825421, #826290.
+ * debian/sysdeps/i386.mk: add libc6-i686 dummy package.
+ * debian/sysdeps/hurd-i386.mk: add libc0.1-i686 dummy package.
+ * debian/sysdeps/kfreebsd-i386.mk: add libc0.3-i686 dummy package.
+ * debian/debhelper.in/libc.NEWS: drop the new about libc6-i686, libc0.1-i686
+ and libc0.3-i686 packages removal.
+
-- Aurelien Jarno <aurel32@debian.org> Tue, 31 May 2016 23:50:57 +0200
glibc (2.22-10) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 0a219d0..acc0f4d 100644
--- a/debian/control
+++ b/debian/control
@@ -167,7 +167,7 @@ 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], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+Conflicts: libc6-loongson2f [mipsel]
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],
@@ -255,7 +255,7 @@ 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], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+Conflicts: libc6-loongson2f [mipsel]
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],
@@ -343,7 +343,7 @@ 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], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+Conflicts: libc6-loongson2f [mipsel]
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],
@@ -431,7 +431,7 @@ 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], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+Conflicts: libc6-loongson2f [mipsel]
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],
@@ -873,3 +873,30 @@ Description: GNU C Library: Shared libraries (EV67 optimized)
needs to be installed on Alpha EV67/68 and EV7 machines. If you install
this on an older machine, it won't even be used.
+Package: libc0.1-i686
+Architecture: kfreebsd-i386
+Section: oldlibs
+Priority: extra
+Multi-Arch: same
+Depends: ${misc:Depends}
+Description: transitional dummy package
+ This package is a dummy transitional package. It can be safely removed.
+
+Package: libc0.3-i686
+Architecture: hurd-i386
+Section: oldlibs
+Priority: extra
+Multi-Arch: same
+Depends: ${misc:Depends}
+Description: transitional dummy package
+ This package is a dummy transitional package. It can be safely removed.
+
+Package: libc6-i686
+Architecture: i386
+Section: oldlibs
+Priority: extra
+Multi-Arch: same
+Depends: ${misc:Depends}
+Description: transitional dummy package
+ This package is a dummy transitional package. It can be safely removed.
+
diff --git a/debian/control.in/libc b/debian/control.in/libc
index 376833d..d958db3 100644
--- a/debian/control.in/libc
+++ b/debian/control.in/libc
@@ -6,7 +6,7 @@ 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], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+Conflicts: libc6-loongson2f [mipsel]
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],
diff --git a/debian/control.in/opt b/debian/control.in/opt
index 675b752..fcaa694 100644
--- a/debian/control.in/opt
+++ b/debian/control.in/opt
@@ -47,3 +47,30 @@ Description: GNU C Library: Shared libraries (EV67 optimized)
needs to be installed on Alpha EV67/68 and EV7 machines. If you install
this on an older machine, it won't even be used.
+Package: libc0.1-i686
+Architecture: kfreebsd-i386
+Section: oldlibs
+Priority: extra
+Multi-Arch: same
+Depends: ${misc:Depends}
+Description: transitional dummy package
+ This package is a dummy transitional package. It can be safely removed.
+
+Package: libc0.3-i686
+Architecture: hurd-i386
+Section: oldlibs
+Priority: extra
+Multi-Arch: same
+Depends: ${misc:Depends}
+Description: transitional dummy package
+ This package is a dummy transitional package. It can be safely removed.
+
+Package: libc6-i686
+Architecture: i386
+Section: oldlibs
+Priority: extra
+Multi-Arch: same
+Depends: ${misc:Depends}
+Description: transitional dummy package
+ This package is a dummy transitional package. It can be safely removed.
+
diff --git a/debian/debhelper.in/libc.NEWS b/debian/debhelper.in/libc.NEWS
index 818fa85..2587b4b 100644
--- a/debian/debhelper.in/libc.NEWS
+++ b/debian/debhelper.in/libc.NEWS
@@ -1,12 +1,3 @@
-glibc (2.22-8) unstable; urgency=medium
-
- Starting with version 2.22-8, the GNU libc on the i386, hurd-386 and
- kfreebsd-i386 architectures are optimized for i686. The libc6-i686,
- libc0.3-i686 and libc0.1-i686 packages are therefore not needed
- anymore and can be removed safely.
-
- -- Aurelien Jarno <aurel32@debian.org> Tue, 31 May 2016 12:23:15 +0200
-
glibc (2.21-2) unstable; urgency=medium
Starting with version 2.21-1, the glibc requires a 3.2 or later Linux
diff --git a/debian/sysdeps/hurd-i386.mk b/debian/sysdeps/hurd-i386.mk
index 81ce1c7..d298fc4 100644
--- a/debian/sysdeps/hurd-i386.mk
+++ b/debian/sysdeps/hurd-i386.mk
@@ -1,3 +1,6 @@
+# Transitional dummy package, should be removed after Stretch release
+DEB_ARCH_REGULAR_PACKAGES += libc0.3-i686
+
# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
# greatly increase the speed when running under the 32bit Xen hypervisor.
GLIBC_PASSES += xen
diff --git a/debian/sysdeps/i386.mk b/debian/sysdeps/i386.mk
index 72a5a49..6241ac3 100644
--- a/debian/sysdeps/i386.mk
+++ b/debian/sysdeps/i386.mk
@@ -2,6 +2,9 @@
extra_config_options = --enable-multi-arch --enable-lock-elision
MIN_KERNEL_SUPPORTED := 2.6.32
+# Transitional dummy package, should be removed after Stretch release
+DEB_ARCH_REGULAR_PACKAGES += libc6-i686
+
# We use -mno-tls-direct-seg-refs to not wrap-around segments, as it
# greatly increase the speed when running under the 32bit Xen hypervisor.
GLIBC_PASSES += xen
diff --git a/debian/sysdeps/kfreebsd-i386.mk b/debian/sysdeps/kfreebsd-i386.mk
new file mode 100644
index 0000000..81cca26
--- /dev/null
+++ b/debian/sysdeps/kfreebsd-i386.mk
@@ -0,0 +1,2 @@
+# Transitional dummy package, should be removed after Stretch release
+DEB_ARCH_REGULAR_PACKAGES += libc6-i686
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: