r1625 - in glibc-package/trunk/debian: . control.in
Author: barbier
Date: 2006-06-06 22:48:49 +0000 (Tue, 06 Jun 2006)
New Revision: 1625
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control.in/main
Log:
debian/main/control.in: make locales Conflicts: belocs-locales-data.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-06-06 21:25:34 UTC (rev 1624)
+++ glibc-package/trunk/debian/changelog 2006-06-06 22:48:49 UTC (rev 1625)
@@ -25,6 +25,7 @@
* debian/patches/localedata/locale-csb_PL.diff
* debian/patches/localedata/locale-ro_RO.diff
* debian/patches/localedata/locale-se_NO.diff: Apply similar fixes.
+ * debian/main/control.in: make locales Conflicts: belocs-locales-data.
-- Aurelien Jarno <aurel32@debian.org> Mon, 5 Jun 2006 18:07:13 +0200
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-06-06 21:25:34 UTC (rev 1624)
+++ glibc-package/trunk/debian/control.in/main 2006-06-06 22:48:49 UTC (rev 1625)
@@ -32,7 +32,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: