[Pkg-bluetooth-commits] r865 - in /packages/bluez/trunk/debian: changelog control

[filippo at users.alioth.debian.org]

Author: filippo
Date: Tue Jun 30 18:51:22 2009
New Revision: 865

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=865
Log:
Conflict/Replace bluez-audio in bluez (Closes: #535089)

Modified:
    packages/bluez/trunk/debian/changelog
    packages/bluez/trunk/debian/control

Modified: packages/bluez/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/changelog?rev=865&op=diff
==============================================================================
--- packages/bluez/trunk/debian/changelog (original)
+++ packages/bluez/trunk/debian/changelog Tue Jun 30 18:51:22 2009
@@ -2,8 +2,9 @@
 
   * Fix "Bashisms in init script" (Closes: #534511)
   * Handle upgrade of old /etc/modprobe.d/bluez (Closes: #523050)
-
- -- Filippo Giunchedi <filippo at debian.org>  Thu, 25 Jun 2009 18:08:42 +0200
+  * Conflict/Replace bluez-audio in bluez (Closes: #535089)
+
+ -- Filippo Giunchedi <filippo at debian.org>  Tue, 30 Jun 2009 20:05:13 +0200
 
 bluez (4.42-1) unstable; urgency=low
 

Modified: packages/bluez/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/control?rev=865&op=diff
==============================================================================
--- packages/bluez/trunk/debian/control (original)
+++ packages/bluez/trunk/debian/control Tue Jun 30 18:51:22 2009
@@ -57,8 +57,8 @@
 Package: bluez
 Architecture: any
 Depends: ${shlibs:Depends}, module-init-tools, makedev | udev, lsb-base, dbus, ${misc:Depends}
-Replaces: bluez-input, bluez-network, bluez-serial, bluez-utils (<=4.9)
-Conflicts: bluez-utils (<= 3.36-3)
+Replaces: bluez-input, bluez-network, bluez-serial, bluez-utils (<= 3.36-3), bluez-audio (<= 3.36-3)
+Conflicts: bluez-utils (<= 3.36-3), bluez-audio (<= 3.36-3)
 Suggests: python-gobject, python-dbus
 Description: Bluetooth tools and daemons
  This package contains tools and system daemons for using Bluetooth devices.