Author: aurel32 Date: 2015-09-09 19:06:34 +0000 (Wed, 09 Sep 2015) New Revision: 6545
Modified: glibc-package/branches/glibc-2.21/debian/changelog glibc-package/branches/glibc-2.21/debian/control glibc-package/branches/glibc-2.21/debian/control.in/amd64 glibc-package/branches/glibc-2.21/debian/control.in/libc glibc-package/branches/glibc-2.21/debian/control.in/main Log: control.in/*: remove pre-squeeze conflicts. Modified: glibc-package/branches/glibc-2.21/debian/changelog =================================================================== --- glibc-package/branches/glibc-2.21/debian/changelog 2015-09-09 19:00:21 UTC (rev 6544) +++ glibc-package/branches/glibc-2.21/debian/changelog 2015-09-09 19:06:34 UTC (rev 6545) @@ -42,6 +42,7 @@ * Bump debhelper compatiblity to level 9. This brings compressed debug file using the build-id instead of a fixed path. This is much more multiarch friendly. + * control.in/*: remove pre-squeeze conflicts. [ Steven Chamberlain ] * sysdeps/kfreebsd.mk: find kfreebsd-kernel-headers in multiarch path. Modified: glibc-package/branches/glibc-2.21/debian/control =================================================================== --- glibc-package/branches/glibc-2.21/debian/control 2015-09-09 19:00:21 UTC (rev 6544) +++ glibc-package/branches/glibc-2.21/debian/control 2015-09-09 19:06:34 UTC (rev 6545) @@ -96,8 +96,7 @@ Section: localization Priority: standard Depends: libc-bin (>> 2.21), libc-l10n (>> 2.21), ${misc:Depends}, debconf | debconf-2.0 -Conflicts: base-config, belocs-locales-bin, belocs-locales-data -Replaces: base-config, lliurex-belocs-locales-data, manpages-fr-extra (<< 20141022) +Replaces: manpages-fr-extra (<< 20141022) Build-Profiles: <!stage1> Description: GNU C Library: National Language (locale) data [support] Machine-readable data files, shared objects and programs used by the @@ -164,7 +163,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), libc6-loongson2f +Conflicts: 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 +249,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), libc6-loongson2f +Conflicts: 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 +335,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), libc6-loongson2f +Conflicts: 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 +421,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), libc6-loongson2f +Conflicts: 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], @@ -610,7 +609,6 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} -Conflicts: amd64-libs (<= 1.2) Build-Profiles: <!stage1 !nobiarch> Description: GNU C Library: 64bit Shared libraries for AMD64 This package includes shared versions of the standard C library and the @@ -624,7 +622,7 @@ Depends: libc6-amd64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends} Recommends: gcc-multilib Conflicts: libc6-dev (<< 2.13-14) -Replaces: amd64-libs-dev (<= 1.2), libc6-dev (<< 2.13-11) +Replaces: libc6-dev (<< 2.13-11) Provides: lib64c-dev Build-Profiles: <!nobiarch> Description: GNU C Library: 64bit Development Libraries for AMD64 Modified: glibc-package/branches/glibc-2.21/debian/control.in/amd64 =================================================================== --- glibc-package/branches/glibc-2.21/debian/control.in/amd64 2015-09-09 19:00:21 UTC (rev 6544) +++ glibc-package/branches/glibc-2.21/debian/control.in/amd64 2015-09-09 19:06:34 UTC (rev 6545) @@ -3,7 +3,6 @@ Section: libs Priority: optional Depends: libc6 (= ${binary:Version}), ${misc:Depends} -Conflicts: amd64-libs (<= 1.2) Build-Profiles: <!stage1 !nobiarch> Description: GNU C Library: 64bit Shared libraries for AMD64 This package includes shared versions of the standard C library and the @@ -17,7 +16,7 @@ Depends: libc6-amd64 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends} Recommends: gcc-multilib Conflicts: libc6-dev (<< 2.13-14) -Replaces: amd64-libs-dev (<= 1.2), libc6-dev (<< 2.13-11) +Replaces: libc6-dev (<< 2.13-11) Provides: lib64c-dev Build-Profiles: <!nobiarch> Description: GNU C Library: 64bit Development Libraries for AMD64 Modified: glibc-package/branches/glibc-2.21/debian/control.in/libc =================================================================== --- glibc-package/branches/glibc-2.21/debian/control.in/libc 2015-09-09 19:00:21 UTC (rev 6544) +++ glibc-package/branches/glibc-2.21/debian/control.in/libc 2015-09-09 19:06:34 UTC (rev 6545) @@ -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), libc6-loongson2f +Conflicts: 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/control.in/main =================================================================== --- glibc-package/branches/glibc-2.21/debian/control.in/main 2015-09-09 19:00:21 UTC (rev 6544) +++ glibc-package/branches/glibc-2.21/debian/control.in/main 2015-09-09 19:06:34 UTC (rev 6545) @@ -96,8 +96,7 @@ Section: localization Priority: standard Depends: libc-bin (>> @GLIBC_VERSION@), libc-l10n (>> @GLIBC_VERSION@), ${misc:Depends}, debconf | debconf-2.0 -Conflicts: base-config, belocs-locales-bin, belocs-locales-data -Replaces: base-config, lliurex-belocs-locales-data, manpages-fr-extra (<< 20141022) +Replaces: manpages-fr-extra (<< 20141022) Build-Profiles: <!stage1> Description: GNU C Library: National Language (locale) data [support] Machine-readable data files, shared objects and programs used by the