Merge lp:~kentb/ubuntu/trusty/sblim-cmpi-devel/fix-for-1269934 into lp:ubuntu/trusty/sblim-cmpi-devel

Proposed by Kent Baxley
Status: Merged
Merged at revision: 5
Proposed branch: lp:~kentb/ubuntu/trusty/sblim-cmpi-devel/fix-for-1269934
Merge into: lp:ubuntu/trusty/sblim-cmpi-devel
Diff against target: 48 lines (+12/-3)
4 files modified
debian/changelog (+8/-0)
debian/compat (+1/-1)
debian/control (+2/-2)
debian/rules (+1/-0)
To merge this branch: bzr merge lp:~kentb/ubuntu/trusty/sblim-cmpi-devel/fix-for-1269934
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+202000@code.launchpad.net

Description of the change

Proposed fix for FTBFS. Builds seem to work OK on x86 but I'd like to make sure nothing else is needed since I don't have a ppc64el system to build against.

To post a comment you must log in.

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-12-16 15:47:12 +0000
3+++ debian/changelog 2014-01-16 20:52:02 +0000
4@@ -1,3 +1,11 @@
5+sblim-cmpi-devel (2.0.3-0ubuntu2) trusty; urgency=low
6+
7+ * use dh-autoreconf to prevent FTBFS on ppc64el (LP: #1269934)
8+ * Update debhelper compat to 9.
9+ * Update standards to 3.9.5.
10+
11+ -- Kent Baxley <kent.baxley@canonical.com> Thu, 16 Jan 2014 14:47:41 -0600
12+
13 sblim-cmpi-devel (2.0.3-0ubuntu1) trusty; urgency=low
14
15 * New upstream release.
16
17=== modified file 'debian/compat'
18--- debian/compat 2008-08-27 10:59:42 +0000
19+++ debian/compat 2014-01-16 20:52:02 +0000
20@@ -1,1 +1,1 @@
21-5
22+9
23
24=== modified file 'debian/control'
25--- debian/control 2013-12-16 15:47:12 +0000
26+++ debian/control 2014-01-16 20:52:02 +0000
27@@ -1,9 +1,9 @@
28 Source: sblim-cmpi-devel
29 Priority: optional
30 Section: libs
31-Build-Depends: debhelper (>= 4.1.0), cdbs
32+Build-Depends: debhelper (>= 9), cdbs, dh-autoreconf
33 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
34-Standards-Version: 3.9.4
35+Standards-Version: 3.9.5
36
37 Package: libcmpicppimpl0
38 Architecture: any
39
40=== modified file 'debian/rules'
41--- debian/rules 2008-08-27 10:59:42 +0000
42+++ debian/rules 2014-01-16 20:52:02 +0000
43@@ -2,5 +2,6 @@
44 # makefile for sblim-cmpi-devel
45
46 include /usr/share/cdbs/1/rules/debhelper.mk
47+include /usr/share/cdbs/1/rules/autoreconf.mk
48 include /usr/share/cdbs/1/class/autotools.mk
49

Subscribers

People subscribed via source and target branches

to all changes: