r735 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Wed Sep 30 02:58:41 2009
New Revision: 735

Log:
* debian/changelog: Update.
* debian/control: Make dmsetup conflict against devicekit-disks.

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/control

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Wed Sep 30 02:54:42 2009	(r734)
+++ lvm2/trunk/debian/changelog	Wed Sep 30 02:58:41 2009	(r735)
@@ -1,6 +1,8 @@
 lvm2 (2.02.53-1) UNRELEASED; urgency=low
 
   * New upstream version.
+  * Make dmsetup conflicts against devicekit-disks, it duplicates the udev
+    rules.
 
  -- Bastian Blank <waldi at debian.org>  Wed, 30 Sep 2009 04:49:40 +0200
 

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	Wed Sep 30 02:54:42 2009	(r734)
+++ lvm2/trunk/debian/control	Wed Sep 30 02:58:41 2009	(r735)
@@ -95,6 +95,7 @@
 Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}, util-linux (>> 2.16), udev
+Conflicts: devicekit-disks
 Description: The Linux Kernel Device Mapper userspace library
  The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)
  Team's implementation of a minimalistic kernel-space driver that handles