r1242 - in glibc-package/trunk/debian: . control.in
Author: aurel32
Date: 2006-02-26 15:18:39 +0000 (Sun, 26 Feb 2006)
New Revision: 1242
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/i386
Log:
* Make libc6-i386 depends on ia32-libs (for the /usr/lib32 link and for
the ld.so.conf configuration)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-26 15:05:29 UTC (rev 1241)
+++ glibc-package/trunk/debian/changelog 2006-02-26 15:18:39 UTC (rev 1242)
@@ -8,6 +8,8 @@
flavours of the libc. Put them directly in the final directory, and
remove the corresponding tweaks done after the make install phase.
* Install the 32-bit libraries in /emul/ia32-linux(/usr)/lib on amd64.
+ * Make libc6-i386 depends on ia32-libs (for the /usr/lib32 link and for
+ the ld.so.conf configuration)
[ Clint Adams ]
* Get rid of -o as a binary operator to [ in tzconfig and postinst.
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-02-26 15:05:29 UTC (rev 1241)
+++ glibc-package/trunk/debian/control 2006-02-26 15:18:39 UTC (rev 1242)
@@ -347,7 +347,7 @@
Architecture: amd64
Section: libs
Priority: standard
-Depends: libc6 (= ${Source-Version})
+Depends: libc6 (= ${Source-Version}), ia32-libs (>> 1.5)
Conflicts: ia32-libs (<= 1.5)
Description: GNU C Library: 32bit shared libraries for AMD64
This package includes shared versions of the standard C
@@ -358,6 +358,7 @@
Architecture: amd64
Section: libdevel
Priority: optional
+Conflicts: ia32-libs-dev (<= 1.5)
Provides: lib32c-dev
Depends: libc6-i386 (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib32gcc1
Description: GNU C Library: 32bit development libraries for AMD64
Modified: glibc-package/trunk/debian/control.in/i386
===================================================================
--- glibc-package/trunk/debian/control.in/i386 2006-02-26 15:05:29 UTC (rev 1241)
+++ glibc-package/trunk/debian/control.in/i386 2006-02-26 15:18:39 UTC (rev 1242)
@@ -2,7 +2,7 @@
Architecture: amd64
Section: libs
Priority: standard
-Depends: libc6 (= ${Source-Version})
+Depends: libc6 (= ${Source-Version}), ia32-libs (>> 1.5)
Conflicts: ia32-libs (<= 1.5)
Description: GNU C Library: 32bit shared libraries for AMD64
This package includes shared versions of the standard C
@@ -13,6 +13,7 @@
Architecture: amd64
Section: libdevel
Priority: optional
+Conflicts: ia32-libs-dev (<= 1.5)
Provides: lib32c-dev
Depends: libc6-i386 (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib32gcc1
Description: GNU C Library: 32bit development libraries for AMD64
Reply to: