summaryrefslogtreecommitdiff
path: root/debian/rules
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2013-05-21 23:41:23 +0100
committerColin Watson <cjwatson@debian.org>2013-05-21 23:41:23 +0100
commit1fa04ebf122aec5ecbbdb6c7e001665b238e4c62 (patch)
tree3d228c46959931802ddcc289bd658ccda5ab4738 /debian/rules
parentcc7c64fe532ac804ce6c65d701a32b614cc0b26a (diff)
Drop conffile handling for upgrades from pre-split ssh package; this was
originally added in 1:4.3p2-7 / 1:4.3p2-8, and contained a truly ghastly hack around a misbehaviour in sarge's dpkg. Since this is now four Debian releases ago, we can afford to drop this and simplify the packaging.
Diffstat (limited to 'debian/rules')
-rwxr-xr-xdebian/rules11
1 files changed, 0 insertions, 11 deletions
diff --git a/debian/rules b/debian/rules
index db7f81f49..c78653be0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -219,17 +219,6 @@ override_dh_shlibdeps:
219 219
220override_dh_installdeb: $(DISTRIBUTOR_REPLACE) 220override_dh_installdeb: $(DISTRIBUTOR_REPLACE)
221 dh_installdeb 221 dh_installdeb
222 perl -i debian/substitute-conffile.pl \
223 ETC_SSH_MODULI debian/openssh-client/etc/ssh/moduli \
224 ETC_SSH_SSH_CONFIG debian/openssh-client/etc/ssh/ssh_config \
225 debian/openssh-client/DEBIAN/preinst
226 # Yes, ETC_PAM_D_SSH is meant to be spelled that way, to match the
227 # old configuration file name we need to transfer.
228 perl -i debian/substitute-conffile.pl \
229 ETC_DEFAULT_SSH debian/openssh-server/etc/default/ssh \
230 ETC_INIT_D_SSH debian/openssh-server/etc/init.d/ssh \
231 ETC_PAM_D_SSH debian/openssh-server/etc/pam.d/sshd \
232 debian/openssh-server/DEBIAN/preinst
233 222
234override_dh_gencontrol: 223override_dh_gencontrol:
235 dh_gencontrol -- -V'openssh-server:Recommends=$(server_recommends)' 224 dh_gencontrol -- -V'openssh-server:Recommends=$(server_recommends)'