6 files changed, 9 insertions, 46 deletions

diff --git a/debian/.gitignore b/debian/.gitignore
index 3c767d5e5..988323b00 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,7 +1,6 @@
 /*.debhelper*
 /*substvars
 /build-deb
-/build-deb-ssh1
 /build-udeb
 /files
 /keygen-test/key1
diff --git a/debian/adjust-openssl-dependencies b/debian/adjust-openssl-dependencies
index b9799c410..5113ac164 100755
--- a/debian/adjust-openssl-dependencies
+++ b/debian/adjust-openssl-dependencies
@@ -3,7 +3,6 @@
 # Must be run after dpkg-shlibdeps.
 
 client=debian/openssh-client.substvars
-client_ssh1=debian/openssh-client-ssh1.substvars
 server=debian/openssh-server.substvars
 
 libssl_version="$(dpkg-query -W libssl1.0-dev 2>/dev/null | cut -f2)"
@@ -20,7 +19,6 @@ libssl_package="$(sed -n 's/.*[= ]\(libssl[0-9][a-z0-9+.-]*\).*/\1/p' "$client")
 if [ "$libssl_package" ]; then
         new_dep="$libssl_package (>= $libssl_version)"
         sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client"
-        sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$client_ssh1"
         sed -i "/^shlibs:Depends=/s/\$/, $new_dep/" "$server"
 fi
 
diff --git a/debian/changelog b/debian/changelog
index 447d5fc58..8d01ac39d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:7.5p1-8) UNRELEASED; urgency=medium
+
+  * Drop openssh-client-ssh1, now built by a separate source package.
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 27 Aug 2017 23:24:58 +0100
+
 openssh (1:7.5p1-7) unstable; urgency=medium
 
   * Fix spelling of RuntimeDirectoryMode (closes: #872976).
diff --git a/debian/control b/debian/control
index 411731a4a..838ec154f 100644
--- a/debian/control
+++ b/debian/control
@@ -66,37 +66,6 @@ Description: secure shell (SSH) client, for secure access to remote machines
  ssh replaces the insecure rsh, rcp and rlogin programs, which are
  obsolete for most purposes.
 
-Package: openssh-client-ssh1
-Priority: extra
-Architecture: any
-Depends: openssh-client (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Multi-Arch: foreign
-Description: secure shell (SSH) client for legacy SSH1 protocol
- This is the portable version of OpenSSH, a free implementation of
- the Secure Shell protocol as specified by the IETF secsh working
- group.
- .
- Ssh (Secure Shell) is a program for logging into a remote machine
- and for executing commands on a remote machine.
- It provides secure encrypted communications between two untrusted
- hosts over an insecure network. X11 connections and arbitrary TCP/IP
- ports can also be forwarded over the secure channel.
- It can be used to provide applications with a secure communication
- channel.
- .
- This package provides the ssh1 and scp1 clients and the ssh-keygen1
- utility, all built with support for the legacy SSH1 protocol. This
- protocol is obsolete and should not normally be used, but in some cases
- there may be no alternative way to connect to outdated servers.
- .
- In some countries it may be illegal to use any encryption at all
- without a special permit.
- .
- ssh replaces the insecure rsh, rcp and rlogin programs, which are
- obsolete for most purposes.
-
 Package: openssh-server
 Priority: optional
 Architecture: any
diff --git a/debian/openssh-client-ssh1.install b/debian/openssh-client-ssh1.install
deleted file mode 100755
index 60a8bc58a..000000000
--- a/debian/openssh-client-ssh1.install
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /usr/bin/dh-exec
-
-debian/build-deb-ssh1/scp => usr/bin/scp1
-debian/build-deb-ssh1/ssh => usr/bin/ssh1
-debian/build-deb-ssh1/ssh-keygen => usr/bin/ssh-keygen1
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