r1627 - in glibc-package/branches/glibc-2.4/debian: . control.in
Author: aurel32
Date: 2006-06-07 13:02:52 +0000 (Wed, 07 Jun 2006)
New Revision: 1627
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/control.in/main
Log:
Merge from trunk
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-07 09:31:40 UTC (rev 1626)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-07 13:02:52 UTC (rev 1627)
@@ -151,6 +151,9 @@
* patches/m32r/local-ports-m32r.diff: remove libc_cv_gcc_unwind_find=yes
from m32r/configure by Kazuhiro Inaoka. (Closes: #371052)
+ [ Denis Barbier ]
+ * debian/main/control.in: make locales Conflicts: belocs-locales-data.
+
-- Aurelien Jarno <aurel32@debian.org> Sat, 3 Jun 2006 16:15:48 +0200
glibc (2.3.6-13) unstable; urgency=low
Modified: glibc-package/branches/glibc-2.4/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control.in/main 2006-06-07 09:31:40 UTC (rev 1626)
+++ glibc-package/branches/glibc-2.4/debian/control.in/main 2006-06-07 13:02:52 UTC (rev 1627)
@@ -29,7 +29,7 @@
Section: libs
Priority: standard
Depends: ${locale:Depends}, debconf | debconf-2.0
-Conflicts: base-config
+Conflicts: base-config, 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
Reply to: