r50218 - in /desktop/unstable/gcr/debian: changelog control control.in rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Sep  8 11:57:49 2016
New Revision: 50218

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=50218
Log:
Add gnupg to Build-Depends, it is needed by the test-suite.
Add support for the "nocheck" build profile while at it and mark dbus and
gnupg accordingly. (Closes: #835098)

Modified:
    desktop/unstable/gcr/debian/changelog
    desktop/unstable/gcr/debian/control
    desktop/unstable/gcr/debian/control.in
    desktop/unstable/gcr/debian/rules

Modified: desktop/unstable/gcr/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/changelog?rev=50218&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gcr/debian/changelog	[utf-8] Thu Sep  8 11:57:49 2016
@@ -7,6 +7,9 @@
   [ Michael Biebl ]
   * Depend on default-dbus-session-bus | dbus-session-bus instead of dbus-x11.
     (Closes: #835881)
+  * Add gnupg to Build-Depends, it is needed by the test-suite.
+    Add support for the "nocheck" build profile while at it and mark dbus and
+    gnupg accordingly. (Closes: #835098)
 
  -- Jeremy Bicha <jbicha at linux.com>  Tue, 24 May 2016 20:58:42 -0400
 

Modified: desktop/unstable/gcr/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/control?rev=50218&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/control	[utf-8] (original)
+++ desktop/unstable/gcr/debian/control	[utf-8] Thu Sep  8 11:57:49 2016
@@ -7,11 +7,11 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20141010),
+               dpkg-dev (>= 1.17.14),
                dh-autoreconf,
                autotools-dev,
                docbook-xml,
-               dpkg-dev (>= 1.16.1~),
                gnome-pkg-tools (>= 0.10),
                gtk-doc-tools (>= 1.9),
                gobject-introspection (>= 1.34),
@@ -27,7 +27,8 @@
                libglib2.0-doc,
                valac,
                xsltproc,
-               dbus
+               dbus <!nocheck>,
+               gnupg <!nocheck>
 Standards-Version: 3.9.7
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gcr
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gcr

Modified: desktop/unstable/gcr/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/control.in?rev=50218&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gcr/debian/control.in	[utf-8] Thu Sep  8 11:57:49 2016
@@ -3,11 +3,11 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20141010),
+               dpkg-dev (>= 1.17.14),
                dh-autoreconf,
                autotools-dev,
                docbook-xml,
-               dpkg-dev (>= 1.16.1~),
                gnome-pkg-tools (>= 0.10),
                gtk-doc-tools (>= 1.9),
                gobject-introspection (>= 1.34),
@@ -23,7 +23,8 @@
                libglib2.0-doc,
                valac,
                xsltproc,
-               dbus
+               dbus <!nocheck>,
+               gnupg <!nocheck>
 Standards-Version: 3.9.7
 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gcr
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gcr

Modified: desktop/unstable/gcr/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcr/debian/rules?rev=50218&op=diff
==============================================================================
--- desktop/unstable/gcr/debian/rules	[utf-8] (original)
+++ desktop/unstable/gcr/debian/rules	[utf-8] Thu Sep  8 11:57:49 2016
@@ -20,8 +20,10 @@
 		--disable-valgrind
 
 override_dh_auto_test:
+ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
 	# Disable fakeroot as this confuses some of the tests
 	env -u LD_PRELOAD dbus-run-session -- make check || ( cat test-suite.log ; exit 1 )
+endif
 
 override_dh_install:
 	dh_install --list-missing