libappindicator

Merge lp:~laney/libappindicator/gi-no-ma into lp:libappindicator/13.04

  1. gi-no-ma
  2. Merge into trunk.13.04
Proposed by Iain Lane
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 252
Merged at revision: 252
Proposed branch: lp:~laney/libappindicator/gi-no-ma
Merge into: lp:libappindicator/13.04
Diff against target: 13 lines (+2/-2)
2 files modified
debian/gir1.2-appindicator-0.1.install (+1/-1)
debian/gir1.2-appindicator3-0.1.install (+1/-1)
To merge this branch: bzr merge lp:~laney/libappindicator/gi-no-ma
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
PS Jenkins bot (community) continuous-integration Approve
Didier Roche-Tolomelli Pending
Review via email: mp+148400@code.launchpad.net

Commit message

Install typelib files into non Multi-Arch paths

Description of the change

debian/compat 9 sets libdir and libexecdir to multiarch paths. This is right for most things but not gobject-introspection typelib files. Those should be non-multiarched (at least until the gi system understands these paths).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:252
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/32/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=raring,flavor=i386/32/console
Coverity artifacts:
    http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=coverity-raring,flavor=amd64/32//artifact/results/coverity/NO_COVERITY_DEFECTS.txt
    http://jenkins.qa.ubuntu.com/job/libappindicator-ci/./build=pbuilder,distribution=raring,flavor=i386/32//artifact/results/coverity/NO_COVERITY_DEFECTS.txt

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/32//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

ACK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/gir1.2-appindicator-0.1.install'
2--- debian/gir1.2-appindicator-0.1.install 2012-11-27 02:18:17 +0000
3+++ debian/gir1.2-appindicator-0.1.install 2013-02-14 09:56:22 +0000
4@@ -1,1 +1,1 @@
5-usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib
6+usr/lib/*/girepository-1.0/AppIndicator-0.1.typelib usr/lib/girepository-1.0
7
8=== modified file 'debian/gir1.2-appindicator3-0.1.install'
9--- debian/gir1.2-appindicator3-0.1.install 2012-11-27 02:18:17 +0000
10+++ debian/gir1.2-appindicator3-0.1.install 2013-02-14 09:56:22 +0000
11@@ -1,1 +1,1 @@
12-usr/lib/*/girepository-1.0/AppIndicator3-0.1.typelib
13+usr/lib/*/girepository-1.0/AppIndicator3-0.1.typelib usr/lib/girepository-1.0

Subscribers

People subscribed via source and target branches