[Pkg-telepathy-commits] [SCM] telepathy-qt4 packaging branch, debian, updated. debian/0.2.0-1-2-g4f44f3a

[Simon McVittie]

The following commit has been merged in the debian branch:
commit c43c05749f99a8ddf315ce5909e071f8a49e2a53
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Nov 19 12:22:31 2009 +0000

    Move Build-Depends-Indep to Build-Depends, working around #478524 in sbuild (Closes: #557032)
    
    * Move Build-Depends-Indep to Build-Depends, working around #478524 in
      sbuild (Closes: #557032)
    * Disable tests for now, due to race conditions in the test code that can't
      usefully be debugged on a buildd

diff --git a/debian/changelog b/debian/changelog
index b4ef3a6..ada439a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+telepathy-qt4 (0.2.0-2) UNRELEASED; urgency=low
+
+  * Move Build-Depends-Indep to Build-Depends, working around #478524 in
+    sbuild (Closes: #557032)
+  * Disable tests for now, due to race conditions in the test code that can't
+    usefully be debugged on a buildd
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 19 Nov 2009 12:12:37 +0000
+
 telepathy-qt4 (0.2.0-1) unstable; urgency=low
 
   * Initial Debian packaging (Closes: #539008)
diff --git a/debian/control b/debian/control
index 7a3c322..8b5af1b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,8 @@ Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth
 Uploaders: Simon McVittie <smcv at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5),
+               doxygen,
+               graphviz,
                libgstreamer0.10-dev,
                libgstreamer-plugins-base0.10-dev,
                libqt4-dev (>= 4.5.0),
@@ -14,10 +16,9 @@ Build-Depends: cdbs,
                python (>= 2.5),
                python-dbus,
                python-gobject
-# Of the above, python-dbus and python-gobject can safely be removed if you
-# don't care about running the regression tests
-Build-Depends-Indep: doxygen,
-                     graphviz
+# * python-dbus and python-gobject can safely be removed if you don't care
+#   about running the regression tests
+# * doxygen and graphviz should be Build-Depends-Indep if #478524 is fixed
 Standards-Version: 3.8.3
 Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-qt4.git
 Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/telepathy-qt4.git
diff --git a/debian/rules b/debian/rules
index d7451e2..de0e5fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ DEB_DH_STRIP_ARGS := --dbg-package=libtelepathy-qt4-dbg
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--disable-Werror \
 	--docdir=/usr/share/doc/libtelepathy-qt4-doc
-DEB_MAKE_CHECK_TARGET = check
+#DEB_MAKE_CHECK_TARGET = check
 
 common-build-indep::
 	$(DEB_MAKE_INVOKE) doxygen-doc

-- 
telepathy-qt4 packaging