Add a "pkg.openssh.nognome" build profile

This disables building the ssh-askpass-gnome binary package and avoids
the build-dependency on libgtk-3-dev (closes: #883819).

3 files changed, 9 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 48d9df642..0ac214383 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ openssh (1:7.6p1-3) UNRELEASED; urgency=medium
   [ Anders Kaseorg ]
   * debian/systemd/ssh-agent.service: Add missing dbus dependency.
 
+  [ Jason Duerstock ]
+  * Add a "pkg.openssh.nognome" build profile, which disables building the
+    ssh-askpass-gnome binary package and avoids the build-dependency on
+    libgtk-3-dev (closes: #883819).
+
  -- Colin Watson <cjwatson@debian.org>  Mon, 16 Oct 2017 10:30:50 +0100
 
 openssh (1:7.6p1-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 568080c74..19023eae3 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: autotools-dev,
                dpkg-dev (>= 1.16.1~),
                libaudit-dev [linux-any],
                libedit-dev,
-               libgtk-3-dev,
+               libgtk-3-dev <!pkg.openssh.nognome>,
                libkrb5-dev | heimdal-dev,
                libpam0g-dev | libpam-dev,
                libselinux1-dev [linux-any],
@@ -165,6 +165,7 @@ Description: secure shell client and server (metapackage)
  may remove it if nothing depends on it.
 
 Package: ssh-askpass-gnome
+Build-Profiles: <!pkg.openssh.nognome>
 Section: gnome
 Priority: optional
 Architecture: any
diff --git a/debian/rules b/debian/rules
index 9201dbd5a..734ab9c5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -144,7 +144,9 @@ override_dh_auto_build-arch:
         $(MAKE) -C debian/build-deb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass'
         $(MAKE) -C debian/build-udeb $(PARALLEL) ASKPASS_PROGRAM='/usr/bin/ssh-askpass' ssh scp sftp sshd ssh-keygen
 
+ifeq ($(filter pkg.openssh.nognome,$(DEB_BUILD_PROFILES)),)
         $(MAKE) -C contrib gnome-ssh-askpass3 CC='$(CC) $(CPPFLAGS) $(CFLAGS) -Wall -Wl,--as-needed $(LDFLAGS)' PKG_CONFIG=$(PKG_CONFIG)
+endif
 
 override_dh_auto_build-indep: