[Glibc-bsd-commits] r5376 - trunk/freebsd-utils/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-23 13:02:37 +0000 (Thu, 23 Jan 2014)
New Revision: 5376

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/control
Log:
Remove Build-Conflicts on libc0.1-dev-i386 (not needed anymore since kdump is now using headers from kfreebsd-headers-10.0-1).

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2014-01-22 21:59:49 UTC (rev 5375)
+++ trunk/freebsd-utils/debian/changelog	2014-01-23 13:02:37 UTC (rev 5376)
@@ -1,6 +1,8 @@
 freebsd-utils (10.0-2) UNRELEASED; urgency=low
 
   * Handle USB keyboard attach/detach events.
+  * Remove Build-Conflicts on libc0.1-dev-i386 (not needed anymore since
+    kdump is now using headers from kfreebsd-headers-10.0-1).
 
  -- Robert Millan <rmh at debian.org>  Tue, 21 Jan 2014 12:38:27 +0100
 

Modified: trunk/freebsd-utils/debian/control
===================================================================
--- trunk/freebsd-utils/debian/control	2014-01-22 21:59:49 UTC (rev 5375)
+++ trunk/freebsd-utils/debian/control	2014-01-23 13:02:37 UTC (rev 5376)
@@ -44,9 +44,6 @@
  libssl-dev,
 # jail, ppp
  libutil-freebsd-dev,
-Build-Conflicts:
-# /usr/include/bits symlink breaks usr.bin/kdump/{mkioctls,mksubr}
- libc0.1-dev-i386,
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/freebsd-utils/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/freebsd-utils/
 Standards-Version: 3.9.2