From f593d4c0c4cd3e79f009f6b428d50698f4e7619b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 25 May 2005 14:42:37 +0000 Subject: Don't build ssh-askpass-gnome on the Hurd, until GNOME is available to satisfy build-dependencies. --- debian/changelog | 2 ++ debian/control | 4 ++-- debian/rules | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1e1ace6e5..0423c8e53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ openssh (1:4.0p1-1) UNRELEASED; urgency=low - Restore X forwarding fix from #102991, lost somewhere along the way. - Link with -lcrypt. - Link with -lpthread rather than -pthread. + - Don't build ssh-askpass-gnome on the Hurd, until GNOME is available to + satisfy build-dependencies. * Drop workaround for #242462 on amd64; it's been fixed properly upstream. * debconf template translations: - Update Czech (thanks, Miroslav Kure; closes: #298744). diff --git a/debian/control b/debian/control index 96a98440f..78459c315 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: openssh Section: net Priority: standard Maintainer: Matthew Vernon -Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, libedit-dev, groff, debhelper (>= 2), sharutils +Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) [!hurd-i386] | libgnome-dev [!hurd-i386], libedit-dev, groff, debhelper (>= 2), sharutils [!hurd-i386] Standards-Version: 3.6.1 Uploaders: Colin Watson @@ -75,7 +75,7 @@ Description: Secure shell client and server (transitional package) Package: ssh-askpass-gnome Section: gnome Priority: optional -Architecture: any +Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc Depends: ${shlibs:Depends}, openssh-client | ssh (>= 1:1.2pre7-4) | ssh-krb5 Replaces: ssh (<< 1:3.5p1-3) Provides: ssh-askpass diff --git a/debian/rules b/debian/rules index 4e8117877..b5014be02 100755 --- a/debian/rules +++ b/debian/rules @@ -143,6 +143,7 @@ install: build install -m 644 -c contrib/ssh-copy-id.1 debian/openssh-client/usr/share/man/man1/ssh-copy-id.1 install -m 644 debian/moduli.5 debian/openssh-client/usr/share/man/man5/moduli.5 +ifneq ($(DEB_HOST_ARCH_OS),gnu) if [ -f contrib/gnome-ssh-askpass2 ]; then \ install -s -o root -g root -m 755 contrib/gnome-ssh-askpass2 debian/ssh-askpass-gnome/usr/lib/ssh/gnome-ssh-askpass; \ elif [ -f contrib/gnome-ssh-askpass1 ]; then \ @@ -150,6 +151,7 @@ install: build fi install -m 644 debian/gnome-ssh-askpass.1 debian/ssh-askpass-gnome/usr/share/man/man1/gnome-ssh-askpass.1 uudecode -o debian/ssh-askpass-gnome/usr/share/pixmaps/ssh-askpass-gnome.png debian/ssh-askpass-gnome.png.uue +endif install -m 755 debian/ssh-argv0 debian/openssh-client/usr/bin/ssh-argv0 install -m 644 debian/ssh-argv0.1 debian/openssh-client/usr/share/man/man1/ssh-argv0.1 @@ -168,7 +170,9 @@ binary-indep: binary-ssh # Build architecture-dependent files here. binary-arch: binary-openssh-client binary-openssh-server +ifneq ($(DEB_HOST_ARCH_OS),gnu) binary-arch: binary-ssh-askpass-gnome +endif binary-arch: binary-openssh-client-udeb binary-openssh-server-udeb binary-openssh-client: DH_OPTIONS=-popenssh-client -- cgit v1.2.3