diff options
| author | Michael Tokarev <mjt@tls.msk.ru> | 2013-08-10 11:31:06 +0400 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2013-08-10 11:31:06 +0400 |
| commit | 5b2bd57d599773a2dd381eadb47ac4f30ffc8cfc (patch) | |
| tree | 6504235802b92715ac4217d38e69fc2376cab9e0 /debian | |
| parent | bf3b145d1529c7b07208e87e56642f286cafefa5 (diff) | |
| parent | 941733a3ad7d158ea3926fd946bc3cf57a7ab97f (diff) | |
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-mdadm/mdadm
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/mdadm.preinst | 3 |
2 files changed, 9 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index d4b099e0..dcfe1c26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,14 @@ -mdadm (3.2.5-7) UNRELEASED; urgency=low +mdadm (3.2.5-5ubuntu1) UNRELEASED; urgency=low + [ Michael Tokarev ] * remove Martin F. Krafft from uploaders per his request. Thank you for your contributions! - -- Michael Tokarev <mjt@tls.msk.ru> Sat, 10 Aug 2013 11:27:40 +0400 + [ 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 <dmitrij.ledkov@ubuntu.com> Wed, 27 Mar 2013 11:10:10 +0000 mdadm (3.2.5-6) unstable; urgency=low diff --git a/debian/mdadm.preinst b/debian/mdadm.preinst index 573bba09..dc6c48ef 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 ;; *) :;; |