r10069 - in /desktop/unstable/libbonoboui/debian: changelog control control.in rules

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Apr 16 19:16:57 2007
New Revision: 10069

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10069
Log:
* Build-dep on xbase-clients for xvfb-run; closes: #419585.
* Use a custom check implementation.

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

Modified: desktop/unstable/libbonoboui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonoboui/debian/changelog?rev=10069&op=diff
==============================================================================
--- desktop/unstable/libbonoboui/debian/changelog (original)
+++ desktop/unstable/libbonoboui/debian/changelog Mon Apr 16 19:16:57 2007
@@ -1,3 +1,10 @@
+libbonoboui (2.18.0-5) unstable; urgency=low
+
+  * Build-dep on xbase-clients for xvfb-run; closes: #419585.
+  * Use a custom check implementation.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 16 Apr 2007 21:13:26 +0200
+
 libbonoboui (2.18.0-4) unstable; urgency=low
 
   * Run make in Xvfb for the test suite; build-dep on xvfb and xfonts-base.

Modified: desktop/unstable/libbonoboui/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonoboui/debian/control?rev=10069&op=diff
==============================================================================
--- desktop/unstable/libbonoboui/debian/control (original)
+++ desktop/unstable/libbonoboui/debian/control Mon Apr 16 19:16:57 2007
@@ -20,7 +20,8 @@
                dpkg-dev (>= 1.13.19),
                libgnomevfs2-dev (>= 2.8.0),
                xvfb,
-               xfonts-base
+               xfonts-base,
+               xbase-clients
 Standards-Version: 3.7.2
 
 Package: libbonoboui2-common

Modified: desktop/unstable/libbonoboui/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonoboui/debian/control.in?rev=10069&op=diff
==============================================================================
--- desktop/unstable/libbonoboui/debian/control.in (original)
+++ desktop/unstable/libbonoboui/debian/control.in Mon Apr 16 19:16:57 2007
@@ -20,7 +20,8 @@
                dpkg-dev (>= 1.13.19),
                libgnomevfs2-dev (>= 2.8.0),
                xvfb,
-               xfonts-base
+               xfonts-base,
+               xbase-clients
 Standards-Version: 3.7.2
 
 Package: libbonoboui2-common

Modified: desktop/unstable/libbonoboui/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libbonoboui/debian/rules?rev=10069&op=diff
==============================================================================
--- desktop/unstable/libbonoboui/debian/rules (original)
+++ desktop/unstable/libbonoboui/debian/rules Mon Apr 16 19:16:57 2007
@@ -9,8 +9,13 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-# run all make invocations in a Xvfb; not very nice, could benefit from CDBS
-# support: see #417398
-MAKE := xvfb-run $(MAKE)
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+common-build-arch common-build-indep:: debian/stamp-check
+	# ignore failure of testsuite
+	-xvfb-run $(MAKE) check
+	touch $@
 
-DEB_MAKE_CHECK_TARGET = check || true
+clean::
+	rm -f debian/stamp-check
+endif
+