[Glibc-bsd-commits] r2884 - trunk/freebsd-libs/debian

[Aurelien Jarno]

Author: aurel32
Date: 2009-12-06 16:13:13 +0000 (Sun, 06 Dec 2009)
New Revision: 2884

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
Log:
  * Make libusb2-dev conflict with libusb-dev.



Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2009-12-06 15:42:22 UTC (rev 2883)
+++ trunk/freebsd-libs/debian/changelog	2009-12-06 16:13:13 UTC (rev 2884)
@@ -2,10 +2,13 @@
 
   [ Petr Salinger ]
   * bump build-depends on kfreebsd-kernel-headers to (>= 0.45)
-  * add libusb2 and libusb2???-dev packages
+  * add libusb2 and libusb2-dev packages
 
- -- Aurelien Jarno <aurel32 at debian.org>  Sat, 28 Nov 2009 22:42:32 +0100
+  [ Aurelien Jarno ]
+  * Make libusb2-dev conflict with libusb-dev.
 
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 06 Dec 2009 17:12:30 +0100
+
 freebsd-libs (8.0-2) unstable; urgency=low
 
   * Bump build-depends on kfreebsd-kernel-headers to (>= 0.43).

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2009-12-06 15:42:22 UTC (rev 2883)
+++ trunk/freebsd-libs/debian/control	2009-12-06 16:13:13 UTC (rev 2884)
@@ -90,6 +90,7 @@
 Section: libdevel
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: libusb2 (= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
+Conflicts: libusb-dev
 Description: Development files for libusb2
  This package contains the header files and static library needed to
  compile applications that use libusb2.