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

[Ted Gould]

Package rename for mono bindings. From #ubuntu-devel:

(04:59:14 PM) slangasek: tedg: indicator-application> yes, seems reasonable here, please go ahead
(05:00:00 PM) Ted: Yeah! slangasek thinks I'm reasonable! ;)
(05:00:04 PM) Ted: slangasek: Thanks, will do.
(05:00:35 PM) bryceh: tedg, well that's just weird

=== modified file 'bindings/mono/appindicator-sharp-0.1.pc.in'
--- bindings/mono/appindicator-sharp-0.1.pc.in	2009-12-16 21:15:52 +0000
+++ bindings/mono/appindicator-sharp-0.1.pc.in	2010-04-16 22:30:42 +0000
@@ -1,7 +1,7 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
-assemblies_dir=${libdir}/appindicator-sharp-0.1
+assemblies_dir=${libdir}/cli/appindicator-sharp-0.0
 
 Name: appindicator-sharp
 Description: application indicators for .NET

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-14 21:20:45 +0000
+++ debian/changelog	2010-04-16 22:30:42 +0000
@@ -1,3 +1,28 @@
+indicator-application (0.0.19-0ubuntu4) UNRELEASED; urgency=low
+
+  * bindings/mono/appindicator-sharp-0.1.pc.in:
+    + Fix pcfile to point to library install location (LP: #564506)
+  * debian/control,
+    debian/libappindicator0-cil.install,
+    debian/libappindicator0-cil.installcligac,
+    debian/libappindicator-cil-dev.install,
+    debian/libappindicator0.0-cil.install,
+    debian/libappindicator0.0-cil.installcligac,
+    debian/libappindicator0.1-cil-dev.install:
+    + Rename packages to comply with Debian CLI policy
+  * debian/libappindicator0.0-cil.install,
+    debian/libappindicator0.0-cil.installcligac:
+    + Fix library install location to comply with Debian CLI policy
+  * debian/control,
+    debian/rules:
+    + Pass CSC variable to use mono-csc default compiler from mono-devel
+      2.4.3, rather than the default 2.0-only compiler
+  * debian/rules:
+    + Fix processing of rules to track dependency information on Mono
+      binding, by running rules in correct order
+
+ -- Jo Shields <[e-mail]>  Fri, 16 Apr 2010 10:42:48 +0100
+
 indicator-application (0.0.19-0ubuntu3) lucid; urgency=low
 
   * Merging patch to add assembly information to Mono binding (LP: #547195)

=== modified file 'debian/control'
--- debian/control	2010-04-14 13:43:40 +0000
+++ debian/control	2010-04-16 22:30:42 +0000
@@ -20,7 +20,7 @@
                libdbusmenu-gtk-dev (>= 0.2.2),
                libdbusmenu-glib-dev (>= 0.2.2),
                cli-common-dev (>= 0.5.7),
-               mono-devel (>= 2.0.1),
+               mono-devel (>= 2.4.3),
                gtk-sharp2-gapi,
                libmono-dev,
                libnunit-cil-dev,
@@ -87,26 +87,29 @@
  .
  This package contains developer documentation.
 
-Package: libappindicator0-cil
+Package: libappindicator0.0-cil
 Section: cli-mono
 Architecture: all
+Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4~)
+Conflicts: libappindicator0-cil (<= 0.0.19-0ubuntu4~)
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${cli:Depends},
-         libappindicator0 (>= ${source:Version})
+         ${cli:Depends}
 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.
  .
  This package contains assemblies to be used by applications.
 
-Package: libappindicator-cil-dev
+Package: libappindicator0.1-cil-dev
 Section: libdevel
 Architecture: all
+Replaces: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~)
+Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~)
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${cli:Depends},
-         libappindicator0-cil (= ${binary:Version})
+         libappindicator0.0-cil (= ${binary:Version})
 Description: Application Indicators
  A library and indicator to take menus from applications and place them in
  the panel.

=== renamed file 'debian/libappindicator0-cil.install' => 'debian/libappindicator0.0-cil.install'
--- debian/libappindicator0-cil.install	2010-04-14 13:43:40 +0000
+++ debian/libappindicator0.0-cil.install	2010-04-16 22:30:42 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/appindicator-sharp-0.1 /usr/lib/cli
+debian/tmp/usr/lib/appindicator-sharp-0.1/* /usr/lib/cli/appindicator-sharp-0.0

=== renamed file 'debian/libappindicator0-cil.installcligac' => 'debian/libappindicator0.0-cil.installcligac'
--- debian/libappindicator0-cil.installcligac	2010-04-14 13:43:40 +0000
+++ debian/libappindicator0.0-cil.installcligac	2010-04-16 22:30:42 +0000
@@ -1,1 +1,1 @@
-/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll
+/usr/lib/cli/appindicator-sharp-0.0/appindicator-sharp.dll

=== renamed file 'debian/libappindicator-cil-dev.install' => 'debian/libappindicator0.1-cil-dev.install'
=== modified file 'debian/rules'
--- debian/rules	2010-04-14 13:43:40 +0000
+++ debian/rules	2010-04-16 22:30:42 +0000
@@ -3,6 +3,7 @@
 DEB_PYTHON_SYSTEM=pycentral
 PY_VERSIONS = $(shell pyversions --requested debian/control)
 export MONO_SHARED_DIR=$(CURDIR)
+export CSC=/usr/bin/mono-csc
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools-vars.mk
@@ -12,6 +13,8 @@
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
 API_VERSION = 0.1
 
+DEB_DH_MAKESHLIBS_ARGS_libappindicator0 := -V 'libappindicator0 (>= 0.0.19)'
+
 configure-stamp-%:
 	mkdir build-$*
 	cd build-$* && PYTHON=`which $*` \
@@ -35,6 +38,15 @@
 binary-install/python-appindicator::
 	dh_pycentral
 
+binary-install/libappindicator0.0-cil::
+	dh_clistrip
+	dh_clifixperms
+	dh_makeclilibs -V
+	dh_installcligac
+
+binary-predeb/libappindicator0.0-cil:: binary-fixup/libappindicator0
+	dh_clideps -plibappindicator0.0-cil
+
 configure-stamp:
 	$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)
 	touch $@
@@ -57,15 +69,6 @@
 	find debian/indicator-application/usr/lib -name \*.la -exec rm {} \;
 	find debian/indicator-application/usr/lib -name \*.a -exec rm {} \;
 
-binary-fixup/libappindicator0-cil::
-	dh_clifixperms
-
-binary-predeb/libappindicator0-cil::
-	dh_makeclilibs -m $(API_VERSION)
-	dh_installcligac
-	dh_clideps
-
-
 common-binary-predeb-arch:: list-missing
 
 clean::