r1999 - in glibc-package/branches/glibc-2.5/debian: . control.in
Author: aurel32
Date: 2007-02-18 21:28:28 +0100 (Sun, 18 Feb 2007)
New Revision: 1999
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/control
glibc-package/branches/glibc-2.5/debian/control.in/i386
Log:
* debian/control.in/i386: Changed the conflicts on ia32-libs-dev to a
versioned conflict. Closes: #407540.
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-18 18:32:55 UTC (rev 1998)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-18 20:28:28 UTC (rev 1999)
@@ -122,6 +122,8 @@
* debhelper.in/glibc-doc.links: add symlinks from pthread_setcanceltype(3),
pthread_setcancelstate(3) and pthread_testcancel(3) to pthread_cancel(3).
Closes: #411132.
+ * debian/control.in/i386: Changed the conflicts on ia32-libs-dev to a
+ versioned conflict. Closes: #407540.
[ Denis Barbier ]
* Remove localedata/locale-en_NZ.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.5/debian/control
===================================================================
--- glibc-package/branches/glibc-2.5/debian/control 2007-02-18 18:32:55 UTC (rev 1998)
+++ glibc-package/branches/glibc-2.5/debian/control 2007-02-18 20:28:28 UTC (rev 1999)
@@ -366,7 +366,7 @@
Architecture: amd64
Section: libdevel
Priority: optional
-Conflicts: ia32-libs-dev
+Conflicts: ia32-libs-dev (<< 1.18)
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/branches/glibc-2.5/debian/control.in/i386
===================================================================
--- glibc-package/branches/glibc-2.5/debian/control.in/i386 2007-02-18 18:32:55 UTC (rev 1998)
+++ glibc-package/branches/glibc-2.5/debian/control.in/i386 2007-02-18 20:28:28 UTC (rev 1999)
@@ -14,7 +14,7 @@
Architecture: amd64
Section: libdevel
Priority: optional
-Conflicts: ia32-libs-dev
+Conflicts: ia32-libs-dev (<< 1.18)
Provides: lib32c-dev
Depends: libc6-i386 (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib32gcc1
Description: GNU C Library: 32bit development libraries for AMD64
Reply to: