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

Bug#360068: marked as done (openssh: Set proper dependencies for udebs)

Your message dated Fri, 31 Mar 2006 01:32:05 -0800
with message-id <E1FPFzB-00035k-FF@spohr.debian.org>
and subject line Bug#360068: fixed in openssh 1:4.2p1-8
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message --- 
Package: openssh
Version: 4.2p1-7
Severity: wishlist
Tags: d-i, patch

The openssh udebs currently depend on regular packages. Recent changes in
debhelper and dpkg-dev have made it possible to automatically  generate
properly dependencies on udebs instead.

The attached patch implements this for openssh. The needed changes are:
- update dephelper dependency to 5.0.22; this also pulls in the correct
  version of dpkg-dev
- add "XC-Package-Type: udeb" lines in debian/control to make debhelper
  aware which binaries are udebs

The last change also makes a few simplifications possible in the
debian/rules file. I've included these in the patch.

The result is the following changes in dependencies for both udebs:
  Depends: libc6 (>= 2.3.5-1), [-libssl0.9.8-] {+libcrypto0.9.8-udeb+}
  (>= 0.9.8a-1), [-zlib1g-] {+zlib1g-udeb+} (>= 1:1.2.1), libnss-files-udeb

I've checked that there are no other unexpected changes using debdiff.

Cheers,
FJP


diff -u openssh-4.2p1/debian/rules openssh-4.2p1/debian/rules
--- openssh-4.2p1/debian/rules
+++ openssh-4.2p1/debian/rules
@@ -15,8 +15,6 @@
 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 @@
   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 @@
 	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 @@
 	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
 
diff -u openssh-4.2p1/debian/control openssh-4.2p1/debian/control
--- openssh-4.2p1/debian/control
+++ openssh-4.2p1/debian/control
@@ -2,7 +2,7 @@
 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 @@
  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 @@
  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

Attachment: pgp9Qiqe6tEia.pgp
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Source: openssh
Source-Version: 1:4.2p1-8

We believe that the bug you reported is fixed in the latest version of
openssh, which is due to be installed in the Debian FTP archive:

openssh-client-udeb_4.2p1-8_powerpc.udeb
  to pool/main/o/openssh/openssh-client-udeb_4.2p1-8_powerpc.udeb
openssh-client_4.2p1-8_powerpc.deb
  to pool/main/o/openssh/openssh-client_4.2p1-8_powerpc.deb
openssh-server-udeb_4.2p1-8_powerpc.udeb
  to pool/main/o/openssh/openssh-server-udeb_4.2p1-8_powerpc.udeb
openssh-server_4.2p1-8_powerpc.deb
  to pool/main/o/openssh/openssh-server_4.2p1-8_powerpc.deb
openssh_4.2p1-8.diff.gz
  to pool/main/o/openssh/openssh_4.2p1-8.diff.gz
openssh_4.2p1-8.dsc
  to pool/main/o/openssh/openssh_4.2p1-8.dsc
ssh-askpass-gnome_4.2p1-8_powerpc.deb
  to pool/main/o/openssh/ssh-askpass-gnome_4.2p1-8_powerpc.deb
ssh_4.2p1-8_all.deb
  to pool/main/o/openssh/ssh_4.2p1-8_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 360068@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Colin Watson <cjwatson@debian.org> (supplier of updated openssh package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Fri, 31 Mar 2006 09:44:55 +0100
Source: openssh
Binary: ssh-askpass-gnome openssh-client-udeb ssh openssh-server openssh-client openssh-server-udeb
Architecture: source powerpc all
Version: 1:4.2p1-8
Distribution: unstable
Urgency: low
Maintainer: Matthew Vernon <matthew@debian.org>
Changed-By: Colin Watson <cjwatson@debian.org>
Description: 
 openssh-client - Secure shell client, an rlogin/rsh/rcp replacement
 openssh-client-udeb - Secure shell client for the Debian installer (udeb)
 openssh-server - Secure shell server, an rshd replacement
 openssh-server-udeb - Secure shell server for the Debian installer (udeb)
 ssh        - Secure shell client and server (transitional package)
 ssh-askpass-gnome - under X, asks user for a passphrase for ssh-add
Closes: 360068
Changes: 
 openssh (1:4.2p1-8) unstable; 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 (closes: #360068). This build-dependency can be
     ignored if building on sarge.
 .
   [ Colin Watson ]
   * Switch to debhelper compatibility level 4, since we now require
     debhelper 4 even on sarge anyway for udeb support.
Files: 
 3637b24a66566d8c5bb4aec35dcdfd9c 992 net standard openssh_4.2p1-8.dsc
 f7a9b42627659c085d37c7f3545bd14f 165496 net standard openssh_4.2p1-8.diff.gz
 bf0c40d1952f80bd509da5132889d40c 1052 net extra ssh_4.2p1-8_all.deb
 8cbed18d0faa4940296ddc2b2edfcea1 589862 net standard openssh-client_4.2p1-8_powerpc.deb
 b8e04fd1f50db557b54a4a9552467b2e 225220 net optional openssh-server_4.2p1-8_powerpc.deb
 53061c9a9486083416ba37cda02d7669 86800 gnome optional ssh-askpass-gnome_4.2p1-8_powerpc.deb
 9b195221c3882ee887d506ba82be87b5 157512 debian-installer optional openssh-client-udeb_4.2p1-8_powerpc.udeb
 811dfbd34fd28ad030e7654f315ee8e5 165238 debian-installer optional openssh-server-udeb_4.2p1-8_powerpc.udeb
Package-Type: udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)

iD8DBQFELPN49t0zAhD6TNERAvhLAJ9ETi+JQmdZgRXlLNsMcYML3arCVQCaA42s
clz9QXStDJYxSMmSqvy9Yzw=
=sJUl
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: