summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/openssh-client-udeb.isinstallable10
-rwxr-xr-xdebian/rules1
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
10 ssh-keygen(1), and sshd(8) (closes: #484451). 10 ssh-keygen(1), and sshd(8) (closes: #484451).
11 * Change openssh-client-udeb's Installer-Menu-Item from 99900 to 99999 11 * Change openssh-client-udeb's Installer-Menu-Item from 99900 to 99999
12 (thanks, Frans Pop). 12 (thanks, Frans Pop).
13 * Drop openssh-client-udeb isinstallable hack, as main-menu (>= 1.26) now
14 takes care of that (thanks, Frans Pop; closes: #484404).
13 15
14 -- Colin Watson <cjwatson@debian.org> Fri, 30 May 2008 23:26:25 +0100 16 -- Colin Watson <cjwatson@debian.org> Fri, 30 May 2008 23:26:25 +0100
15 17
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 @@
1#! /bin/sh
2
3# This is a hack to arrange for openssh-client-udeb to show up as a
4# retrievable debian-installer component in expert mode (due to the
5# Installer-Menu-Item: control field) while not actually appearing on the
6# d-i main menu. See:
7#
8# http://lists.debian.org/debian-boot/2004/07/msg01207.html
9
10exit 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
311 dh_compress 311 dh_compress
312 dh_fixperms 312 dh_fixperms
313 dh_installdeb 313 dh_installdeb
314 install -p -o root -g root -m 755 debian/openssh-client-udeb.isinstallable debian/openssh-client-udeb/DEBIAN/isinstallable
315 dh_shlibdeps 314 dh_shlibdeps
316 dh_gencontrol 315 dh_gencontrol
317 dh_md5sums 316 dh_md5sums