r760 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Fri Nov  6 16:43:00 2009
New Revision: 760

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

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

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Fri Nov  6 16:40:44 2009	(r759)
+++ lvm2/trunk/debian/changelog	Fri Nov  6 16:43:00 2009	(r760)
@@ -5,6 +5,8 @@
   * Add better documentation about the udev rules.
   * Update list of to be ignored hidden lvm subvolumes.
   * Make libdevmapper-dev depend against libselinux1-dev.
+  * Update complete udev ruleset.
+  * Remove conflict against devicekit-disks.
 
  -- Bastian Blank <waldi at debian.org>  Mon, 12 Oct 2009 04:38:12 +0200
 

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	Fri Nov  6 16:40:44 2009	(r759)
+++ lvm2/trunk/debian/control	Fri Nov  6 16:43:00 2009	(r760)
@@ -95,7 +95,7 @@
 Section: admin
 Architecture: any
 Depends: ${shlibs:Depends}, util-linux (>> 2.16), udev
-Conflicts: devicekit-disks
+Conflicts: devicekit-disks (<< 009)
 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