Author: barbier
Date: 2006-06-08 19:16:36 +0000 (Thu, 08 Jun 2006)
New Revision: 1642
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
Log:
debian/main/control.in: also make locales Conflicts: belocs-locales-bin.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-06-08 13:51:56 UTC (rev 1641)
+++ glibc-package/trunk/debian/changelog 2006-06-08 19:16:36 UTC (rev 1642)
@@ -1,5 +1,6 @@
glibc (2.3.6-16) UNRELEASED; urgency=low
+ [ Aurelien Jarno ]
* Add arm/cvs-gcc4.1-raise.diff (fix build failure with gcc-4.1) from
upstream.
* Add ia64/cvs-gcc41-atomic_h.diff (fix build failure with gcc-4.1) from
@@ -9,6 +10,9 @@
* debian/rules.d/build.mk: use ld.so instead of libc.so to determine if the
host CPU is able to run the testsuite.
+ [ Denis Barbier ]
+ * debian/main/control.in: also make locales Conflicts: belocs-locales-bin.
+
-- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 08:03:49 +0200
glibc (2.3.6-15) unstable; urgency=low
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-06-08 13:51:56 UTC (rev 1641)
+++ glibc-package/trunk/debian/control 2006-06-08 19:16:36 UTC (rev 1642)
@@ -32,7 +32,7 @@
Section: libs
Priority: standard
Depends: ${locale:Depends}, debconf | debconf-2.0
-Conflicts: base-config, belocs-locales-data
+Conflicts: base-config, belocs-locales-bin, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data
Description: GNU C Library: National Language (locale) data [support]
Machine-readable data files, shared objects and programs used by the
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-06-08 13:51:56 UTC (rev 1641)
+++ glibc-package/trunk/debian/control.in/main 2006-06-08 19:16:36 UTC (rev 1642)
@@ -32,7 +32,7 @@
Section: libs
Priority: standard
Depends: ${locale:Depends}, debconf | debconf-2.0
-Conflicts: base-config, belocs-locales-data
+Conflicts: base-config, belocs-locales-bin, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data
Description: GNU C Library: National Language (locale) data [support]
Machine-readable data files, shared objects and programs used by the