r844 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Sun Jan 23 17:29:31 2011
New Revision: 844

Log:
* debian/changelog: Update.
* debian/control: Conflict against libdevmapper1.02.
* debian/libdevmapper1.02.1.preinst: Remove libdevmapper1.02 init script.

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/control
   lvm2/trunk/debian/libdevmapper1.02.1.preinst

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Sat Oct 30 16:04:38 2010	(r843)
+++ lvm2/trunk/debian/changelog	Sun Jan 23 17:29:31 2011	(r844)
@@ -1,3 +1,10 @@
+lvm2 (2.02.66-5) UNRELEASED; urgency=low
+
+  * Remove old libdevmapper1.02 init script on upgrade. (closes: #549316)
+  * Conflict against libdevmapper1.02.
+
+ -- Bastian Blank <waldi at debian.org>  Sun, 23 Jan 2011 17:49:09 +0100
+
 lvm2 (2.02.66-4) unstable; urgency=low
 
   * Make libdevmapper break old lvm2, it missuses the udev sync

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	Sat Oct 30 16:04:38 2010	(r843)
+++ lvm2/trunk/debian/control	Sun Jan 23 17:29:31 2011	(r844)
@@ -66,6 +66,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, dmsetup (>= ${binary:Version})
 Breaks: lvm2 (<< 2.02.66)
+Conflicts: libdevmapper1.02
 Provides: libdevmapper
 Description: The Linux Kernel Device Mapper userspace library
  The Linux Kernel Device Mapper is the LVM (Linux Logical Volume Management)

Modified: lvm2/trunk/debian/libdevmapper1.02.1.preinst
==============================================================================
--- lvm2/trunk/debian/libdevmapper1.02.1.preinst	Sat Oct 30 16:04:38 2010	(r843)
+++ lvm2/trunk/debian/libdevmapper1.02.1.preinst	Sun Jan 23 17:29:31 2011	(r844)
@@ -4,6 +4,10 @@
 	update-rc.d -f libdevmapper1.02.1 remove >/dev/null || exit $?
 	rm /etc/init.d/libdevmapper1.02.1
 fi
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" "<=" "2:1.02.48-4"; then
+	update-rc.d -f libdevmapper1.02 remove >/dev/null
+	rm -f /etc/init.d/libdevmapper1.02
+fi
 
 #DEBHELPER#