Author: aurel32
Date: 2011-07-03 21:15:10 +0000 (Sun, 03 Jul 2011)
New Revision: 4783
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/libc
glibc-package/trunk/debian/rules.d/build.mk
Log:
* Install arch dependent headers in the multiarch include directory, patch by
Marcin Juszkiewicz. Tag libc*-dev as Multi-Arch: same.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-07-03 17:44:36 UTC (rev
4782)
+++ glibc-package/trunk/debian/changelog 2011-07-03 21:15:10 UTC (rev
4783)
@@ -17,6 +17,8 @@
Closes: #632452.
* debhelper.in/libc.preinst: only check for already unpacked versions of the
libc during upgrades. Closes: #632190, #632509.
+ * Install arch dependent headers in the multiarch include directory, patch by
+ Marcin Juszkiewicz. Tag libc*-dev as Multi-Arch: same.
-- Samuel Thibault <[email protected]> Thu, 30 Jun 2011 09:52:43 +0200
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2011-07-03 17:44:36 UTC (rev 4782)
+++ glibc-package/trunk/debian/control 2011-07-03 21:15:10 UTC (rev 4783)
@@ -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 (>= 7.4.3), tar (>= 1.22),
+ autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0), 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],
@@ -156,6 +156,7 @@
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
@@ -242,6 +243,7 @@
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
@@ -328,6 +330,7 @@
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
@@ -414,6 +417,7 @@
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-03 17:44:36 UTC (rev
4782)
+++ glibc-package/trunk/debian/control.in/libc 2011-07-03 21:15:10 UTC (rev
4783)
@@ -25,6 +25,7 @@
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/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2011-07-03 17:44:36 UTC (rev
4782)
+++ glibc-package/trunk/debian/rules.d/build.mk 2011-07-03 21:15:10 UTC (rev
4783)
@@ -160,6 +160,11 @@
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]
