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

[Stephen M. Webb]

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

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

[PS Jenkins bot (ps-jenkins)]

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)]

PASSED: Continuous integration, rev:94
http://jenkins.qa.ubuntu.com/job/libgrip-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-utopic-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-utopic-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-utopic-i386-ci/3

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

review: Approve (continuous-integration)

[lp:~bregma/libgrip/fix-gir-typelib-path]

95. By Stephen M. Webb on 2014-06-24

remerge lp-1332516 branch

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:95
http://jenkins.qa.ubuntu.com/job/libgrip-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-utopic-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-utopic-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libgrip-utopic-i386-ci/8

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

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-24 13:25:06 +0000
+++ debian/changelog	2014-06-24 13:25:06 +0000
@@ -1,12 +1,13 @@
 libgrip (0.3.7+14.04.20140303-0ubuntu2) UNRELEASED; urgency=medium
 
+  * removed multi-arch from GIR typelib path (lp: #1332603)
   * improved Python 3 support (lp: #1332516)
     - moved all Python support into the GObject Introspection (GIR) package to
       better support all Python versions
     - removed python-libgrip package
     - added Python 3 and Python-GIR build deps
 
- -- Stephen M. Webb <[e-mail]>  Fri, 20 Jun 2014 10:41:19 -0400
+ -- Stephen M. Webb <[e-mail]>  Fri, 20 Jun 2014 12:22:52 -0400
 
 libgrip (0.3.7+14.04.20140303-0ubuntu1) trusty; urgency=low
 

=== modified file 'debian/gir1.2-grip.install'
--- debian/gir1.2-grip.install	2014-06-24 13:25:06 +0000
+++ debian/gir1.2-grip.install	2014-06-24 13:25:06 +0000
@@ -1,2 +1,2 @@
-usr/lib/*/girepository-1.0
+usr/lib/*/girepository-1.0 usr/lib
 usr/lib/python*/*-packages/gi/overrides/*.py