Merge lp:~jelmer/bzr-builddeb/3.0-native into lp:bzr-builddeb

[Jelmer Vernooij]

Switch to 3.0 native and fix some lintian warnings.

[James Westby (james-w)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-05 16:16:56 +0000
+++ debian/changelog	2012-01-16 00:30:29 +0000
@@ -15,8 +15,9 @@
     patch by Gediminas Paulauskas. LP: #911262
   * Automatically apply patches for 3.0 (quilt) packages in 'bzr bd-do'
     and 'bzr bd'. LP: #616791
+  * Switch to source format '3.0 (native)'.
 
- -- Jelmer Vernooij <[e-mail]>  Wed, 04 Jan 2012 22:14:07 +0100
+ -- Jelmer Vernooij <[e-mail]>  Mon, 16 Jan 2012 01:01:01 +0100
 
 bzr-builddeb (2.8.0) unstable; urgency=low
 
 
=== modified file 'debian/rules'
--- debian/rules	2011-03-07 11:36:07 +0000
+++ debian/rules	2012-01-16 00:30:29 +0000
@@ -15,10 +15,14 @@
 
 docs: $(html_docs)
 
-build: $(PYVERS:%=build-python%) docs
+build-indep: $(PYVERS:%=build-python%) docs
 	rst2html README > README.html
 	touch $@
 
+build-arch:
+
+build: build-indep
+
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 SELFTEST_CONCURRENCY = BZR_CONCURRENCY=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 SELFTEST_PARALLEL = --parallel=fork
@@ -45,7 +49,7 @@
 	python setup.py clean --all
 	dh_clean
 
-install: build $(PYVERS:%=install-python%)
+install: build-indep $(PYVERS:%=install-python%)
 
 install-all-stamp:
 	dh_testdir
@@ -57,7 +61,7 @@
 install-python%: install-all-stamp
 	python$* setup.py install --root=$(CURDIR)/debian/bzr-builddeb --no-compile --install-layout=deb
 
-binary-indep: build install
+binary-indep: build-indep install
 	dh_testdir
 	dh_testroot
 	dh_install
@@ -73,7 +77,7 @@
 	dh_md5sums
 	dh_builddeb
 
-binary-arch: build install
+binary-arch: build-arch install
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install build-arch build-indep
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2012-01-16 00:30:29 +0000
@@ -0,0 +1,1 @@
+3.0 (native)
 
=== added file 'debian/source/lintian-overrides'
--- debian/source/lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/source/lintian-overrides	2012-01-16 00:30:29 +0000
@@ -0,0 +1,2 @@
+bzr-builddeb source: quilt-build-dep-but-no-series-file
+bzr-builddeb source: patch-system-but-no-source-readme