Merge lp:~obounaim/ubuntu/raring/efibootmgr/debian-merge into lp:ubuntu/raring/efibootmgr

Proposed by Oussama BOUNAIM on 2012-11-12
Status: Merged
Merged at revision: 11
Proposed branch: lp:~obounaim/ubuntu/raring/efibootmgr/debian-merge
Merge into: lp:ubuntu/raring/efibootmgr
Diff against target: 174 lines (+37/-64)
11 files modified
debian/changelog (+18/-0)
debian/compat (+1/-1)
debian/control (+5/-3)
debian/copyright (+1/-1)
debian/dirs (+0/-1)
debian/docs (+0/-2)
debian/efibootmgr.dirs (+1/-0)
debian/efibootmgr.docs (+2/-0)
debian/efibootmgr.install (+1/-0)
debian/efibootmgr.manpages (+1/-0)
debian/rules (+7/-56)
To merge this branch: bzr merge lp:~obounaim/ubuntu/raring/efibootmgr/debian-merge
Reviewer Review Type Date Requested Status
Colin Watson 2012-11-12 Approve on 2012-11-16
Review via email: mp+133974@code.launchpad.net
To post a comment you must log in.
Colin Watson (cjwatson) wrote :

Please talk to the last uploader before doing a merge, as advised in the index pages on merges.ubuntu.com. (I'm the last uploader and I know you didn't talk to me.) This is to avoid duplicated work, and is also a polite thing to do.

Please drop all the packaging changes you introduced: updating the standards-version and (particularly) moving to dh. These are not appropriate changes for an Ubuntu delta against Debian, because they increase the cost of future merges. A good goal to keep in mind when merging from Debian should be to try to make the Ubuntu delta as small as possible.

You can drop the change to build packages for lpia, because we no longer have the lpia architecture in Ubuntu.

You don't need to explicitly mention the Ubuntu maintainer change in the changelog (although I realise a previous uploader did).

review: Needs Fixing
Colin Watson (cjwatson) wrote :

Oh, never mind my comments about dh et al; I now see that this is just because your commit message was confusing (it's best to trim the ones that result from Debian changelog entries) and they weren't changes you introduced.

I'll still drop the lpia change and trim the "Set Ubuntu maintainer" entry, but otherwise this should be fine. Thanks!

review: Approve
Colin Watson (cjwatson) wrote :

Also the version number should be 0.5.4-3ubuntu1, not 0.5.4-3ubuntu2. I'll fix that up.

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-10-10 23:25:29 +0000
3+++ debian/changelog 2012-11-12 18:43:21 +0000
4@@ -1,3 +1,21 @@
5+efibootmgr (0.5.4-3ubuntu2) raring; urgency=low
6+
7+ * Merge from debian. Remaining changes:
8+ - Fix implementation of -w option to match documentation by leaving an
9+ existing unique MBR signature intact (LP: #1065261).
10+ - Build packages for lpia as well.
11+ - Set Ubuntu maintainer
12+
13+ -- Oussama Bounaim <o.bounaim@gmail.com> Mon, 12 Nov 2012 19:33:59 +0100
14+
15+efibootmgr (0.5.4-3) unstable; urgency=low
16+
17+ * add Vcs entries to the control file
18+ * update standards version
19+ * move to dh
20+
21+ -- Bdale Garbee <bdale@gag.com> Fri, 29 Jun 2012 08:18:06 -0600
22+
23 efibootmgr (0.5.4-2ubuntu2) quantal; urgency=low
24
25 * Fix implementation of -w option to match documentation by leaving an
26
27=== modified file 'debian/compat'
28--- debian/compat 2006-04-01 22:00:02 +0000
29+++ debian/compat 2012-11-12 18:43:21 +0000
30@@ -1,1 +1,1 @@
31-5
32+9
33
34=== modified file 'debian/control'
35--- debian/control 2012-10-10 23:25:29 +0000
36+++ debian/control 2012-11-12 18:43:21 +0000
37@@ -3,12 +3,14 @@
38 Priority: optional
39 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
40 XSBC-Original-Maintainer: Bdale Garbee <bdale@gag.com>
41-Build-Depends: debhelper (>> 5), docbook-to-man, libpci-dev, zlib1g-dev
42-Standards-Version: 3.7.3
43+Build-Depends: debhelper (>> 9), docbook-to-man, libpci-dev, zlib1g-dev
44+Standards-Version: 3.9.3
45+Vcs-Git: git://git.gag.com/debian/efibootmgr
46+Vcs-Browser: http://git.gag.com/?p=debian/efibootmgr
47
48 Package: efibootmgr
49 Architecture: amd64 i386 ia64 lpia
50-Depends: ${shlibs:Depends}
51+Depends: ${shlibs:Depends}, ${misc:Depends}
52 Description: Interact with the EFI Boot Manager
53 This is a Linux user-space application to modify the Intel Extensible
54 Firmware Interface (EFI) Boot Manager configuration. This application can
55
56=== modified file 'debian/copyright'
57--- debian/copyright 2005-03-10 11:27:00 +0000
58+++ debian/copyright 2012-11-12 18:43:21 +0000
59@@ -1,7 +1,7 @@
60 This package was constructed by Bdale Garbee <bdale@gag.com>, using source
61 downloaded from
62
63- http://domsch.com/linux/ia64/
64+ http://linux.dell.com/efibootmgr/
65
66 Upstream Author: Matt Domsch <Matt_Domsch@Dell.com>
67
68
69=== removed file 'debian/dirs'
70--- debian/dirs 2002-03-30 13:53:32 +0000
71+++ debian/dirs 1970-01-01 00:00:00 +0000
72@@ -1,1 +0,0 @@
73-bin
74
75=== removed file 'debian/docs'
76--- debian/docs 2002-03-30 13:53:32 +0000
77+++ debian/docs 1970-01-01 00:00:00 +0000
78@@ -1,2 +0,0 @@
79-README
80-doc/TODO
81
82=== added file 'debian/efibootmgr.dirs'
83--- debian/efibootmgr.dirs 1970-01-01 00:00:00 +0000
84+++ debian/efibootmgr.dirs 2012-11-12 18:43:21 +0000
85@@ -0,0 +1,1 @@
86+bin
87
88=== added file 'debian/efibootmgr.docs'
89--- debian/efibootmgr.docs 1970-01-01 00:00:00 +0000
90+++ debian/efibootmgr.docs 2012-11-12 18:43:21 +0000
91@@ -0,0 +1,2 @@
92+README
93+doc/TODO
94
95=== added file 'debian/efibootmgr.install'
96--- debian/efibootmgr.install 1970-01-01 00:00:00 +0000
97+++ debian/efibootmgr.install 2012-11-12 18:43:21 +0000
98@@ -0,0 +1,1 @@
99+src/efibootmgr/efibootmgr bin
100
101=== added file 'debian/efibootmgr.manpages'
102--- debian/efibootmgr.manpages 1970-01-01 00:00:00 +0000
103+++ debian/efibootmgr.manpages 2012-11-12 18:43:21 +0000
104@@ -0,0 +1,1 @@
105+src/man/man8/efibootmgr.8
106
107=== modified file 'debian/rules'
108--- debian/rules 2008-06-09 14:05:32 +0000
109+++ debian/rules 2012-11-12 18:43:21 +0000
110@@ -1,57 +1,8 @@
111 #!/usr/bin/make -f
112-
113-configure: configure-stamp
114-configure-stamp:
115- dh_testdir
116-
117- touch configure-stamp
118-
119-build: configure-stamp build-stamp
120-build-stamp:
121- dh_testdir
122- $(MAKE)
123- touch build-stamp
124-
125-clean:
126- dh_testdir
127- dh_testroot
128- rm -f build-stamp configure-stamp
129- $(MAKE) clean
130- dh_clean
131-
132-install: build
133- dh_testdir
134- dh_testroot
135- dh_clean -k
136- dh_installdirs
137-
138- cp src/efibootmgr/efibootmgr debian/efibootmgr/bin/efibootmgr
139- chown root:root debian/efibootmgr/bin/efibootmgr
140- chmod 0755 debian/efibootmgr/bin/efibootmgr
141-
142-# Build architecture-independent files here.
143-binary-indep: build install
144-
145-# Build architecture-dependent files here.
146-binary-arch: build install
147- dh_testdir
148- dh_testroot
149- dh_installdocs
150- dh_installexamples
151- dh_installmenu
152- dh_installcron
153- dh_installman src/man/man8/efibootmgr.8
154- dh_installinfo
155- dh_installchangelogs doc/ChangeLog
156- dh_link
157- dh_strip
158- dh_compress
159- dh_fixperms
160- dh_installdeb
161- dh_shlibdeps
162- dh_gencontrol
163- dh_md5sums
164- dh_builddeb
165-
166-binary: binary-indep binary-arch
167-.PHONY: build clean binary-indep binary-arch binary install configure
168+# rules file for the efibootmgr package, requires debhelper / dh
169+# copyright 2012 by Bdale Garbee, GPLv2 or later
170+
171+export DH_VERBOSE=1
172+
173+%:
174+ dh $@

Subscribers

People subscribed via source and target branches