Ubuntu
attr package

Merge lp:~peter-pearse/ubuntu/natty/attr/prop001 into lp:ubuntu/natty/attr

Proposed by Peter Pearse on 2011-02-22

Status:	Merged
Merged at revision:	8
Proposed branch:	lp:~peter-pearse/ubuntu/natty/attr/prop001
Merge into:	lp:ubuntu/natty/attr
Diff against target:	39 lines (+13/-1) 2 files modified debian/changelog (+6/-0) debian/rules (+7/-1)
To merge this branch:	bzr merge lp:~peter-pearse/ubuntu/natty/attr/prop001
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Steve Langasek		2011-02-22	Pending
Review via email: mp+50770@code.launchpad.net

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'debian/changelog'
2	--- debian/changelog 2010-06-08 13:58:30 +0000
3	+++ debian/changelog 2011-02-22 15:48:22 +0000
4	@@ -1,3 +1,9 @@
5	+attr (1:2.4.44-2ubuntu1) natty; urgency=low
6	+
7	+ * For cross builds configure with --host, --build
8	+
9	+ -- Peter Pearse <peter.pearse@linaro.org> Tue, 22 Feb 2011 15:41:01 +0000
10	+
11	attr (1:2.4.44-2) unstable; urgency=low
12
13	* Source format is 3.0 (quilt)
14
15	=== modified file 'debian/rules'
16	--- debian/rules 2009-08-25 11:23:53 +0000
17	+++ debian/rules 2011-02-22 15:48:22 +0000
18	@@ -18,6 +18,12 @@
19	INSTALL_USER=root INSTALL_GROUP=root ;
20	checkdir = test -f debian/rules
21
22	+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
23	+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
24	+ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
25	+ LOCAL_CONFIGURE_OPTIONS += --host $(DEB_HOST_GNU_TYPE) --build $(DEB_BUILD_GNU_TYPE)
26	+endif
27	+
28	build: built
29	built: config
30	@echo "== dpkg-buildpackage: build" 1>&2
31	@@ -30,7 +36,7 @@
32	.census:
33	@echo "== dpkg-buildpackage: configure" 1>&2
34	$(checkdir)
35	- $(options) $(MAKE) configure
36	+ $(options) $(MAKE) configure LOCAL_CONFIGURE_OPTIONS="$(LOCAL_CONFIGURE_OPTIONS)"
37	touch .census
38
39	clean: