Merge lp:~laney/libappindicator/cli-pcfile-arch-all-trunk into lp:libappindicator/13.10

[Iain Lane]

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.

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.

[Iain Lane (laney)]

This is a resubmission of https://code.launchpad.net/~laney/libappindicator/cil-pcfile-arch-all/+merge/158086 - please could you set that to rejected or whatever is appropriate?

[Mathieu Trudel-Lapierre (cyphermox)]

Approve.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-raring-amd64-ci/7

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

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

looking fine now! Thanks :)

review: Approve

=== modified file 'bindings/mono/appindicator-sharp-0.1.pc.in'
--- bindings/mono/appindicator-sharp-0.1.pc.in	2012-02-03 20:37:56 +0000
+++ bindings/mono/appindicator-sharp-0.1.pc.in	2013-04-16 14:26:26 +0000
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-assemblies_dir=${libdir}/cli/appindicator-sharp-0.1
+assemblies_dir=${prefix}/lib/cli/appindicator-sharp-0.1
 
 Name: appindicator-sharp
 Description: application indicators for .NET

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-13 02:02:14 +0000
+++ debian/changelog	2013-04-16 14:26:26 +0000
@@ -1,3 +1,12 @@
+libappindicator (12.10.1daily13.04.13-0ubuntu2) UNRELEASED; urgency=low
+
+  * 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.
+
+ -- Iain Lane <[e-mail]>  Wed, 10 Apr 2013 12:57:58 +0100
+
 libappindicator (12.10.1daily13.03.13-0ubuntu1) raring; urgency=low
 
   [ Sebastien Bacher ]

=== modified file 'debian/libappindicator0.1-cil-dev.install'
--- debian/libappindicator0.1-cil-dev.install	2012-11-27 02:18:17 +0000
+++ debian/libappindicator0.1-cil-dev.install	2013-04-16 14:26:26 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/pkgconfig/appindicator-sharp-0.1.pc
+usr/lib/*/pkgconfig/appindicator-sharp-0.1.pc usr/share/pkgconfig