[Glibc-bsd-commits] r3050 - trunk/libbsd/debian

[Guillem Jover]

Author: guillem
Date: 2010-06-28 19:06:16 +0000 (Mon, 28 Jun 2010)
New Revision: 3050

Modified:
   trunk/libbsd/debian/changelog
   trunk/libbsd/debian/control
Log:
Use kfreebsd-any instead of explicit list in libbsd0 Conflicts field


Modified: trunk/libbsd/debian/changelog
===================================================================
--- trunk/libbsd/debian/changelog	2010-06-24 07:13:04 UTC (rev 3049)
+++ trunk/libbsd/debian/changelog	2010-06-28 19:06:16 UTC (rev 3050)
@@ -1,3 +1,9 @@
+libbsd (0.2.0-2) UNRELEASED; urgency=low
+
+  * Use kfreebsd-any instead of explicit list in libbsd0 Conflicts field.
+
+ -- Guillem Jover <guillem at debian.org>  Mon, 28 Jun 2010 21:05:00 +0200
+
 libbsd (0.2.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libbsd/debian/control
===================================================================
--- trunk/libbsd/debian/control	2010-06-24 07:13:04 UTC (rev 3049)
+++ trunk/libbsd/debian/control	2010-06-28 19:06:16 UTC (rev 3050)
@@ -38,7 +38,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: net-tools (<< 7.0-2) [kfreebsd-i386 kfreebsd-amd64]
+Conflicts: net-tools (<< 7.0-2) [kfreebsd-any]
 Description: utility functions from BSD systems - shared library
  This library provides some functions commonly available on BSD systems
  but not on others like GNU systems.