summaryrefslogtreecommitdiff
path: root/debian/rules
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2014-08-02 00:03:54 +0100
committerColin Watson <cjwatson@debian.org>2014-08-02 00:03:54 +0100
commit3de8d5421e039dbd0779fea82e857466596ca3e3 (patch)
tree977c6ece8f8ee2b4c9a289db07c42da0bd7ead91 /debian/rules
parent1c25e0d43e6eaa43af0b9ce319a5f5b412e7917e (diff)
Use dh-exec to simplify override_dh_install target.
Diffstat (limited to 'debian/rules')
-rwxr-xr-xdebian/rules13
1 files changed, 0 insertions, 13 deletions
diff --git a/debian/rules b/debian/rules
index 3419366c3..efd9ee74a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -168,25 +168,12 @@ override_dh_install:
168 dh_install -popenssh-client-udeb -popenssh-server-udeb \ 168 dh_install -popenssh-client-udeb -popenssh-server-udeb \
169 --sourcedir=build-udeb 169 --sourcedir=build-udeb
170 170
171 install -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/openssh/gnome-ssh-askpass
172
173 install -o root -g root debian/openssh-server.if-up debian/openssh-server/etc/network/if-up.d/openssh-server
174 install -o root -g root -m 644 debian/openssh-server.ufw.profile debian/openssh-server/etc/ufw/applications.d/openssh-server
175
176 # Remove version control tags to avoid unnecessary conffile 171 # Remove version control tags to avoid unnecessary conffile
177 # resolution steps for administrators. 172 # resolution steps for administrators.
178 sed -i '/\$$OpenBSD:/d' \ 173 sed -i '/\$$OpenBSD:/d' \
179 debian/openssh-client/etc/ssh/moduli \ 174 debian/openssh-client/etc/ssh/moduli \
180 debian/openssh-client/etc/ssh/ssh_config 175 debian/openssh-client/etc/ssh/ssh_config
181 176
182 # dh_apport would be neater, but at the time of writing it isn't in
183 # unstable yet.
184 install -p -m 644 debian/openssh-client.apport debian/openssh-client/usr/share/apport/package-hooks/openssh-client.py
185 install -p -m 644 debian/openssh-server.apport debian/openssh-server/usr/share/apport/package-hooks/openssh-server.py
186
187 # Upstart user job (only used under user sessions)
188 install -p -m 644 -D debian/ssh-agent.user-session.upstart debian/openssh-client/usr/share/upstart/sessions/ssh-agent.conf
189
190override_dh_installdocs: 177override_dh_installdocs:
191 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server -Nssh 178 dh_installdocs -Nopenssh-server -Nopenssh-sftp-server -Nssh
192 dh_installdocs -popenssh-server -popenssh-sftp-server -pssh \ 179 dh_installdocs -popenssh-server -popenssh-sftp-server -pssh \