3 files changed, 2 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 50ad6d595..c5206ead6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ openssh (1:4.7p1-13) UNRELEASED; urgency=low
     ssh-keygen(1), and sshd(8) (closes: #484451).
   * Change openssh-client-udeb's Installer-Menu-Item from 99900 to 99999
     (thanks, Frans Pop).
+  * Drop openssh-client-udeb isinstallable hack, as main-menu (>= 1.26) now
+    takes care of that (thanks, Frans Pop; closes: #484404).
 
  -- Colin Watson <cjwatson@debian.org>  Fri, 30 May 2008 23:26:25 +0100
 
diff --git a/debian/openssh-client-udeb.isinstallable b/debian/openssh-client-udeb.isinstallable
deleted file mode 100644
index 7591b6245..000000000
--- a/debian/openssh-client-udeb.isinstallable
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-# This is a hack to arrange for openssh-client-udeb to show up as a
-# retrievable debian-installer component in expert mode (due to the
-# Installer-Menu-Item: control field) while not actually appearing on the
-# d-i main menu. See:
-#
-#   http://lists.debian.org/debian-boot/2004/07/msg01207.html
-
-exit 1
diff --git a/debian/rules b/debian/rules
index 58eb3a41f..b5272c4b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -311,7 +311,6 @@ binary-openssh-client-udeb: build install
         dh_compress
         dh_fixperms
         dh_installdeb
-        install -p -o root -g root -m 755 debian/openssh-client-udeb.isinstallable debian/openssh-client-udeb/DEBIAN/isinstallable
         dh_shlibdeps
         dh_gencontrol
         dh_md5sums