Merge from U. Desktop

10 files changed, 234 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 1c2bad1..72c3b15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,44 @@
-libappindicator (0.2.96-0ubuntu1~ppa1) natty; urgency=low
+libappindicator (0.2.96-0ubuntu4) natty; urgency=low
 
+  * src/appindicator3-0.1.pc.in
+    - Set includedir to the location of the headers provided by 
+      libappindicator-dev (LP: #721562)
+  * debian/control
+    - Make libappindicator3-dev depend on libappindicator-dev which 
+      includes the headers (LP: #721562)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Mon, 28 Feb 2011 23:26:35 -0500
+
+libappindicator (0.2.96-0ubuntu3) natty; urgency=low
+
+  * debian/patches/update-defs.patch:
+    - Fix crash when importing appindicator from Python (LP: #724917).
+
+ -- Артём Попов <artfwo@ubuntu.com>  Mon, 28 Feb 2011 22:33:47 +0600
+
+libappindicator (0.2.96-0ubuntu2) natty; urgency=low
+
+  * debian/control, debian/rules:
+    - Add quilt
+  * debian/patches/disconnect-from-theme.patch:
+    - Fix crash when switching themes by disconnecting a signal from
+      the theme on dispose.  LP: #708188
+
+ -- Michael Terry <mterry@ubuntu.com>  Mon, 28 Feb 2011 08:48:40 -0500
+
+libappindicator (0.2.96-0ubuntu1) natty; urgency=low
+
+  [ Ted Gould ]
   * New upstream release.
     * Add support for accessible descriptions
     * Move deregistration of object later to send final signals
 
- -- Ted Gould <ted@ubuntu.com>  Thu, 24 Feb 2011 16:06:43 -0600
+  [ Ken VanDine ]
+  * debian/libappindicator3-1.symbols
+  * debian/libappindicator1.symbols
+    - Added symbols
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 24 Feb 2011 21:45:34 -0500
 
 libappindicator (0.2.95-0ubuntu3) natty; urgency=low
 
diff --git a/debian/control b/debian/control
index 4f608a9..142f80d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ XS-Python-Version: all
 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
 Build-Depends: debhelper (>= 7.0),
                cdbs (>= 0.4.41),
+               quilt,
                libgtk2.0-dev (>= 2.12.0),
                libgtk-3-dev (>= 2.91.3),
                libdbus-glib-1-dev (>= 0.82),
@@ -117,6 +118,7 @@ Depends: ${shlibs:Depends},
          ${misc:Depends},
          libdbusmenu-glib-dev (>= 0.1.8),
          libdbus-glib-1-dev (>= 0.76),
+         libappindicator-dev (= ${binary:Version}),
          libappindicator3-1 (= ${binary:Version})
 Description: Application Indicators
  A library and indicator to take menus from applications and place them in
diff --git a/debian/libappindicator1.symbols b/debian/libappindicator1.symbols
index 2e4d622..4525737 100644
--- a/debian/libappindicator1.symbols
+++ b/debian/libappindicator1.symbols
@@ -2,8 +2,10 @@ libappindicator.so.1 libappindicator1 #MINVER#
  app_indicator_build_menu_from_desktop@Base 0.2.91
  app_indicator_category_get_type@Base 0.2.91
  app_indicator_get_attention_icon@Base 0.2.91
+ app_indicator_get_attention_icon_desc@Base 0.2.96
  app_indicator_get_category@Base 0.2.91
  app_indicator_get_icon@Base 0.2.91
+ app_indicator_get_icon_desc@Base 0.2.96
  app_indicator_get_icon_theme_path@Base 0.2.91
  app_indicator_get_id@Base 0.2.91
  app_indicator_get_label@Base 0.2.91
@@ -15,7 +17,9 @@ libappindicator.so.1 libappindicator1 #MINVER#
  app_indicator_new@Base 0.2.91
  app_indicator_new_with_path@Base 0.2.91
  app_indicator_set_attention_icon@Base 0.2.91
+ app_indicator_set_attention_icon_full@Base 0.2.96
  app_indicator_set_icon@Base 0.2.91
+ app_indicator_set_icon_full@Base 0.2.96
  app_indicator_set_icon_theme_path@Base 0.2.91
  app_indicator_set_label@Base 0.2.91
  app_indicator_set_menu@Base 0.2.91
diff --git a/debian/libappindicator3-1.symbols b/debian/libappindicator3-1.symbols
index a4ceae6..03b5e24 100644
--- a/debian/libappindicator3-1.symbols
+++ b/debian/libappindicator3-1.symbols
@@ -2,8 +2,10 @@ libappindicator3.so.1 libappindicator3-1 #MINVER#
  app_indicator_build_menu_from_desktop@Base 0.2.92
  app_indicator_category_get_type@Base 0.2.92
  app_indicator_get_attention_icon@Base 0.2.92
+ app_indicator_get_attention_icon_desc@Base 0.2.96
  app_indicator_get_category@Base 0.2.92
  app_indicator_get_icon@Base 0.2.92
+ app_indicator_get_icon_desc@Base 0.2.96
  app_indicator_get_icon_theme_path@Base 0.2.92
  app_indicator_get_id@Base 0.2.92
  app_indicator_get_label@Base 0.2.92
@@ -15,7 +17,9 @@ libappindicator3.so.1 libappindicator3-1 #MINVER#
  app_indicator_new@Base 0.2.92
  app_indicator_new_with_path@Base 0.2.92
  app_indicator_set_attention_icon@Base 0.2.92
+ app_indicator_set_attention_icon_full@Base 0.2.96
  app_indicator_set_icon@Base 0.2.92
+ app_indicator_set_icon_full@Base 0.2.96
  app_indicator_set_icon_theme_path@Base 0.2.92
  app_indicator_set_label@Base 0.2.92
  app_indicator_set_menu@Base 0.2.92
diff --git a/debian/patches/disconnect-from-theme.patch b/debian/patches/disconnect-from-theme.patch
new file mode 100644
index 0000000..a60502c
--- /dev/null
+++ b/debian/patches/disconnect-from-theme.patch
@@ -0,0 +1,14 @@
+=== modified file 'src/app-indicator.c'
+Index: libappindicator.ubu/src/app-indicator.c
+===================================================================
+--- libappindicator.ubu.orig/src/app-indicator.c	2011-02-28 08:35:28.963390000 -0500
++++ libappindicator.ubu/src/app-indicator.c	2011-02-28 08:46:54.147065973 -0500
+@@ -667,6 +667,8 @@
+ 		priv->connection = NULL;
+ 	}
+ 
++	g_signal_handlers_disconnect_by_func(gtk_icon_theme_get_default(), G_CALLBACK(theme_changed_cb), self);
++
+ 	G_OBJECT_CLASS (app_indicator_parent_class)->dispose (object);
+ 	return;
+ }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..be957fd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+disconnect-from-theme.patch
+update-defs.patch
diff --git a/debian/patches/update-defs.patch b/debian/patches/update-defs.patch
new file mode 100644
index 0000000..56bbba2
--- /dev/null
+++ b/debian/patches/update-defs.patch
@@ -0,0 +1,169 @@
+Index: ubuntu/bindings/python/appindicator.defs
+===================================================================
+--- ubuntu.orig/bindings/python/appindicator.defs	2011-02-28 22:32:45.853399929 +0600
++++ ubuntu/bindings/python/appindicator.defs	2011-02-28 22:33:12.205528749 +0600
+@@ -33,7 +33,6 @@
+   )
+ )
+ 
+-
+ ;; From app-indicator.h
+ 
+ (define-function app_indicator_get_type
+@@ -62,57 +61,50 @@
+   )
+ )
+ 
+-(define-method set_label
++(define-method set_attention_icon
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_set_label")
++  (c-name "app_indicator_set_attention_icon_full")
+   (return-type "none")
+   (parameters
+-    '("const-gchar*" "label" (null-ok))
+-    '("const-gchar*" "guide" (null-ok) (default "NULL"))
++    '("const-gchar*" "icon_name")
++    '("const-gchar*" "icon_desc" (null-ok) (default "NULL"))
+   )
+ )
+ 
+-(define-method set_accessible_desc
++(define-method set_menu
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_set_accessible_desc")
++  (c-name "app_indicator_set_menu")
+   (return-type "none")
+   (parameters
+-    '("const-gchar*" "accessible_desc" (null-ok))
+-  )
+-)
+-
+-(define-method set_ordering_index
+-  (of-object "AppIndicator")
+-  (c-name "app_indicator_set_ordering_index")
+-  (parameters
+-    '("guint32" "ordering_index")
++    '("GtkMenu*" "menu")
+   )
+ )
+ 
+-(define-method set_attention_icon
++(define-method set_icon
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_set_attention_icon")
++  (c-name "app_indicator_set_icon_full")
+   (return-type "none")
+   (parameters
+     '("const-gchar*" "icon_name")
++    '("const-gchar*" "icon_desc" (null-ok) (default "NULL"))
+   )
+ )
+ 
+-(define-method set_menu
++(define-method set_label
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_set_menu")
++  (c-name "app_indicator_set_label")
+   (return-type "none")
+   (parameters
+-    '("GtkMenu*" "menu")
++    '("const-gchar*" "label" (null-ok))
++    '("const-gchar*" "guide" (null-ok) (default "NULL"))
+   )
+ )
+ 
+-(define-method set_icon
++(define-method set_ordering_index
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_set_icon")
+-  (return-type "none")
++  (c-name "app_indicator_set_ordering_index")
+   (parameters
+-    '("const-gchar*" "icon_name")
++    '("guint32" "ordering_index")
+   )
+ )
+ 
+@@ -143,46 +135,66 @@
+   (return-type "AppIndicatorStatus")
+ )
+ 
+-(define-method get_label
++(define-method get_icon
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_label")
++  (c-name "app_indicator_get_icon")
+   (return-type "const-gchar*")
+ )
+ 
+-(define-method get_label_guide
++(define-method get_icon_desc
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_label_guide")
++  (c-name "app_indicator_get_icon_desc")
+   (return-type "const-gchar*")
+ )
+ 
+-(define-method get_accessible_desc
++(define-method get_icon_theme_path
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_accessible_desc")
++  (c-name "app_indicator_get_icon_theme_path")
+   (return-type "const-gchar*")
+ )
+ 
+-(define-method get_ordering_index
++(define-method get_attention_icon
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_ordering_index")
+-  (return-type "guint32")
++  (c-name "app_indicator_get_attention_icon")
++  (return-type "const-gchar*")
+ )
+ 
+-(define-method get_icon
++(define-method get_attention_icon_desc
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_icon")
++  (c-name "app_indicator_get_attention_icon_desc")
+   (return-type "const-gchar*")
+ )
+ 
+-(define-method get_icon_theme_path
++(define-method get_menu
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_icon_theme_path")
++  (c-name "app_indicator_get_menu")
++  (return-type "GtkMenu*")
++)
++
++(define-method get_label
++  (of-object "AppIndicator")
++  (c-name "app_indicator_get_label")
+   (return-type "const-gchar*")
+ )
+ 
+-(define-method get_attention_icon
++(define-method get_label_guide
+   (of-object "AppIndicator")
+-  (c-name "app_indicator_get_attention_icon")
++  (c-name "app_indicator_get_label_guide")
+   (return-type "const-gchar*")
+ )
+ 
++(define-method get_ordering_index
++  (of-object "AppIndicator")
++  (c-name "app_indicator_get_ordering_index")
++  (return-type "guint32")
++)
+ 
++(define-method build_menu_from_desktop
++  (of-object "AppIndicator")
++  (c-name "app_indicator_build_menu_from_desktop")
++  (return-type "none")
++  (parameters
++    '("const-gchar*" "desktop_file")
++    '("const-gchar*" "desktop_profile")
++  )
++)
diff --git a/debian/rules b/debian/rules
index 3f266b0..a149c98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,7 @@ export CSC=/usr/bin/mono-csc
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 API_VERSION = 0.1
 
diff --git a/debian/watch b/debian/watch
index ffb0b21..2e00b43 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://launchpad.net/indicator-application/+download .*/indicator-application-([0-9.]+)\.tar\.gz
+http://launchpad.net/libappindicator/+download .*/libappindicator-([0-9.]+)\.tar\.gz
diff --git a/src/appindicator3-0.1.pc.in b/src/appindicator3-0.1.pc.in
index f59ac70..0ffe409 100644
--- a/src/appindicator3-0.1.pc.in
+++ b/src/appindicator3-0.1.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 bindir=@bindir@
 includedir=@includedir@
 
-Cflags: -I${includedir}/libappindicator3-0.1
+Cflags: -I${includedir}/libappindicator-0.1
 Requires: dbusmenu-glib-0.4 gtk+-3.0
 Libs: -L${libdir} -lappindicator3