[Pkg-bazaar-commits] ./bzr-builddeb/trunk r230: Fix the FTBFS by disabling the testsuite. Thanks Sebastian Bober.

[James Westby]

------------------------------------------------------------
revno: 230
committer: James Westby <jw+debian at jameswestby.net>
branch nick: trunk
timestamp: Thu 2008-05-15 16:21:17 +0100
message:
  Fix the FTBFS by disabling the testsuite. Thanks Sebastian Bober.
modified:
  debian/changelog
  debian/control
  debian/rules
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-15 13:04:43 +0000
+++ b/debian/changelog	2008-05-15 15:21:17 +0000
@@ -1,7 +1,16 @@
 bzr-builddeb (0.94) unstable; urgency=low
 
+  [ Jelmer Vernooij ]
   * Support building against snapshots from Subversion branches.
 
+  [ Sebastian Bober ]
+  * Disable the testsuite during build as we can't be sure that
+    /etc/apt/sources.list has a deb-src line. "check" or "test"
+    in DEB_BUILD_OPTIONS will turn it back on again. (Closes: #472543)
+  * Build-Depend and Depend on python-apt, as it is used directly
+    now.
+  * Tweaks to stamp handling in debian/rules.
+
  -- Jelmer Vernooij <jelmer at samba.org>  Thu, 15 May 2008 15:03:57 +0200
 
 bzr-builddeb (0.93) unstable; urgency=low

=== modified file 'debian/control'
--- a/debian/control	2008-03-19 20:33:17 +0000
+++ b/debian/control	2008-05-15 15:21:17 +0000
@@ -4,14 +4,14 @@
 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint at lists.alioth.debian.org>
 Uploaders: Reinhard Tartler <siretart at tauware.de>, James Westby <jw+debian at jameswestby.net>
 Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.3.5-11)
-Build-Depends-Indep: bzr (>= 1.2~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.4), bzrtools (>= 1.2~), patchutils
+Build-Depends-Indep: bzr (>= 1.2~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.4), python-apt, bzrtools (>= 1.2~), patchutils
 Vcs-Bzr: http://bazaar.launchpad.net/~james-w/bzr-builddeb/trunk
 XS-Python-Version: >= 2.4
 Standards-Version: 3.7.2
 
 Package: bzr-builddeb
 Architecture: all
-Depends: bzr (>= 1.2~), python-debian (>= 0.1.4), ${python:Depends}, dpkg-dev, fakeroot, bzrtools (>= 1.2), devscripts, patchutils
+Depends: bzr (>= 1.2~), python-debian (>= 0.1.4), python-apt, ${python:Depends}, dpkg-dev, fakeroot, bzrtools (>= 1.2), devscripts, patchutils
 Provides: bzr-buildpackage
 XB-Python-Version: ${python:Versions}
 Description: bzr plugin for Debian package management

=== modified file 'debian/rules'
--- a/debian/rules	2008-03-19 22:02:39 +0000
+++ b/debian/rules	2008-05-15 15:21:17 +0000
@@ -21,17 +21,15 @@
 
 build-python%:
 	python$* setup.py build
-ifeq (,$(findstring nocheck,$(DEBBUILDOPTS)))
-ifeq (,$(findstring notest,$(DEBBUILDOPTS)))
+ifneq (,$(filter test check,$(DEBBUILDOPTS)))
 	BZR_PLUGIN_PATH="$(CURDIR)/build/lib/bzrlib/plugins/" python$* /usr/bin/bzr test-builddeb
 endif
-endif
-	touch $@
+	touch $@-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp install-all-stamp
+	rm -f build-stamp install-all-stamp build-python*-stamp
 	rm -f $(html_docs)
 	rm -f README.html