r5275 - in glibc-package/trunk/debian: . control.in rules.d
Author: aurel32
Date: 2012-06-03 17:54:28 +0000 (Sun, 03 Jun 2012)
New Revision: 5275
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
glibc-package/trunk/debian/rules.d/control.mk
glibc-package/trunk/debian/rules.d/stage1.mk
Log:
* Set libc*-dev "Multi-Arch: same". Add conflicts betwwen libc*-dev
packages. Move a.out.h and ieee754.h to the arch qualified path.
Thanks to Thibaut Girka for the help. Closes: #666760.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-06-03 17:05:57 UTC (rev 5274)
+++ glibc-package/trunk/debian/changelog 2012-06-03 17:54:28 UTC (rev 5275)
@@ -50,6 +50,9 @@
version. Closes: #675606.
* Take-over nsswitch.conf installation from base-files. Closes:
#673271.
+ * Set libc*-dev "Multi-Arch: same". Add conflicts betwwen libc*-dev
+ packages. Move a.out.h and ieee754.h to the arch qualified path.
+ Thanks to Thibaut Girka for the help. Closes: #666760.
-- Clint Adams <clint@debian.org> Fri, 04 May 2012 23:39:00 -0400
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2012-06-03 17:05:57 UTC (rev 5274)
+++ glibc-package/trunk/debian/control 2012-06-03 17:54:28 UTC (rev 5275)
@@ -134,7 +134,7 @@
be removed once nothing on the system depends on it.
Package: libc6
-Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armel armhf hppa i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x sh4
Section: libs
Priority: required
Multi-Arch: same
@@ -158,21 +158,23 @@
and the standard math library, as well as many others.
Package: libc6-dev
-Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armel armhf hppa i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x sh4
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]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3)
+Conflicts: libc6.1-dev libc0.1-dev libc0.3-dev
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
Package: libc6-dbg
-Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armel armhf hppa i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x sh4
Section: debug
Priority: extra
Multi-Arch: same
@@ -183,7 +185,7 @@
library.
Package: libc6-prof
-Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armel armhf hppa i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x sh4
Section: libdevel
Priority: extra
Multi-Arch: same
@@ -193,7 +195,7 @@
with gprof.
Package: libc6-pic
-Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armel armhf hppa i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x sh4
Section: libdevel
Priority: optional
Multi-Arch: same
@@ -208,7 +210,7 @@
Package: libc6-udeb
XC-Package-Type: udeb
-Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armel armhf hppa i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x sh4
Section: debian-installer
Priority: extra
Provides: libc6, libc-udeb, ${locale-compat:Depends}
@@ -248,12 +250,14 @@
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]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3)
+Conflicts: libc6-dev libc0.1-dev libc0.3-dev
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -335,12 +339,14 @@
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]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3)
+Conflicts: libc6-dev libc6.1-dev libc0.1-dev
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -395,7 +401,7 @@
installer. Do not install it on a normal system.
Package: libc0.1
-Architecture: kfreebsd-i386 kfreebsd-amd64
+Architecture: kfreebsd-amd64 kfreebsd-i386
Section: libs
Priority: required
Multi-Arch: same
@@ -419,21 +425,23 @@
and the standard math library, as well as many others.
Package: libc0.1-dev
-Architecture: kfreebsd-i386 kfreebsd-amd64
+Architecture: kfreebsd-amd64 kfreebsd-i386
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]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3)
+Conflicts: libc6-dev libc6.1-dev libc0.3-dev
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
Package: libc0.1-dbg
-Architecture: kfreebsd-i386 kfreebsd-amd64
+Architecture: kfreebsd-amd64 kfreebsd-i386
Section: debug
Priority: extra
Multi-Arch: same
@@ -444,7 +452,7 @@
library.
Package: libc0.1-prof
-Architecture: kfreebsd-i386 kfreebsd-amd64
+Architecture: kfreebsd-amd64 kfreebsd-i386
Section: libdevel
Priority: extra
Multi-Arch: same
@@ -454,7 +462,7 @@
with gprof.
Package: libc0.1-pic
-Architecture: kfreebsd-i386 kfreebsd-amd64
+Architecture: kfreebsd-amd64 kfreebsd-i386
Section: libdevel
Priority: optional
Multi-Arch: same
@@ -469,7 +477,7 @@
Package: libc0.1-udeb
XC-Package-Type: udeb
-Architecture: kfreebsd-i386 kfreebsd-amd64
+Architecture: kfreebsd-amd64 kfreebsd-i386
Section: debian-installer
Priority: extra
Provides: libc0.1, libc-udeb, ${locale-compat:Depends}
Modified: glibc-package/trunk/debian/control.in/libc
===================================================================
--- glibc-package/trunk/debian/control.in/libc 2012-06-03 17:05:57 UTC (rev 5274)
+++ glibc-package/trunk/debian/control.in/libc 2012-06-03 17:54:28 UTC (rev 5275)
@@ -26,12 +26,14 @@
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]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.20.1-1), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3)
+Conflicts: @libc-dev-conflict@
Description: Embedded GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2012-06-03 17:05:57 UTC (rev 5274)
+++ glibc-package/trunk/debian/rules.d/build.mk 2012-06-03 17:54:28 UTC (rev 5275)
@@ -176,6 +176,8 @@
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); \
+ mv debian/tmp-$(curpass)/usr/include/a.out.h debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \
+ mv debian/tmp-$(curpass)/usr/include/ieee754.h debian/tmp-$(curpass)/usr/include/$(DEB_HOST_MULTIARCH); \
fi
# For our biarch libc, add an ld.so.conf.d configuration; this
Modified: glibc-package/trunk/debian/rules.d/control.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/control.mk 2012-06-03 17:05:57 UTC (rev 5274)
+++ glibc-package/trunk/debian/rules.d/control.mk 2012-06-03 17:54:28 UTC (rev 5275)
@@ -8,11 +8,12 @@
$(patsubst %,debian/control.in/%,$(libc_packages)) :: debian/control.in/% : debian/control.in/libc debian/rules.d/control.mk
sed -e "s%@libc@%$*%g" \
- -e "s%@archs@%$($(subst .,_,$*)_archs)%g" < $< > $@
+ -e "s%@archs@%$($(subst .,_,$*)_archs)%g" \
+ -e "s%@libc-dev-conflict@%$(foreach arch,$(filter-out $*,$(libc_packages)),$(arch)-dev)%g" \
+ < $< > $@
debian/control: $(stamp)control
-$(stamp)control: debian/control.in/main $(control_deps) \
- debian/rules.d/control.mk
+$(stamp)control: debian/rules.d/control.mk $(control_deps)
# Check that all files end with a new line
set -e ; for i in debian/control.in/* ; do \
Modified: glibc-package/trunk/debian/rules.d/stage1.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/stage1.mk 2012-06-03 17:05:57 UTC (rev 5274)
+++ glibc-package/trunk/debian/rules.d/stage1.mk 2012-06-03 17:54:28 UTC (rev 5275)
@@ -65,6 +65,8 @@
mv $(DESTDIR)/usr/include/gnu $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH)
mv $(DESTDIR)/usr/include/sys $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH)
mv $(DESTDIR)/usr/include/fpu_control.h $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH)
+ mv $(DESTDIR)/usr/include/a.out.h $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH)
+ mv $(DESTDIR)/usr/include/ieee754.h $(DESTDIR)/usr/include/$(DEB_HOST_MULTIARCH)
$(call xx,extra_install)
touch $@
Reply to: