From 33e4d1c2c2833ece5bd22fc2ca982a9b7f8ad97f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 27 Aug 2017 23:37:38 +0100 Subject: Drop openssh-client-ssh1, now built by a separate source package. --- debian/rules | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index c1aa9785c..9201dbd5a 100755 --- a/debian/rules +++ b/debian/rules @@ -132,7 +132,6 @@ override_dh_autoreconf-indep: override_dh_auto_configure-arch: dh_auto_configure -Bdebian/build-deb -- $(confflags) - dh_auto_configure -Bdebian/build-deb-ssh1 -- $(confflags) --with-ssh1 dh_auto_configure -Bdebian/build-udeb -- $(confflags_udeb) override_dh_auto_configure-indep: @@ -143,7 +142,6 @@ override_dh_auto_build-arch: cd debian/build-udeb && ./config.status $(MAKE) -C debian/build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' - $(MAKE) -C debian/build-deb-ssh1 $(PARALLEL) SSH_PROGRAM='/usr/bin/ssh1' ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp ssh-keygen $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen $(MAKE) -C contrib gnome-ssh-askpass3 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG) @@ -165,7 +163,7 @@ endif override_dh_auto_test-indep: override_dh_auto_clean: - rm -rf debian/build-deb debian/build-deb-ssh1 debian/build-udeb + rm -rf debian/build-deb debian/build-udeb ifeq ($(RUN_TESTS),yes) $(MAKE) -C debian/keygen-test clean endif @@ -197,10 +195,8 @@ override_dh_install-indep: dh_install override_dh_installdocs: - dh_installdocs \ - -Nopenssh-client-ssh1 -Nopenssh-server -Nopenssh-sftp-server - dh_installdocs \ - -popenssh-client-ssh1 -popenssh-server -popenssh-sftp-server \ + dh_installdocs -Nopenssh-server -Nopenssh-sftp-server + dh_installdocs -popenssh-server -popenssh-sftp-server \ --link-doc=openssh-client # Avoid breaking dh_installexamples later. mkdir -p debian/openssh-server/usr/share/doc/openssh-client -- cgit v1.2.3