[glibc] 01/01: Fix previous commit
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit c22afdd5739ad24934b34b91f7a0585fc4030906
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Jan 14 00:55:47 2018 +0100
Fix previous commit
---
debian/changelog | 4 ++--
debian/control | 3 ---
debian/control.in/s390 | 1 -
debian/control.in/sparc | 1 -
debian/control.in/sparc64 | 1 -
5 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 53e990f..1ed856d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,8 @@ glibc (2.26-4) UNRELEASED; urgency=medium
* debian/patches/git-updates.diff: update from upstream stable branch:
- Fix a buffer underflow in getcwd() (CVE-2018-1000001). Closes:
#887001.
- * debian/control.in/*: add conflicts to only allow to install one set of
- multilib packages simultaneously. Closes: #702962, #743618, #784015,
+ * debian/control.in/*: add conflicts to only allow one to install one set
+ of multilib packages simultaneously. Closes: #702962, #743618, #784015,
#820826, #870257.
-- Aurelien Jarno <aurel32@debian.org> Fri, 12 Jan 2018 22:26:33 +0100
diff --git a/debian/control b/debian/control
index 59f9982..20bbd4b 100644
--- a/debian/control
+++ b/debian/control
@@ -540,7 +540,6 @@ Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Build-Profiles: <!stage1 !nobiarch>
-Package: libc6-sparc
Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc64, libc6-x32
Description: GNU C Library: 32bit Shared libraries for SPARC
This package includes shared versions of the standard C library and the
@@ -565,7 +564,6 @@ Architecture: sparc
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Package: libc6-sparc64
Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 64bit Shared libraries for UltraSPARC
@@ -591,7 +589,6 @@ Architecture: s390x
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Package: libc6-s390
Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-sparc, libc6-sparc64, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 32bit Shared libraries for IBM zSeries
diff --git a/debian/control.in/s390 b/debian/control.in/s390
index f7d605f..a6fe094 100644
--- a/debian/control.in/s390
+++ b/debian/control.in/s390
@@ -3,7 +3,6 @@ Architecture: s390x
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Package: libc6-s390
Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-sparc, libc6-sparc64, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 32bit Shared libraries for IBM zSeries
diff --git a/debian/control.in/sparc b/debian/control.in/sparc
index 50795e1..abb1ecd 100644
--- a/debian/control.in/sparc
+++ b/debian/control.in/sparc
@@ -4,7 +4,6 @@ Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
Build-Profiles: <!stage1 !nobiarch>
-Package: libc6-sparc
Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc64, libc6-x32
Description: GNU C Library: 32bit Shared libraries for SPARC
This package includes shared versions of the standard C library and the
diff --git a/debian/control.in/sparc64 b/debian/control.in/sparc64
index 3a3dbbe..3076034 100644
--- a/debian/control.in/sparc64
+++ b/debian/control.in/sparc64
@@ -3,7 +3,6 @@ Architecture: sparc
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Package: libc6-sparc64
Conflicts: libc0.1-i386, libc6-amd64, libc6-i386, libc6-mips32, libc6-mips64, libc6-mipsn32, libc6-powerpc, libc6-ppc64, libc6-s390, libc6-sparc, libc6-x32
Build-Profiles: <!stage1 !nobiarch>
Description: GNU C Library: 64bit Shared libraries for UltraSPARC
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: