From 679965cef538de78ee10a56a20b42db0e6af5307 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Sat, 20 Sep 2014 09:33:33 +0400 Subject: use install -D in d/rules consistently and remove dirs from d/mdadm.dirs --- debian/changelog | 1 + debian/mdadm.dirs | 7 ------- debian/rules | 22 +++++++++++----------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2e24387a..a6498aab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ mdadm (3.3.2-1) UNRELEASED; urgency=low from fatal error to warning (Closes: #733574) * create /etc/modprobe.d/mdadm.conf to set start_ro=1 there instead of doing it in the initramfs + * use install -D in d/rules consistently and remove dirs from d/mdadm.dirs -- Michael Tokarev Sat, 20 Sep 2014 08:49:59 +0400 diff --git a/debian/mdadm.dirs b/debian/mdadm.dirs index f6c019f8..47f8376c 100644 --- a/debian/mdadm.dirs +++ b/debian/mdadm.dirs @@ -1,8 +1 @@ -sbin -etc/mdadm -usr/share/mdadm -usr/share/initramfs-tools/hooks -usr/share/initramfs-tools/scripts/local-top -usr/share/bug/mdadm -usr/share/lintian/overrides var/lib/mdadm diff --git a/debian/rules b/debian/rules index 34872083..155948aa 100755 --- a/debian/rules +++ b/debian/rules @@ -69,23 +69,23 @@ install: build $(INTERPOLATED_FILES) $(MAKE) install DESTDIR=$(DESTDIR) - install -m0755 debian/initramfs/hook \ + install -Dm0755 debian/initramfs/hook \ $(DESTDIR)/usr/share/initramfs-tools/hooks/mdadm - install -m0755 debian/initramfs/script.local-top \ + install -Dm0755 debian/initramfs/script.local-top \ $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/mdadm - install -D -m0644 debian/mdadm.modules \ + install -Dm0644 debian/mdadm.modules \ $(DESTDIR)/etc/modprobe.d/mdadm.conf - install -m0755 debian/mkconf $(DESTDIR)/usr/share/mdadm - install -m0755 debian/checkarray $(DESTDIR)/usr/share/mdadm - install -m0755 debian/bugscript $(DESTDIR)/usr/share/bug/mdadm/script - install -m0644 debian/presubj $(DESTDIR)/usr/share/bug/mdadm + install -Dm0755 debian/mkconf $(DESTDIR)/usr/share/mdadm/mkconf + install -Dm0755 debian/checkarray $(DESTDIR)/usr/share/mdadm/checkarray + install -Dm0755 debian/bugscript $(DESTDIR)/usr/share/bug/mdadm/script + install -Dm0644 debian/presubj $(DESTDIR)/usr/share/bug/mdadm/presubj - install -m0755 debian/mdadm-startall $(DESTDIR)/sbin + install -Dm0755 debian/mdadm-startall $(DESTDIR)/sbin/mdadm-startall - install -m0755 mdadm.udeb $(DESTDIR_UDEB)/sbin/mdadm - install -m0755 mdmon.udeb $(DESTDIR_UDEB)/sbin/mdmon - install -m0644 udev-md-raid-arrays.rules $(DESTDIR_UDEB)/lib/udev/rules.d/63-md-raid-arrays.rules + install -Dm0755 mdadm.udeb $(DESTDIR_UDEB)/sbin/mdadm + install -Dm0755 mdmon.udeb $(DESTDIR_UDEB)/sbin/mdmon + install -Dm0644 udev-md-raid-arrays.rules $(DESTDIR_UDEB)/lib/udev/rules.d/63-md-raid-arrays.rules binary-indep: build install -- cgit v1.2.3