Merge lp:~dannf/ubuntu/saucy/udisks/lp1235051 into lp:ubuntu/saucy/udisks

Proposed by dann frazier on 2013-10-04
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~dannf/ubuntu/saucy/udisks/lp1235051
Merge into: lp:ubuntu/saucy/udisks
Diff against target: 45 lines (+11/-2)
3 files modified
debian/changelog (+7/-0)
debian/control (+3/-1)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~dannf/ubuntu/saucy/udisks/lp1235051
Reviewer Review Type Date Requested Status
Sebastien Bacher 2013-10-04 Approve on 2013-10-07
Review via email: mp+189203@code.launchpad.net
To post a comment you must log in.
Jackson Doak (noskcaj) wrote :

Please check that this doesn't break rebuilding by running "debuild && debuild".
If that won't work, you'll need to add debian/source/options with a diff ignore

Colin Watson (cjwatson) wrote :

On Fri, Oct 04, 2013 at 02:26:19AM -0000, Jackson Doak wrote:
> Please check that this doesn't break rebuilding by running "debuild && debuild".
> If that won't work, you'll need to add debian/source/options with a diff ignore

dh_autoreconf is no more likely to cause that problem than any other
change; it takes special care to avoid this.

dann frazier (dannf) wrote :

On Fri, Oct 4, 2013 at 2:42 AM, Colin Watson <email address hidden> wrote:
> On Fri, Oct 04, 2013 at 02:26:19AM -0000, Jackson Doak wrote:
>> Please check that this doesn't break rebuilding by running "debuild && debuild".
>> If that won't work, you'll need to add debian/source/options with a diff ignore
>
> dh_autoreconf is no more likely to cause that problem than any other
> change; it takes special care to avoid this.

I've confirmed by testing it.

Sebastien Bacher (seb128) wrote :

Thanks, we are currently in sync with Debian and it would be nice to stay that way. I don't think this fix is needed for saucy, so let's delay to next cycle and upload then if Debian still didn't get the change in. Setting as "work in progress" to get it out of the sponsoring queue meanwhile, since staled entry makes the queue a bit harder to review

Sebastien Bacher (seb128) wrote :

Ok, it seems having those in saucy helps, let's upload, thanks for the work!

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 2013-07-21 17:20:28 +0000
3+++ debian/changelog 2013-10-04 02:15:57 +0000
4@@ -1,3 +1,10 @@
5+udisks (1.0.4-8ubuntu1) UNRELEASED; urgency=low
6+
7+ * Use dh-autoreconf to update config.{sub,guess} to fix FTBFS on arm64.
8+ (LP: #1235051)
9+
10+ -- dann frazier <dann.frazier@canonical.com> Thu, 03 Oct 2013 17:27:36 -0600
11+
12 udisks (1.0.4-8) unstable; urgency=low
13
14 * debian/patches/14-test-for-pci-db.patch: In newer versions of udev, pci-db
15
16=== modified file 'debian/control'
17--- debian/control 2012-07-20 11:39:01 +0000
18+++ debian/control 2013-10-04 02:15:57 +0000
19@@ -1,10 +1,12 @@
20 Source: udisks
21 Section: admin
22 Priority: optional
23-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
24+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
25+XSBC-Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
26 Uploaders: Michael Biebl <biebl@debian.org>, Martin Pitt <mpitt@debian.org>
27 Build-Depends: debhelper (>= 8),
28 autotools-dev,
29+ dh-autoreconf,
30 pkg-config,
31 xsltproc,
32 gtk-doc-tools,
33
34=== modified file 'debian/rules'
35--- debian/rules 2011-03-11 18:08:40 +0000
36+++ debian/rules 2013-10-04 02:15:57 +0000
37@@ -1,7 +1,7 @@
38 #!/usr/bin/make -f
39
40 %:
41- dh $@
42+ dh $@ --with autoreconf
43
44 override_dh_auto_configure:
45 dh_auto_configure -- \

Subscribers

People subscribed via source and target branches

to all changes: