* Use udeb support introduced in debhelper 4.2.0 (available in sarge)

  rather than constructing udebs by steam.
* Require debhelper 5.0.22, which generates correct shared library
  dependencies for udebs. This build-dependency can be ignored if building
  on sarge.

1 files changed, 3 insertions, 1 deletions

diff --git a/debian/control b/debian/control
index f0c53d040..73ef2afac 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openssh
 Section: net
 Priority: standard
 Maintainer: Matthew Vernon <matthew@debian.org>
-Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev (>= 0.9.8-1), libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, libedit-dev, groff, debhelper (>= 3), sharutils, libselinux1-dev [alpha amd64 arm armeb hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sparc], libkrb5-dev
+Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev (>= 0.9.8-1), libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, libedit-dev, groff, debhelper (>= 5.0.22), sharutils, libselinux1-dev [alpha amd64 arm armeb hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sparc], libkrb5-dev
 Standards-Version: 3.6.2
 Uploaders: Colin Watson <cjwatson@debian.org>
 
@@ -87,6 +87,7 @@ Description: under X, asks user for a passphrase for ssh-add
  provided to add to your choice and/or confusion.
 
 Package: openssh-client-udeb
+XC-Package-Type: udeb
 Section: debian-installer
 Priority: optional
 Architecture: any
@@ -100,6 +101,7 @@ Description: Secure shell client for the Debian installer
  This package provides the ssh client for use in debian-installer.
 
 Package: openssh-server-udeb
+XC-Package-Type: udeb
 Section: debian-installer
 Priority: optional
 Architecture: any