libappindicator

Merge lp:~laney/libappindicator/cil-pcfile-arch-all into lp:libappindicator/13.04

  1. cil-pcfile-arch-all
  2. Merge into trunk.13.04
Proposed by Iain Lane
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 262
Merged at revision: 260
Proposed branch: lp:~laney/libappindicator/cil-pcfile-arch-all
Merge into: lp:libappindicator/13.04
Diff against target: 36 lines (+11/-2)
3 files modified
bindings/mono/appindicator-sharp-0.1.pc.in (+1/-1)
debian/changelog (+9/-0)
debian/libappindicator0.1-cil-dev.install (+1/-1)
To merge this branch: bzr merge lp:~laney/libappindicator/cil-pcfile-arch-all
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+158097@code.launchpad.net

Commit message

Install appindicator-sharp's pcfile into /usr/share/pkgconfig as this is an arch:all package and library. Update the assemblydir variable in this pcfile to refer to the correct location for the library instead of an incorrect multiarch directory.

Description of the change

The pcfile for appindicator-sharp is broken in a couple of related ways

  * It's installed into a Multi-Arch directory in an arch:all package.
  * It references a multiarch libdir when the library isn't installed in one.

Fix both of these by properly using the unversioned locations.

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

PASSED: Continuous integration, rev:262
http://jenkins.qa.ubuntu.com/job/libappindicator-13.04-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-13.04-raring-amd64-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libappindicator-13.04-ci/3/rebuild

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

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bindings/mono/appindicator-sharp-0.1.pc.in'
2--- bindings/mono/appindicator-sharp-0.1.pc.in 2012-02-03 20:37:56 +0000
3+++ bindings/mono/appindicator-sharp-0.1.pc.in 2013-04-10 13:05:32 +0000
4@@ -1,7 +1,7 @@
5 prefix=@prefix@
6 exec_prefix=@exec_prefix@
7 libdir=@libdir@
8-assemblies_dir=${libdir}/cli/appindicator-sharp-0.1
9+assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1
10
11 Name: appindicator-sharp
12 Description: application indicators for .NET
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2013-04-09 02:02:32 +0000
16+++ debian/changelog 2013-04-10 13:05:32 +0000
17@@ -1,3 +1,12 @@
18+libappindicator (12.10.1daily13.04.09-0ubuntu2) UNRELEASED; urgency=low
19+
20+ * Install appindicator-sharp's pcfile into /usr/share/pkgconfig as this is
21+ an arch:all package and library. Update the assemblydir variable in this
22+ pcfile to refer to the correct location for the library instead of an
23+ incorrect multiarch directory.
24+
25+ -- Iain Lane <iain.lane@canonical.com> Wed, 10 Apr 2013 12:57:58 +0100
26+
27 libappindicator (12.10.1daily13.04.09-0ubuntu1) raring; urgency=low
28
29 * Automatic snapshot from revision 258
30
31=== modified file 'debian/libappindicator0.1-cil-dev.install'
32--- debian/libappindicator0.1-cil-dev.install 2012-11-27 02:18:17 +0000
33+++ debian/libappindicator0.1-cil-dev.install 2013-04-10 13:05:32 +0000
34@@ -1,1 +1,1 @@
35-usr/lib/*/pkgconfig/appindicator-sharp-0.1.pc
36+usr/lib/*/pkgconfig/appindicator-sharp-0.1.pc usr/share/pkgconfig

Subscribers

People subscribed via source and target branches