[Glibc-bsd-commits] r6133 - trunk/freebsd-buildutils/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2017-01-08 22:11:15 +0000 (Sun, 08 Jan 2017)
New Revision: 6133

Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/control
Log:
Declare Conflicts: flex-old due to freebsd-buildutils shipping a
libfl.a for freebsd-lex


Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2017-01-08 22:09:17 UTC (rev 6132)
+++ trunk/freebsd-buildutils/debian/changelog	2017-01-08 22:11:15 UTC (rev 6133)
@@ -1,3 +1,10 @@
+freebsd-buildutils (10.3~svn296373-6) UNRELEASED; urgency=medium
+
+  * Declare Conflicts: flex-old due to freebsd-buildutils shipping a
+    libfl.a for freebsd-lex
+
+ -- Steven Chamberlain <stevenc at debian.org>  Sun, 08 Jan 2017 22:00:58 +0000
+
 freebsd-buildutils (10.3~svn296373-5) unstable; urgency=medium
 
   * Fix typo in debian/rules causing FTBFS on arm* architectures

Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control	2017-01-08 22:09:17 UTC (rev 6132)
+++ trunk/freebsd-buildutils/debian/control	2017-01-08 22:11:15 UTC (rev 6133)
@@ -27,7 +27,7 @@
 # Not strictly required anymore. But let's drag it in for now, to avoid breaking
 # expectations.
  freebsd-mk,
-Conflicts: freebsd5-buildutils, freebsd6-buildutils
+Conflicts: freebsd5-buildutils, freebsd6-buildutils, flex-old
 Provides: freebsd6-buildutils, freebsd7-buildutils
 Description: Utilities for building FreeBSD sources
  This package contains the FreeBSD counterparts of some standard build