Dmitrijs Ledkovs: Properly remove 65-mdadm.vol_id.rules, instead of trying to remove a never-existed 65_mdadm.vol_id.rules ( note the 65- vs 65_).

[Dmitrijs Ledkovs]

Module: mdadm
Branch: master
Commit: 941733a3ad7d158ea3926fd946bc3cf57a7ab97f
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=941733a3ad7d158ea3926fd946bc3cf57a7ab97f

Author: Dmitrijs Ledkovs <dmitrijs.ledkovs at canonical.com>
Date:   Wed Mar 27 11:11:35 2013 +0000

Properly remove 65-mdadm.vol_id.rules, instead of trying to remove a never-existed 65_mdadm.vol_id.rules (note the 65- vs 65_).

---

 debian/changelog     |    7 +++++++
 debian/mdadm.preinst |    3 ++-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f16a975..45d58c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mdadm (3.2.5-5ubuntu1) UNRELEASED; urgency=low
+
+  * Properly remove 65-mdadm.vol_id.rules, instead of trying to remove a
+    never-existed 65_mdadm.vol_id.rules (note the 65- vs 65_).
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>  Wed, 27 Mar 2013 11:10:10 +0000
+
 mdadm (3.2.5-5) unstable; urgency=low
 
   * add (empty) restart and force-reload actions to mdadm-waitidle
diff --git a/debian/mdadm.preinst b/debian/mdadm.preinst
index 573bba0..dc6c48e 100644
--- a/debian/mdadm.preinst
+++ b/debian/mdadm.preinst
@@ -43,7 +43,8 @@ case "$1" in
       $MDADM -Esc /var/backups/mdadm-Es_v1.dump >> /var/backups/mdadm-Es_v1.dump || :
     fi
 
-    rm_conffile /etc/udev/rules.d/65_mdadm.vol_id.rules
+    # Used incorrect name s/_/-/, keep all throughout until after jessie is released.
+    rm_conffile /etc/udev/rules.d/65-mdadm.vol_id.rules
     ;;
 
   *) :;;