Sync to Ubuntu desktop

8 files changed, 33 insertions, 35 deletions

diff --git a/debian/changelog b/debian/changelog
index c631fd0..285b966 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,25 @@
-indicator-application (0.2.0-0ubuntu1~ppa1) lucid; urgency=low
+indicator-application (0.2.0-0ubuntu3) UNRELEASED; urgency=low
+
+  * renamed cil binary to libappindicator0.1 to match the assembly 
+    version (LP: #592706)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 11 Jun 2010 10:56:46 -0400
+
+indicator-application (0.2.0-0ubuntu2) maverick; urgency=low
+
+  * Renamed the gir binary to gir1.0-appindicator-0.1 to match the typelib
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 08 Jun 2010 11:01:04 +0200
+
+indicator-application (0.2.0-0ubuntu1) maverick; urgency=low
 
   * New upstream release.
     * Unref the child that was created
     * Build GIR and VAPI files (LP: #510610)
     * Fixes to documentation and enum construction
     * Fix distcheck
+    * Merging patch to add assembly information to Mono
+      binding (LP: #547195)
   * debian/control: Add GObject Introspection and Vala build
     dependencies.
   * Added debian/gir1.0-libappindicator-0.1.install and modified
@@ -14,23 +29,6 @@ indicator-application (0.2.0-0ubuntu1~ppa1) lucid; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 03 Jun 2010 14:49:48 -0500
 
-indicator-application (0.0.21-0ubuntu1~ppa1) lucid; urgency=low
-
-  * New upstream release.
-    * Adding AssemblyInfo.cs for building
-
- -- Ted Gould <ted@ubuntu.com>  Thu, 20 May 2010 21:59:48 -0500
-
-indicator-application (0.0.20-0ubuntu1~ppa1) lucid; urgency=low
-
-  * New upstream release.
-    * Unref the child when created in libappindicator (LP: #569273)
-    * Merging patch to add assembly information to Mono
-      binding (LP: #547195)
-  * Remove child-leakage.patch as merged upstream
-
- -- Ted Gould <ted@ubuntu.com>  Thu, 20 May 2010 21:56:44 -0500
-
 indicator-application (0.0.19-0ubuntu5) lucid-proposed; urgency=low
 
   * debian/patches/child-leakage.patch
@@ -397,14 +395,6 @@ indicator-application (0.0.3-0ubuntu1) lucid; urgency=low
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 10 Dec 2009 13:34:40 -0600
 
-indicator-application (0.0.2-0ubuntu1~ppa1) karmic; urgency=low
-
-  * Upstream release 0.0.2
-    * Updates API to use GTK instead of dbusmenu to make it
-      easier for upstream developers to use.
-
- -- Ted Gould <ted@ubuntu.com>  Fri, 04 Dec 2009 14:50:45 -0600
-
 indicator-application (0.0.2-0~ppa3) karmic; urgency=low
 
   * debian/watch:
@@ -414,6 +404,14 @@ indicator-application (0.0.2-0~ppa3) karmic; urgency=low
 
  -- Ken VanDine <ken.vandine@canonical.com>  Thu, 10 Dec 2009 09:00:06 -0500
 
+indicator-application (0.0.2-0ubuntu1~ppa1) karmic; urgency=low
+
+  * Upstream release 0.0.2
+    * Updates API to use GTK instead of dbusmenu to make it
+      easier for upstream developers to use.
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 04 Dec 2009 14:50:45 -0600
+
 indicator-application (0.0.1-0ubuntu3~ppa4) karmic; urgency=low
 
   * Adding in copyright headers and licenses
diff --git a/debian/control b/debian/control
index f3d57c0..2a80792 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: indicator-application
 Section: gnome
 Priority: optional
 XS-Python-Version: all
-Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
 Build-Depends: debhelper (>= 5.0),
                cdbs (>= 0.4.41),
                python-central (>= 0.6),
@@ -93,7 +93,7 @@ Description:  Application Indicators
  .
  This package contains developer documentation.
 
-Package: libappindicator0.0-cil
+Package: libappindicator0.1-cil
 Section: cli-mono
 Architecture: all
 Replaces: libappindicator0-cil (<= 0.0.19-0ubuntu4~)
@@ -115,14 +115,14 @@ Conflicts: libappindicator-cil-dev (<= 0.0.19-0ubuntu4~)
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${cli:Depends},
-         libappindicator0.0-cil (= ${binary:Version})
+         libappindicator0.1-cil (= ${binary:Version})
 Description: Application Indicators
  A library and indicator to take menus from applications and place them in
  the panel.
  .
  This package contains files that are needed to build applications.
 
-Package: gir1.0-libappindicator-0.1
+Package: gir1.0-appindicator-0.1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
diff --git a/debian/gir1.0-libappindicator-0.1.install b/debian/gir1.0-appindicator-0.1.install
index 0791348..0791348 100644
--- a/debian/gir1.0-libappindicator-0.1.install
+++ b/debian/gir1.0-appindicator-0.1.install
diff --git a/debian/libappindicator0.0-cil.install b/debian/libappindicator0.0-cil.install
deleted file mode 100644
index f61b26c..0000000
--- a/debian/libappindicator0.0-cil.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/usr/lib/cli/appindicator-sharp-0.1/* /usr/lib/cli/appindicator-sharp-0.0
diff --git a/debian/libappindicator0.0-cil.installcligac b/debian/libappindicator0.0-cil.installcligac
deleted file mode 100644
index b818d51..0000000
--- a/debian/libappindicator0.0-cil.installcligac
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/cli/appindicator-sharp-0.0/appindicator-sharp.dll
diff --git a/debian/libappindicator0.1-cil.install b/debian/libappindicator0.1-cil.install
new file mode 100644
index 0000000..106b727
--- /dev/null
+++ b/debian/libappindicator0.1-cil.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/cli/appindicator-sharp-0.1/* 
diff --git a/debian/libappindicator0.1-cil.installcligac b/debian/libappindicator0.1-cil.installcligac
new file mode 100644
index 0000000..7e66dd2
--- /dev/null
+++ b/debian/libappindicator0.1-cil.installcligac
@@ -0,0 +1 @@
+/usr/lib/cli/appindicator-sharp-0.1/appindicator-sharp.dll
diff --git a/debian/rules b/debian/rules
index e2e4215..074da71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,14 +38,14 @@ install/python-appindicator:: $(addprefix install-stamp-, $(PY_VERSIONS))
 binary-install/python-appindicator::
 	dh_pycentral
 
-binary-install/libappindicator0.0-cil::
+binary-install/libappindicator0.1-cil::
 	dh_clistrip
 	dh_clifixperms
 	dh_makeclilibs -V
 	dh_installcligac
 
-binary-predeb/libappindicator0.0-cil:: binary-fixup/libappindicator0
-	dh_clideps -plibappindicator0.0-cil
+binary-predeb/libappindicator0.1-cil:: binary-fixup/libappindicator0
+	dh_clideps -plibappindicator0.1-cil
 
 configure-stamp:
 	$(DEB_CONFIGURE_SCRIPT) $(DEB_CONFIGURE_NORMAL_ARGS) $(DEB_CONFIGURE_EXTRA_FLAGS)