Author: aurel32 Date: 2011-07-04 19:43:30 +0000 (Mon, 04 Jul 2011) New Revision: 4792
Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/control glibc-package/trunk/debian/control.in/libc glibc-package/trunk/debian/control.in/main glibc-package/trunk/debian/rules.d/build.mk Log: * Revert patch to make libc6-dev multiarch. Closes: #632667. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2011-07-04 18:48:58 UTC (rev 4791) +++ glibc-package/trunk/debian/changelog 2011-07-04 19:43:30 UTC (rev 4792) @@ -1,6 +1,7 @@ eglibc (2.13-10) UNRELEASED; urgency=low - * control.in/main: tag libc-bin Essential: yes. + * control.in/main: tag libc-bin Essential: yes. + * Revert patch to make libc6-dev multiarch. Closes: #632667. -- Aurelien Jarno <[email protected]> Mon, 04 Jul 2011 07:15:43 +0200 Modified: glibc-package/trunk/debian/control =================================================================== --- glibc-package/trunk/debian/control 2011-07-04 18:48:58 UTC (rev 4791) +++ glibc-package/trunk/debian/control 2011-07-04 19:43:30 UTC (rev 4792) @@ -2,7 +2,7 @@ Section: libs Priority: required Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.16.0), bzip2, lzma, xz-utils, file, quilt, - autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0), tar (>= 1.22), + autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 7.4.3), tar (>= 1.22), linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], gnumach-dev [hurd-i386], libpthread-stubs0-dev [hurd-i386], kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64], @@ -157,7 +157,6 @@ Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb Section: libdevel Priority: optional -Multi-Arch: same Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386] Recommends: gcc | c-compiler Suggests: glibc-doc, manpages-dev @@ -244,7 +243,6 @@ Architecture: alpha ia64 Section: libdevel Priority: optional -Multi-Arch: same Depends: libc6.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386] Recommends: gcc | c-compiler Suggests: glibc-doc, manpages-dev @@ -331,7 +329,6 @@ Architecture: hurd-i386 Section: libdevel Priority: optional -Multi-Arch: same Depends: libc0.3 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386] Recommends: gcc | c-compiler Suggests: glibc-doc, manpages-dev @@ -418,7 +415,6 @@ Architecture: kfreebsd-i386 kfreebsd-amd64 Section: libdevel Priority: optional -Multi-Arch: same Depends: libc0.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386] Recommends: gcc | c-compiler Suggests: glibc-doc, manpages-dev Modified: glibc-package/trunk/debian/control.in/libc =================================================================== --- glibc-package/trunk/debian/control.in/libc 2011-07-04 18:48:58 UTC (rev 4791) +++ glibc-package/trunk/debian/control.in/libc 2011-07-04 19:43:30 UTC (rev 4792) @@ -25,7 +25,6 @@ Architecture: @archs@ Section: libdevel Priority: optional -Multi-Arch: same Depends: @libc@ (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386] Recommends: gcc | c-compiler Suggests: glibc-doc, manpages-dev Modified: glibc-package/trunk/debian/control.in/main =================================================================== --- glibc-package/trunk/debian/control.in/main 2011-07-04 18:48:58 UTC (rev 4791) +++ glibc-package/trunk/debian/control.in/main 2011-07-04 19:43:30 UTC (rev 4792) @@ -2,7 +2,7 @@ Section: libs Priority: required Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.16.0), bzip2, lzma, xz-utils, file, quilt, - autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0), tar (>= 1.22), + autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 7.4.3), tar (>= 1.22), linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], gnumach-dev [hurd-i386], libpthread-stubs0-dev [hurd-i386], kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64], Modified: glibc-package/trunk/debian/rules.d/build.mk =================================================================== --- glibc-package/trunk/debian/rules.d/build.mk 2011-07-04 18:48:58 UTC (rev 4791) +++ glibc-package/trunk/debian/rules.d/build.mk 2011-07-04 19:43:30 UTC (rev 4792) @@ -160,11 +160,6 @@ echo "/lib/$(DEB_HOST_GNU_TYPE)" >> $$conffile; \ echo "/usr/lib/$(DEB_HOST_GNU_TYPE)" >> $$conffile; \ fi; \ - mkdir -p debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \ - mv debian/tmp-$(curpass)/usr/include/bits debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \ - mv debian/tmp-$(curpass)/usr/include/gnu debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \ - mv debian/tmp-$(curpass)/usr/include/sys debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \ - mv debian/tmp-$(curpass)/usr/include/fpu_control.h debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \ fi # For our biarch libc, add an ld.so.conf.d configuration; this -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
