Merge lp:~indicator-applet-developers/indicator-application/lucid into lp:~ubuntu-desktop/indicator-application/ubuntu

[Ted Gould]

CLI Patch included.

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-01 21:41:58 +0000
+++ debian/changelog	2010-04-14 13:47:20 +0000
@@ -1,3 +1,19 @@
+indicator-application (0.0.19-0ubuntu2) lucid; urgency=low
+
+  * debian/control:
+    + Set libappindicator0-cil and libappindicator-cil-dev to Arch: all
+    + Make libappindicator0-cil depend on libappindicator0 >= ${source:Version}
+      instead
+  * debian/rules:
+    + Fix ordering of dh_*cli* (LP: #560095)
+  * debian/libappindicator0-cil.install,
+    debian/libappindicator0-cil.installcligac:
+    + Fix CLI policy breakage:
+      - Wrong installation paths for GAC'd CLI libraries
+      - Direct installation of GAC'd libraries
+
+ -- Chow Loong Jin <[e-mail]>  Wed, 14 Apr 2010 18:44:22 +0800
+
 indicator-application (0.0.19-0ubuntu1) lucid; urgency=low
 
   * New upstream release.
 
=== modified file 'debian/control'
--- debian/control	2010-03-11 22:19:37 +0000
+++ debian/control	2010-04-14 13:47:20 +0000
@@ -89,12 +89,11 @@
 
 Package: libappindicator0-cil
 Section: cli-mono
-Architecture: any
+Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${cli:Depends},
-         libappindicator0 (= ${binary:Version})
-Provides: ${cli:Provides}
+         libappindicator0 (>= ${source:Version})
 Description: CLI bindings for libappindicator
  This package provides the appindicator-sharp assembly that allows CLI (.NET)
  programs to take menus from applications and place them in the panel.
@@ -103,7 +102,7 @@
 
 Package: libappindicator-cil-dev
 Section: libdevel
-Architecture: any
+Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${cli:Depends},
 
=== modified file 'debian/libappindicator0-cil.install'
--- debian/libappindicator0-cil.install	2009-12-17 06:21:32 +0000
+++ debian/libappindicator0-cil.install	2010-04-14 13:47:20 +0000
@@ -1,2 +1,1 @@
-debian/tmp/usr/lib/appindicator-sharp-0.1/*
-debian/tmp/usr/lib/mono/*
+debian/tmp/usr/lib/appindicator-sharp-0.1 /usr/lib/cli
 
=== added file 'debian/libappindicator0-cil.installcligac'
--- debian/libappindicator0-cil.installcligac	1970-01-01 00:00:00 +0000
+++ debian/libappindicator0-cil.installcligac	2010-04-14 13:47:20 +0000
@@ -0,0 +1,1 @@
+/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll
 
=== modified file 'debian/rules'
--- debian/rules	2009-12-16 21:56:19 +0000
+++ debian/rules	2010-04-14 13:47:20 +0000
@@ -57,12 +57,13 @@
 	find debian/indicator-application/usr/lib -name \*.la -exec rm {} \;
 	find debian/indicator-application/usr/lib -name \*.a -exec rm {} \;
 
-binary/libappindicator0-cil:: binary-arch
-binary-arch: 
-	dh_clifixperms -i
-	dh_installdeb -i
+binary-fixup/libappindicator0-cil::
+	dh_clifixperms
+
+binary-predeb/libappindicator0-cil::
 	dh_makeclilibs -m $(API_VERSION)
-	dh_clideps -i -d
+	dh_installcligac
+	dh_clideps
 
 
 common-binary-predeb-arch:: list-missing