bzr-builddeb

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

  1. 3.0-native
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: James Westby
Approved revision: 699
Merged at revision: 700
Proposed branch: lp:~jelmer/bzr-builddeb/3.0-native
Merge into: lp:bzr-builddeb
Diff against target: 76 lines (+14/-6)
4 files modified
debian/changelog (+2/-1)
debian/rules (+9/-5)
debian/source/format (+1/-0)
debian/source/lintian-overrides (+2/-0)
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/3.0-native
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+88627@code.launchpad.net

Description of the change

Switch to 3.0 native and fix some lintian warnings.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-01-05 16:16:56 +0000
3+++ debian/changelog 2012-01-16 00:30:29 +0000
4@@ -15,8 +15,9 @@
5 patch by Gediminas Paulauskas. LP: #911262
6 * Automatically apply patches for 3.0 (quilt) packages in 'bzr bd-do'
7 and 'bzr bd'. LP: #616791
8+ * Switch to source format '3.0 (native)'.
9
10- -- Jelmer Vernooij <jelmer@debian.org> Wed, 04 Jan 2012 22:14:07 +0100
11+ -- Jelmer Vernooij <jelmer@debian.org> Mon, 16 Jan 2012 01:01:01 +0100
12
13 bzr-builddeb (2.8.0) unstable; urgency=low
14
15
16=== modified file 'debian/rules'
17--- debian/rules 2011-03-07 11:36:07 +0000
18+++ debian/rules 2012-01-16 00:30:29 +0000
19@@ -15,10 +15,14 @@
20
21 docs: $(html_docs)
22
23-build: $(PYVERS:%=build-python%) docs
24+build-indep: $(PYVERS:%=build-python%) docs
25 rst2html README > README.html
26 touch $@
27
28+build-arch:
29+
30+build: build-indep
31+
32 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
33 SELFTEST_CONCURRENCY = BZR_CONCURRENCY=$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
34 SELFTEST_PARALLEL = --parallel=fork
35@@ -45,7 +49,7 @@
36 python setup.py clean --all
37 dh_clean
38
39-install: build $(PYVERS:%=install-python%)
40+install: build-indep $(PYVERS:%=install-python%)
41
42 install-all-stamp:
43 dh_testdir
44@@ -57,7 +61,7 @@
45 install-python%: install-all-stamp
46 python$* setup.py install --root=$(CURDIR)/debian/bzr-builddeb --no-compile --install-layout=deb
47
48-binary-indep: build install
49+binary-indep: build-indep install
50 dh_testdir
51 dh_testroot
52 dh_install
53@@ -73,7 +77,7 @@
54 dh_md5sums
55 dh_builddeb
56
57-binary-arch: build install
58+binary-arch: build-arch install
59
60 binary: binary-indep binary-arch
61-.PHONY: build clean binary-indep binary-arch binary install
62+.PHONY: build clean binary-indep binary-arch binary install build-arch build-indep
63
64=== added directory 'debian/source'
65=== added file 'debian/source/format'
66--- debian/source/format 1970-01-01 00:00:00 +0000
67+++ debian/source/format 2012-01-16 00:30:29 +0000
68@@ -0,0 +1,1 @@
69+3.0 (native)
70
71=== added file 'debian/source/lintian-overrides'
72--- debian/source/lintian-overrides 1970-01-01 00:00:00 +0000
73+++ debian/source/lintian-overrides 2012-01-16 00:30:29 +0000
74@@ -0,0 +1,2 @@
75+bzr-builddeb source: quilt-build-dep-but-no-series-file
76+bzr-builddeb source: patch-system-but-no-source-readme

Subscribers

People subscribed via source and target branches