Re-enable ssh-askpass-gnome on the Hurd, now that its build-dependencies

are available.

3 files changed, 4 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 676046319..235b1462a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ openssh (1:4.1p1-4) UNRELEASED; urgency=low
       security context for the generated public key files.
     - Added a comment to /etc/pam.d/ssh to indicate that an SELinux system
       may want to also include pam_selinux.so.
+  * Re-enable ssh-askpass-gnome on the Hurd, now that its build-dependencies
+    are available.
   * debconf template translations:
     - Update German (thanks, Jens Seidel; closes: #313949).
 
diff --git a/debian/control b/debian/control
index de945cf9c..bd12f1d6e 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, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) [!hurd-i386] | libgnome-dev [!hurd-i386], libedit-dev, groff, debhelper (>= 2), sharutils [!hurd-i386], libselinux1-dev [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc]
+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, libselinux1-dev [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc]
 Standards-Version: 3.6.1
 Uploaders: Colin Watson <cjwatson@debian.org>
 
@@ -75,7 +75,7 @@ Description: Secure shell client and server (transitional package)
 Package: ssh-askpass-gnome
 Section: gnome
 Priority: optional
-Architecture: alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+Architecture: any
 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 772d08f84..d72dc2d68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -149,7 +149,6 @@ 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),hurd)
         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/openssh/gnome-ssh-askpass; \
         elif [ -f contrib/gnome-ssh-askpass1 ]; then \
@@ -157,7 +156,6 @@ ifneq ($(DEB_HOST_ARCH_OS),hurd)
         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
@@ -176,9 +174,7 @@ binary-indep: binary-ssh
 
 # Build architecture-dependent files here.
 binary-arch: binary-openssh-client binary-openssh-server
-ifneq ($(DEB_HOST_ARCH_OS),hurd)
 binary-arch: binary-ssh-askpass-gnome
-endif
 binary-arch: binary-openssh-client-udeb binary-openssh-server-udeb
 
 binary-openssh-client: DH_OPTIONS=-popenssh-client