[Pkg-utopia-maintainers] Bug#560834: fix dbus to cross-build

[Matthias Klose]

tags 560834 + patch
thanks

there are almost no changes needed to cross build dbus. The thing that prevents
cross-building are the b-d's needed for the test. however these tests are
disabled for the native build as well, so just un-commenting these lets the
package cross build.

-------------- next part --------------
diff -Nru dbus-1.6.8/debian/changelog dbus-1.6.8/debian/changelog
--- dbus-1.6.8/debian/changelog	2012-11-07 15:35:10.000000000 +0100
+++ dbus-1.6.8/debian/changelog	2013-01-07 17:32:07.000000000 +0100
@@ -1,3 +1,10 @@
+dbus (1.6.8-1ubuntu2) raring; urgency=low
+
+  * The tests are not run diring the build. Configure with --disable-tests,
+    drop the build dependencies needed for the tests.
+
+ -- Matthias Klose <doko at ubuntu.com>  Mon, 07 Jan 2013 17:03:23 +0100
+
 dbus (1.6.8-1ubuntu1) raring; urgency=low
 
   * Resynchronize on Debian, see 1.6.4-1ubuntu1 and 1.6.4-1ubuntu3 for a 
diff -Nru dbus-1.6.8/debian/control dbus-1.6.8/debian/control
--- dbus-1.6.8/debian/control	2012-11-07 15:25:28.000000000 +0100
+++ dbus-1.6.8/debian/control	2013-01-07 17:29:12.000000000 +0100
@@ -32,9 +32,9 @@
 #              libsystemd-daemon-dev (>= 32) [linux-any],
 #              libsystemd-login-dev (>= 32) [linux-any],
                libx11-dev,
-               python (>= 2.6),
-               python-dbus,
-               python-gobject,
+#              python (>= 2.6),
+#              python-dbus,
+#              python-gobject,
                xmlto,
                xsltproc
 Standards-Version: 3.9.3
diff -Nru dbus-1.6.8/debian/rules dbus-1.6.8/debian/rules
--- dbus-1.6.8/debian/rules	2012-11-07 15:25:28.000000000 +0100
+++ dbus-1.6.8/debian/rules	2013-01-07 17:37:04.000000000 +0100
@@ -14,6 +14,7 @@
 
 LDFLAGS += -Wl,--as-needed
 
+
 common_configure_flags := \
 		--disable-silent-rules \
 		--disable-libaudit \
@@ -22,6 +23,15 @@
 		--with-systemdsystemunitdir=/lib/systemd/system \
 		$(NULL)
 
+# the stage stuff isn't needed yet, because the testsuite isn't run by default
+#ifeq ($(DEB_STAGE),stage1)
+#  common_configure_flags += --disable-tests
+#else
+#  debug_configure_flags = --enable-tests
+#endif
+common_configure_flags += --disable-tests
+#debug_configure_flags = --enable-tests
+
 override_dh_auto_configure:
 	dh_auto_configure \
 		-- \
@@ -35,11 +45,11 @@
 		--builddirectory=build-debug \
 		-- \
 		$(common_configure_flags) \
+		$(debug_configure_flags) \
 		--disable-xml-docs \
 		--disable-doxygen-docs \
 		--enable-asserts \
 		--enable-checks \
-		--enable-tests \
 		--enable-verbose-mode \
 		--prefix=/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-1.0/debug-build \
 		--libdir='$${prefix}/lib' \