3 files changed, 20 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 43ec2115c..450a0a3ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+openssh (1:4.2p1-8) UNRELEASED; urgency=low
+
+  [ Frans Pop ]
+  * 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.
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 31 Mar 2006 09:14:29 +0100
+
 openssh (1:4.2p1-7) unstable; urgency=low
 
   * I accidentally applied the default $PATH change in 1:4.2p1-6 to the udeb
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
diff --git a/debian/rules b/debian/rules
index 4707023bf..55de7927b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,6 @@ else
 OPTFLAGS := -O0
 endif
 
-VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 | sed 's/.*://')
-DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
 
 # Take account of old dpkg-architecture output.
@@ -27,9 +25,6 @@ ifeq ($(DEB_HOST_ARCH_OS),)
   endif
 endif
 
-CLIENT_UDEB := openssh-client-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb
-SERVER_UDEB := openssh-server-udeb_$(VERSION)_$(DEB_HOST_ARCH).udeb
-
 ifeq (,$(wildcard /usr/bin/po2debconf))
 PO2DEBCONF := no
 MINDEBCONFVER := 0.5
@@ -278,9 +273,9 @@ binary-openssh-client-udeb: build install
         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 -- -fdebian/files~
-        dpkg-distaddfile $(CLIENT_UDEB) debian-installer optional
-        dh_builddeb --filename=$(CLIENT_UDEB)
+        dh_gencontrol
+        dh_md5sums
+        dh_builddeb
 
 binary-openssh-server-udeb: DH_OPTIONS=-popenssh-server-udeb
 binary-openssh-server-udeb: build install
@@ -291,9 +286,9 @@ binary-openssh-server-udeb: build install
         dh_fixperms
         dh_installdeb
         dh_shlibdeps
-        dh_gencontrol -- -fdebian/files~
-        dpkg-distaddfile $(SERVER_UDEB) debian-installer optional
-        dh_builddeb --filename=$(SERVER_UDEB)
+        dh_gencontrol
+        dh_md5sums
+        dh_builddeb
 
 binary: binary-indep binary-arch