Merge lp:~laney/libappindicator/cil-pcfile-arch-all 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.

(I haven't linked this to a bug and will set a commit message on the MP - if
that's not enough for the merger please let me know and I'll update d/changelog
manually.)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:261
http://jenkins.qa.ubuntu.com/job/libappindicator-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libappindicator-raring-amd64-ci/5

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

review: Approve (continuous-integration)

[lp:~laney/libappindicator/cil-pcfile-arch-all]

262. By Iain Lane on 2013-04-10

Update changelog

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

I think there was an issue with the merge, the extra changelog entries in a branch taht still needs to get merged...

review: Approve

[Iain Lane (laney)]

Hmm, do I need to fix something?

[Didier Roche-Tolomelli (didrocks)]

"* Automatic snapshot from revision 258"
-> you will obviously not remerged at rev 258, so you need to put a bootstrap commit to have daily release continuing in the UNRELEASED changelog.

review: Needs Fixing

[Iain Lane (laney)]

I don't know what that means. I just had branched from the 13.04 branch. I'll resubmit a new one vs. trunk.

[Iain Lane (laney)]

I couldn't use the resubmit feature (OOPS), so I did that manually.

  https://code.launchpad.net/~laney/libappindicator/cli-pcfile-arch-all-trunk/+merge/159166

review: Needs Resubmitting

Unmerged revisions

262. By Iain Lane on 2013-04-10

Update changelog

261. By Iain Lane on 2013-04-10

Set libdir for the cil pcfile to reflect that the library is installed in a non-MA directory

260. By Iain Lane on 2013-04-10

Install cil-dev pkgconfig file in /usr/share/pkgconfig - it's arch:all.

259. By PS Jenkins bot on 2013-04-09

Releasing 12.10.1daily13.04.09-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

258. By PS Jenkins bot on 2013-04-08

Releasing 12.10.1daily13.04.08-0ubuntu1 to ubuntu.

Approved by PS Jenkins bot.

257. By Mathieu Trudel-Lapierre on 2013-04-03

debian/rules: reverse the order of dh_clean and dh_autoreconf_clean,
this fixes issues where clean removes files used by dh_autoreconf_clean.

=== 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-10 12:56:21 +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-10 12:56:21 +0000
@@ -1,3 +1,29 @@
+libappindicator (12.10.1daily13.04.09-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.04.09-0ubuntu1) raring; urgency=low
+
+  * Automatic snapshot from revision 258
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 09 Apr 2013 02:02:28 +0000
+
+libappindicator (12.10.1daily13.04.08-0ubuntu1) raring; urgency=low
+
+  [ Mathieu Trudel-Lapierre ]
+  * debian/rules: reverse the order of dh_clean and dh_autoreconf_clean,
+    this fixes issues where clean removes files used by dh_autoreconf_clean.
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 257
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 08 Apr 2013 02:02:59 +0000
+
 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-10 12:56:21 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/pkgconfig/appindicator-sharp-0.1.pc
+usr/lib/*/pkgconfig/appindicator-sharp-0.1.pc usr/share/pkgconfig