Merge lp:~bregma/libgrip/fix-gir-typelib-path into lp:libgrip

Proposed by Stephen M. Webb on 2014-06-20
Status: Merged
Merged at revision: 94
Proposed branch: lp:~bregma/libgrip/fix-gir-typelib-path
Merge into: lp:libgrip
Prerequisite: lp:~bregma/libgrip/add-python3-support
Diff against target: 26 lines (+3/-2)
2 files modified
debian/changelog (+2/-1)
debian/gir1.2-grip.install (+1/-1)
To merge this branch: bzr merge lp:~bregma/libgrip/fix-gir-typelib-path
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve on 2014-06-24
Open Input Framework Team 2014-06-20 Pending
Review via email: mp+223984@code.launchpad.net

This proposal supersedes a proposal from 2014-06-20.

Commit message

fix the GIT typelib path to remove the multi-arch directory

Description of the change

Fixed the typelib path: GObject introspection does not (yet) support multi-arch.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:94
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~bregma/libgrip/fix-gir-typelib-path/+merge/223984/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/libgrip-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-utopic-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-utopic-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-utopic-i386-ci/1

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

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
95. By Stephen M. Webb on 2014-06-24

remerge lp-1332516 branch

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

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-06-24 13:25:06 +0000
3+++ debian/changelog 2014-06-24 13:25:06 +0000
4@@ -1,12 +1,13 @@
5 libgrip (0.3.7+14.04.20140303-0ubuntu2) UNRELEASED; urgency=medium
6
7+ * removed multi-arch from GIR typelib path (lp: #1332603)
8 * improved Python 3 support (lp: #1332516)
9 - moved all Python support into the GObject Introspection (GIR) package to
10 better support all Python versions
11 - removed python-libgrip package
12 - added Python 3 and Python-GIR build deps
13
14- -- Stephen M. Webb <stephen.webb@bregmasoft.ca> Fri, 20 Jun 2014 10:41:19 -0400
15+ -- Stephen M. Webb <stephen.webb@bregmasoft.ca> Fri, 20 Jun 2014 12:22:52 -0400
16
17 libgrip (0.3.7+14.04.20140303-0ubuntu1) trusty; urgency=low
18
19
20=== modified file 'debian/gir1.2-grip.install'
21--- debian/gir1.2-grip.install 2014-06-24 13:25:06 +0000
22+++ debian/gir1.2-grip.install 2014-06-24 13:25:06 +0000
23@@ -1,2 +1,2 @@
24-usr/lib/*/girepository-1.0
25+usr/lib/*/girepository-1.0 usr/lib
26 usr/lib/python*/*-packages/gi/overrides/*.py

Subscribers

People subscribed via source and target branches