BAMF

Merge lp:~laney/bamf/gi-ma into lp:bamf

  1. gi-ma
  2. Merge into trunk
Proposed by Iain Lane
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 606
Merged at revision: 614
Proposed branch: lp:~laney/bamf/gi-ma
Merge into: lp:bamf
Diff against target: 33 lines (+8/-2)
3 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
debian/gir1.2-bamf-3.install (+1/-1)
To merge this branch: bzr merge lp:~laney/bamf/gi-ma
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Sebastien Bacher Pending
Review via email: mp+240102@code.launchpad.net

Commit message

Bump gobject-introspection build-dep to the version which installed typelib files in the multiarch libdir

Description of the change

Install typelib files into MA libdir and bump gi build-dep

To post a comment you must log in.
Revision history for this message
Iain Lane (laney) wrote :

605 is uploaded (tagged in this branch), but 606 is not. Not sure if CI train can handle that. Can manually edit the changelog if not.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:606
http://jenkins.qa.ubuntu.com/job/bamf-ci/104/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-utopic-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/bamf-utopic-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/bamf-ci/104/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

This change has been mostly applied, but not the build-depends bump, so ok with this.

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 2014-09-25 14:56:56 +0000
3+++ debian/changelog 2014-10-30 11:32:23 +0000
4@@ -1,3 +1,9 @@
5+bamf (0.5.1+14.10.20140925-0ubuntu2) vivid; urgency=medium
6+
7+ * Install typelib files into MA libdir
8+
9+ -- Iain Lane <iain@orangesquash.org.uk> Tue, 28 Oct 2014 11:12:55 +0000
10+
11 bamf (0.5.1+14.10.20140925-0ubuntu1) utopic; urgency=low
12
13 [ Ubuntu daily release ]
14
15=== modified file 'debian/control'
16--- debian/control 2014-04-07 21:31:21 +0000
17+++ debian/control 2014-10-30 11:32:23 +0000
18@@ -6,7 +6,7 @@
19 Build-Depends: dbus-x11,
20 debhelper (>= 9),
21 dh-autoreconf,
22- gobject-introspection (>= 0.6.5-3),
23+ gobject-introspection (>= 1.41.4-1~),
24 gtk-doc-tools,
25 libglib2.0-dev (>= 2.32.0),
26 libgtop2-dev,
27
28=== modified file 'debian/gir1.2-bamf-3.install'
29--- debian/gir1.2-bamf-3.install 2012-12-19 21:57:09 +0000
30+++ debian/gir1.2-bamf-3.install 2014-10-30 11:32:23 +0000
31@@ -1,1 +1,1 @@
32-usr/lib/girepository-1.0/Bamf-*.typelib
33+usr/lib/*/girepository-1.0/Bamf-*.typelib

Subscribers

People subscribed via source and target branches

to all changes: