r2914 - in glibc-package/trunk/debian: . sysdeps
Author: aurel32
Date: 2008-04-12 21:04:38 +0000 (Sat, 12 Apr 2008)
New Revision: 2914
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/depflags.pl
Log:
* sysdeps/depflags.pl: conflicts with tzdata-etch.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-04-11 04:12:26 UTC (rev 2913)
+++ glibc-package/trunk/debian/changelog 2008-04-12 21:04:38 UTC (rev 2914)
@@ -18,12 +18,13 @@
* patches/any/cvs-ethertype.diff: new patch to add new ETHERTYPE_*
definitions. Closes: #474171.
* sysdeps/arm.mk, control.in/main: use gcc-4.3 on arm.
+ * sysdeps/depflags.pl: conflicts with tzdata-etch.
[ Pierre Habouzit ]
* Add any/cvs-strerror_r.diff to make strerror_r actually thread safe.
Closes: #456531.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 08 Apr 2008 14:30:01 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sat, 12 Apr 2008 22:52:44 +0200
glibc (2.7-10) unstable; urgency=low
Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl 2008-04-11 04:12:26 UTC (rev 2913)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl 2008-04-12 21:04:38 UTC (rev 2914)
@@ -76,7 +76,7 @@
push @{$libc_c{'Conflicts'}}, 'libterm-readline-gnu-perl (<< 1.15-2)';
# Conflict with older versions of tzdata that need tzconfig.
-push @{$libc_c{'Conflicts'}}, 'tzdata (<< 2007k-1)';
+push @{$libc_c{'Conflicts'}}, 'tzdata (<< 2007k-1), tzdata-etch';
# Depends on libgcc1/libgcc2/libgcc4
if ($DEB_HOST_ARCH =~ m/^hppa$/) {
Reply to: