From 3eb5a9db6be3012dd7ed7c1aaaadcfc9b58257d6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Mar 2011 13:35:16 -0600 Subject: debian/patches: Removed, all upstream --- debian/changelog | 3 +- debian/patches/disconnect-from-theme.patch | 14 --- debian/patches/series | 2 - debian/patches/update-defs.patch | 169 ----------------------------- 4 files changed, 2 insertions(+), 186 deletions(-) delete mode 100644 debian/patches/disconnect-from-theme.patch delete mode 100644 debian/patches/series delete mode 100644 debian/patches/update-defs.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 875295e..db645b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ libappindicator (0.2.97-0ubuntu1~ppa1) UNRELEASED; urgency=low * Fix crash when importing appindicator from Python (LP: #724917). * Fix crash when switching themes by disconnecting a signal from the theme on dispose. LP: #708188 + * debian/patches: Removed, all upstream - -- Ted Gould Thu, 03 Mar 2011 13:33:54 -0600 + -- Ted Gould Thu, 03 Mar 2011 13:35:03 -0600 libappindicator (0.2.96-0ubuntu4) natty; urgency=low diff --git a/debian/patches/disconnect-from-theme.patch b/debian/patches/disconnect-from-theme.patch deleted file mode 100644 index a60502c..0000000 --- a/debian/patches/disconnect-from-theme.patch +++ /dev/null @@ -1,14 +0,0 @@ -=== 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 deleted file mode 100644 index be957fd..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -disconnect-from-theme.patch -update-defs.patch diff --git a/debian/patches/update-defs.patch b/debian/patches/update-defs.patch deleted file mode 100644 index 56bbba2..0000000 --- a/debian/patches/update-defs.patch +++ /dev/null @@ -1,169 +0,0 @@ -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") -+ ) -+) -- cgit v1.2.3 From be0a541c8a33f32bfae86fe8e03ebb0245cf6602 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 3 Mar 2011 13:42:12 -0600 Subject: releasing version 0.2.97-0ubuntu1~ppa1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index db645b0..4c71987 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libappindicator (0.2.97-0ubuntu1~ppa1) UNRELEASED; urgency=low +libappindicator (0.2.97-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * Set includedir to the location of the headers provided by @@ -8,7 +8,7 @@ libappindicator (0.2.97-0ubuntu1~ppa1) UNRELEASED; urgency=low the theme on dispose. LP: #708188 * debian/patches: Removed, all upstream - -- Ted Gould Thu, 03 Mar 2011 13:35:03 -0600 + -- Ted Gould Thu, 03 Mar 2011 13:42:10 -0600 libappindicator (0.2.96-0ubuntu4) natty; urgency=low -- cgit v1.2.3