go back to using explicit install calls in rules due to renaming required

diff --git a/debian/rules b/debian/rules
index b5b5231dc6cae04b0e0b265ff25210388182962a..826cca98ffec04da2fafb3d810793a4399e13260 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -104,6 +104,27 @@ install: build-stamp
                debian/sudo-ldap/usr/share/doc/sudo-ldap/
        rmdir   debian/sudo-ldap/usr/share/doc/sudo
 
+       # and install things we do want that make install doesn't know about
+       install -o root -g root -m 0644 debian/sudo.pam \
+               debian/sudo/etc/pam.d/sudo
+       install -o root -g root -m 0644 debian/sudo.pam \
+               debian/sudo-ldap/etc/pam.d/sudo
+
+       install -o root -g root -m 0644 debian/sudo.lintian \
+               debian/sudo/usr/share/lintian/overrides/sudo
+       install -o root -g root -m 0644 debian/sudo-ldap.lintian \
+               debian/sudo-ldap/usr/share/lintian/overrides/sudo-ldap
+
+       install -o root -g root -m 0440 debian/sudoers \
+               debian/sudo/etc/sudoers
+       install -o root -g root -m 0440 debian/sudoers \
+               debian/sudo-ldap/etc/sudoers
+
+       install -o root -g root -m 0440 debian/README \
+               debian/sudo/etc/sudoers.d/README
+       install -o root -g root -m 0440 debian/README \
+               debian/sudo-ldap/etc/sudoers.d/README
+
 binary-indep: build install
 
 binary-arch: build install
@@ -111,7 +132,6 @@ binary-arch: build install
        dh_testroot
        dh_installdocs -A
        dh_installexamples -A sample.sudoers
-       dh_install -A
        dh_installinit -psudo -psudo-ldap --name=sudo
        dh_installman -A
        dh_installinfo -A

diff --git a/debian/sudo-ldap.install b/debian/sudo-ldap.install
deleted file mode 100644 (file)
index 9b4cbc2..0000000
--- a/debian/sudo-ldap.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/sudo.pam                        etc/pam.d/sudo
-debian/sudo-ldap.lintian       usr/share/lintian/overrides/sudo-ldap
-debian/README                  etc/sudoers.d/README
-debian/sudoers                 etc/sudoers

diff --git a/debian/sudo.install b/debian/sudo.install
deleted file mode 100644 (file)
index 336f6e6..0000000
--- a/debian/sudo.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/sudo.pam                etc/pam.d/sudo
-debian/sudo.lintian    usr/share/lintian/overrides/sudo
-debian/README          etc/sudoers.d/README
-debian/sudoers         etc/sudoers