r6544 - in glibc-package/branches/glibc-2.21/debian: . control.in script.in
Author: aurel32
Date: 2015-09-09 19:00:21 +0000 (Wed, 09 Sep 2015)
New Revision: 6544
Modified:
glibc-package/branches/glibc-2.21/debian/control
glibc-package/branches/glibc-2.21/debian/control.in/libc
glibc-package/branches/glibc-2.21/debian/script.in/nohwcap.sh
Log:
Properly remove libc6-loongson2f
Modified: glibc-package/branches/glibc-2.21/debian/control
===================================================================
--- glibc-package/branches/glibc-2.21/debian/control 2015-09-09 18:23:04 UTC (rev 6543)
+++ glibc-package/branches/glibc-2.21/debian/control 2015-09-09 19:00:21 UTC (rev 6544)
@@ -164,7 +164,7 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
+Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1), libc6-loongson2f
Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), 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],
@@ -250,7 +250,7 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
+Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1), libc6-loongson2f
Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), 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],
@@ -336,7 +336,7 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
+Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1), libc6-loongson2f
Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), 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],
@@ -422,7 +422,7 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
+Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1), libc6-loongson2f
Breaks: nscd (<< 2.21), locales (<< 2.21), locales-all (<< 2.21), 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],
Modified: glibc-package/branches/glibc-2.21/debian/control.in/libc
===================================================================
--- glibc-package/branches/glibc-2.21/debian/control.in/libc 2015-09-09 18:23:04 UTC (rev 6543)
+++ glibc-package/branches/glibc-2.21/debian/control.in/libc 2015-09-09 19:00:21 UTC (rev 6544)
@@ -7,7 +7,7 @@
Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386]
Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
-Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1)
+Conflicts: tzdata-etch, tzdata (<< 2007k-1), prelink (<= 0.0.20090311-1), libc6-loongson2f
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],
Modified: glibc-package/branches/glibc-2.21/debian/script.in/nohwcap.sh
===================================================================
--- glibc-package/branches/glibc-2.21/debian/script.in/nohwcap.sh 2015-09-09 18:23:04 UTC (rev 6543)
+++ glibc-package/branches/glibc-2.21/debian/script.in/nohwcap.sh 2015-09-09 19:00:21 UTC (rev 6544)
@@ -16,9 +16,6 @@
kfreebsd-i386)
hwcappkgs="libc0.1-i686"
;;
- mipsel)
- hwcappkgs="libc6-loongson2f"
- ;;
sparc)
hwcappkgs="libc6-sparcv9 libc6-sparcv9b"
;;
Reply to: