[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#484404: openssh: Update menu-item number for openssh-client-udeb



Package: openssh
Version: 1:4.7p1-12
Severity: wishlist
Tags: d-i patch

Since D-I's main-menu version 1.26 it will automatically not include 
components that have a menu-item of 99900 (deprecated) and 99999, which 
means that the isinstallable hack is no longer needed.

Please include the attached patch in your next upload to bring 
openssh-client-udeb in line with the new main-menu (which is now in 
testing).

TIA,
Frans Pop

diff -u openssh-4.7p1/debian/changelog openssh-4.7p1/debian/changelog
--- openssh-4.7p1/debian/changelog
+++ openssh-4.7p1/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:4.7p1-13~fjp) UNRELEASED; urgency=low
+
+  * Update menu-item number for Debian Installer and drop the isinstallable
+    file as main-menu (>= 1.26) now takes care of that.
+
+ -- Frans Pop <fjp@debian.org>  Tue, 03 Jun 2008 22:33:02 +0200
+
 openssh (1:4.7p1-12) unstable; urgency=low
 
   * Fill in CVE identifier for ssh-vulnkey bug fixed in 1:4.7p1-10.
diff -u openssh-4.7p1/debian/control openssh-4.7p1/debian/control
--- openssh-4.7p1/debian/control
+++ openssh-4.7p1/debian/control
@@ -100,7 +100,7 @@
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, libnss-files-udeb, libcrypto0.9.8-udeb (>= 0.9.8g-9)
-XB-Installer-Menu-Item: 99900
+XB-Installer-Menu-Item: 99999
 Description: secure shell client for the Debian installer
  This is the portable version of OpenSSH, a free implementation of
  the Secure Shell protocol as specified by the IETF secsh working
diff -u openssh-4.7p1/debian/rules openssh-4.7p1/debian/rules
--- openssh-4.7p1/debian/rules
+++ openssh-4.7p1/debian/rules
@@ -311,7 +311,6 @@
 	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
reverted:
--- openssh-4.7p1/debian/openssh-client-udeb.isinstallable
+++ openssh-4.7p1.orig/debian/openssh-client-udeb.isinstallable
@@ -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

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: