From 1da8653f7745fd81acd89ab6422160235264be81 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 4 Oct 2011 17:59:10 +0100 Subject: Respond to the 'FindServers' signal --- libdbusmenu-glib/server.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index 9c085f7..4890d37 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -54,6 +54,7 @@ struct _DbusmenuServerPrivate guint layout_idle; GDBusConnection * bus; + guint find_server_signal; GCancellable * bus_lookup; guint dbus_registration; @@ -191,6 +192,14 @@ static void bus_event (DbusmenuServer * server, static void bus_about_to_show (DbusmenuServer * server, GVariant * params, GDBusMethodInvocation * invocation); +static void find_servers_cb (GDBusConnection * connection, + const gchar * sender, + const gchar * path, + const gchar * interface, + const gchar * signal, + GVariant * params, + gpointer user_data); +static gboolean layout_update_idle (gpointer user_data); /* Globals */ static GDBusNodeInfo * dbusmenu_node_info = NULL; @@ -366,6 +375,7 @@ dbusmenu_server_init (DbusmenuServer *self) priv->layout_idle = 0; priv->bus = NULL; priv->bus_lookup = NULL; + priv->find_server_signal = 0; priv->dbus_registration = 0; default_text_direction(self); @@ -405,6 +415,11 @@ dbusmenu_server_dispose (GObject *object) priv->dbus_registration = 0; } + if (priv->find_server_signal != 0) { + g_dbus_connection_signal_unsubscribe(priv->bus, priv->find_server_signal); + priv->find_server_signal = 0; + } + if (priv->bus != NULL) { g_object_unref(priv->bus); priv->bus = NULL; @@ -706,12 +721,32 @@ bus_got_cb (GObject * obj, GAsyncResult * result, gpointer user_data) DbusmenuServerPrivate * priv = DBUSMENU_SERVER_GET_PRIVATE(user_data); priv->bus = bus; + priv->find_server_signal = g_dbus_connection_signal_subscribe(priv->bus, + NULL, /* sender */ + "com.canonical.dbusmenu", /* interface */ + "FindServers", /* member */ + NULL, /* object path */ + NULL, /* arg0 */ + G_DBUS_SIGNAL_FLAGS_NONE, /* flags */ + find_servers_cb, /* cb */ + user_data, /* data */ + NULL); /* free func */ + register_object(DBUSMENU_SERVER(user_data)); g_object_unref(G_OBJECT(user_data)); return; } +/* Respond to the find servers signal by sending an update + to the bus */ +static void +find_servers_cb (GDBusConnection * connection, const gchar * sender, const gchar * path, const gchar * interface, const gchar * signal, GVariant * params, gpointer user_data) +{ + layout_update_idle(user_data); + return; +} + /* Function for the GDBus vtable to handle all method calls and dish them out the appropriate functions */ static void -- cgit v1.2.3 From c60ab35eae0b3a41f78f95da84e21c604bc98d57 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 13 Oct 2011 17:03:01 -0500 Subject: Don't try to get objects from boolean values. Handle the 'always show image' property by getting the image from the object and using that --- libdbusmenu-gtk/parser.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c index e988c62..92932c5 100644 --- a/libdbusmenu-gtk/parser.c +++ b/libdbusmenu-gtk/parser.c @@ -1059,8 +1059,13 @@ widget_notify_cb (GtkWidget *widget, DBUSMENU_MENUITEM_PROP_VISIBLE, g_value_get_boolean (&prop_value)); } - else if (pspec->name == g_intern_static_string ("image") || - pspec->name == g_intern_static_string ("always-show-image")) + else if (pspec->name == g_intern_static_string ("always-show-image")) + { + GtkWidget *image = NULL; + g_object_get(widget, "image", &image, NULL); + update_icon (child, GTK_IMAGE(image)); + } + else if (pspec->name == g_intern_static_string ("image")) { GtkWidget *image; image = GTK_WIDGET (g_value_get_object (&prop_value)); -- cgit v1.2.3 From 92260cc52ca3d6325d7927ef2c119d11fb729668 Mon Sep 17 00:00:00 2001 From: Alex Launi Date: Wed, 26 Oct 2011 11:14:59 -0400 Subject: Remove test-glib-proxy from XFAIL list --- tests/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a4e8682..935e0f9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -29,9 +29,6 @@ TESTS += \ test-gtk-parser-test endif -XFAIL_TESTS = \ - test-glib-proxy - # The Python test only work on the system copy of # dbusmenu, so while they can be usefule they're not # good tests of what you're currently building. Handy -- cgit v1.2.3 From 1b83b3b0758d29d94a1e404f551939ea1885ad76 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Thu, 10 Nov 2011 17:49:27 -0500 Subject: make sure to cancel an idle callback when the object dies --- libdbusmenu-gtk/client.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 38b6a75..533764a 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -505,7 +505,6 @@ menu_item_stop_activating(DbusmenuMenuitem * mi) guint id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(parent), data_idle_close_id)); if (id > 0) { - g_source_remove(id); g_object_set_data(G_OBJECT(parent), data_idle_close_id, GINT_TO_POINTER(0)); should_close = TRUE; @@ -574,6 +573,14 @@ close_in_idle (DbusmenuMenuitem * mi) return FALSE; } +static void +cancel_idle_close_id (gpointer data) +{ + guint id = GPOINTER_TO_INT(data); + if (id > 0) + g_source_remove(id); +} + static void submenu_notify_visible_cb (GtkWidget * menu, GParamSpec * pspec, DbusmenuMenuitem * mi) { @@ -591,8 +598,8 @@ submenu_notify_visible_cb (GtkWidget * menu, GParamSpec * pspec, DbusmenuMenuite data_idle_close_id)); if (id == 0) { id = g_idle_add((GSourceFunc)close_in_idle, mi); - g_object_set_data(G_OBJECT(mi), data_idle_close_id, - GINT_TO_POINTER(id)); + g_object_set_data_full(G_OBJECT(mi), data_idle_close_id, + GINT_TO_POINTER(id), cancel_idle_close_id); } } } -- cgit v1.2.3 From 0f7fdf8d2c567a641083646a43e6ebec1faf9078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Mon, 21 Nov 2011 03:52:39 +0100 Subject: Use different directory for headers of gtk3 library --- libdbusmenu-gtk/Makefile.am | 2 +- libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index b4564d1..7860433 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -33,7 +33,7 @@ glib_enum_headers = $(srcdir)/genericmenuitem.h # Include Directory ##################### -libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-gtk$(VER)/ +libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu$(VER)-0.4/libdbusmenu-gtk/ libdbusmenu_gtkinclude_HEADERS = \ dbusmenu-gtk.h \ diff --git a/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in b/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in index c297db3..c320a57 100644 --- a/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in +++ b/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -Cflags: -I${includedir}/libdbusmenu-0.4 +Cflags: -I${includedir}/libdbusmenu3-0.4 Requires: dbusmenu-glib-0.4 gdk-pixbuf-2.0 gtk+-3.0 Libs: -L${libdir} -ldbusmenu-gtk3 -- cgit v1.2.3 From 144708e6667818d48e3bbd9403e447079e8a5c56 Mon Sep 17 00:00:00 2001 From: Luke Yelavich Date: Tue, 13 Dec 2011 10:56:56 +1100 Subject: Add a new property DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC, to set an alternative label for a menu item. This alternative label is only used for assistive technologies such as Orca. It is particularly useful for menu items where an icon is used to present further information to the user, in which case this property can be used to give a textual description of the icon. --- configure.ac | 2 ++ libdbusmenu-glib/client.c | 3 ++- libdbusmenu-glib/defaults.c | 1 + libdbusmenu-glib/menuitem.h | 12 ++++++++++++ libdbusmenu-gtk/client.c | 6 ++++++ 5 files changed, 23 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ba5cd4b..ed6080e 100644 --- a/configure.ac +++ b/configure.ac @@ -73,6 +73,7 @@ AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"]) AS_IF([test "x$enable_gtk" != "xno"],[ AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + atk glib-2.0 >= $GLIB_REQUIRED_VERSION, [have_gtk=yes] ) @@ -80,6 +81,7 @@ AS_IF([test "x$with_gtk" = x3], ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION + atk glib-2.0 >= $GLIB_REQUIRED_VERSION, [have_gtk=yes] ) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 9129db5..a2330d1 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -331,7 +331,7 @@ dbusmenu_client_class_init (DbusmenuClientClass *klass) return; } -#define LAYOUT_PROPS_COUNT 5 +#define LAYOUT_PROPS_COUNT 6 static void dbusmenu_client_init (DbusmenuClient *self) @@ -359,6 +359,7 @@ dbusmenu_client_init (DbusmenuClient *self) layout_props[2] = DBUSMENU_MENUITEM_PROP_VISIBLE; layout_props[3] = DBUSMENU_MENUITEM_PROP_ENABLED; layout_props[4] = DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY; + layout_props[5] = DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC; layout_props[LAYOUT_PROPS_COUNT] = NULL; priv->layout_props = g_variant_new_strv((const gchar * const *)layout_props, LAYOUT_PROPS_COUNT); g_variant_ref_sink(priv->layout_props); diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c index a5caf0b..10a9115 100644 --- a/libdbusmenu-glib/defaults.c +++ b/libdbusmenu-glib/defaults.c @@ -88,6 +88,7 @@ dbusmenu_defaults_init (DbusmenuDefaults *self) dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_SHORTCUT, G_VARIANT_TYPE("aas"), NULL); dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY, G_VARIANT_TYPE_STRING, NULL); dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_DISPOSITION, G_VARIANT_TYPE_STRING, g_variant_new_string(DBUSMENU_MENUITEM_DISPOSITION_NORMAL)); + dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC,G_VARIANT_TYPE_STRING, NULL); /* Separator defaults */ dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_SEPARATOR, DBUSMENU_MENUITEM_PROP_VISIBLE, G_VARIANT_TYPE_BOOLEAN, g_variant_new_boolean(TRUE)); diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h index 985e1a3..ea455ac 100644 --- a/libdbusmenu-glib/menuitem.h +++ b/libdbusmenu-glib/menuitem.h @@ -153,6 +153,18 @@ G_BEGIN_DECLS * libdbusmenu-gtk library is used with the function dbusmenu_menuitem_property_set_image() */ #define DBUSMENU_MENUITEM_PROP_ICON_DATA "icon-data" +/** + * DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC: + * + * #DbusmenuMenuitem property used to provide a textual description of any + * information that the icon may convey. The contents of this property are + * passed through to assistive technologies such as the Orca screen reader. + * The contents of this property will not be visible in the menu item. If + * this property is set, Orca will use this property instead of the label + * property. + * Type: #G_VARIANT_TYPE_STRING + */ +#define DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC "accessible-desc" /** * DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE: * diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 533764a..7390fb1 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -32,6 +32,7 @@ License version 3 and version 2.1 along with this program. If not, see #include #include +#include #include "client.h" #include "menuitem.h" @@ -745,6 +746,9 @@ menu_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * variant, Db process_submenu(mi, gmi, variant, gtkclient); } else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_DISPOSITION)) { process_disposition(mi, gmi, variant, gtkclient); + } else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC)) { + atk_object_set_name(gtk_widget_get_accessible(GTK_WIDGET(gmi)), variant == NULL ? NULL : + g_variant_get_string(variant, NULL)); } return; @@ -890,6 +894,8 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * process_toggle_state(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE)); process_submenu(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY), client); process_disposition(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_DISPOSITION), client); + atk_object_set_name(gtk_widget_Get_accessible(GTK_WIDGET)gmi)), + g_variant_get_string(dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC))); refresh_shortcut(client, item); /* Oh, we're a child, let's deal with that */ -- cgit v1.2.3 From eeec7125a77a0af500ca7461bdf497962b9601b5 Mon Sep 17 00:00:00 2001 From: Alex Launi Date: Fri, 16 Dec 2011 15:24:53 -0500 Subject: Merge debian of lp:~ubuntu-desktop/dbusmenu/ubuntu --- debian/changelog | 1177 +++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 243 ++++++ debian/copyright | 40 + debian/gir1.2-dbusmenu-glib-0.4.install | 1 + debian/gir1.2-dbusmenu-gtk-0.4.install | 1 + debian/gir1.2-dbusmenu-gtk3-0.4.install | 1 + debian/libdbusmenu-glib-dev.install | 6 + debian/libdbusmenu-glib-doc.install | 1 + debian/libdbusmenu-glib4.install | 1 + debian/libdbusmenu-glib4.symbols | 80 ++ debian/libdbusmenu-gtk-dev.install | 6 + debian/libdbusmenu-gtk-doc.install | 1 + debian/libdbusmenu-gtk3-4.install | 1 + debian/libdbusmenu-gtk3-4.symbols | 36 + debian/libdbusmenu-gtk3-dev.install | 6 + debian/libdbusmenu-gtk4.install | 1 + debian/libdbusmenu-gtk4.symbols | 36 + debian/libdbusmenu-jsonloader-dev.install | 4 + debian/libdbusmenu-jsonloader4.install | 1 + debian/libdbusmenu-jsonloader4.symbols | 3 + debian/libdbusmenu-tools.install | 3 + debian/rules | 44 ++ debian/source/format | 1 + debian/watch | 2 + 25 files changed, 1697 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/gir1.2-dbusmenu-glib-0.4.install create mode 100644 debian/gir1.2-dbusmenu-gtk-0.4.install create mode 100644 debian/gir1.2-dbusmenu-gtk3-0.4.install create mode 100644 debian/libdbusmenu-glib-dev.install create mode 100644 debian/libdbusmenu-glib-doc.install create mode 100644 debian/libdbusmenu-glib4.install create mode 100644 debian/libdbusmenu-glib4.symbols create mode 100644 debian/libdbusmenu-gtk-dev.install create mode 100644 debian/libdbusmenu-gtk-doc.install create mode 100644 debian/libdbusmenu-gtk3-4.install create mode 100644 debian/libdbusmenu-gtk3-4.symbols create mode 100644 debian/libdbusmenu-gtk3-dev.install create mode 100644 debian/libdbusmenu-gtk4.install create mode 100644 debian/libdbusmenu-gtk4.symbols create mode 100644 debian/libdbusmenu-jsonloader-dev.install create mode 100644 debian/libdbusmenu-jsonloader4.install create mode 100644 debian/libdbusmenu-jsonloader4.symbols create mode 100644 debian/libdbusmenu-tools.install create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..4428c75 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,1177 @@ +libdbusmenu (0.5.1-0ubuntu2) precise; urgency=low + + * libdbusmenu-gtk/parser.c + - Don't try to get objects from boolean values. Handle the + 'always show image' property by getting the image from the object + and using that (LP: #870742) + + -- Ken VanDine Thu, 01 Dec 2011 11:07:36 -0500 + +libdbusmenu (0.5.1-0ubuntu1) precise; urgency=low + + * New upstream release. + * Allow for an ID of 0 in about_to_show for indicators (LP: #862989) + * Clear the image pointer when we take it + * Ensure we drop all references to the GTK widget when a menuitem + gets destroyed (LP: #835646) + + -- Ted Gould Fri, 28 Oct 2011 09:35:13 -0400 + +libdbusmenu (0.5.0-1ubuntu1) precise; urgency=low + + * Multiarch conversion (partial, gobject instrospection not touched) + (LP: #859512) + + -- Riku Voipio Mon, 26 Sep 2011 12:13:07 +0300 + +libdbusmenu (0.5.0-1) experimental; urgency=low + + * Merge from Ubuntu. + + Re-enable GTK3 packages. + * Re-order includes in debian/rules to prevent lintian's + E: libdbusmenu source: temporary-debhelper-file + + -- Evgeni Golov Sat, 15 Oct 2011 09:29:54 +0200 + +libdbusmenu (0.5.0-0ubuntu3) oneiric; urgency=low + + * libdbusmenu-gtk/client.c: + - Make sure to actually free memory associated with GtkMenuItems we + create. We are holding the sunk floating ref, so we have to + actually unref as well as destroy the widget. Part of bug 835646. + * libdbusmenu-gtk/genericmenuitem.c: + - When setting an image on a menu item for the second time before + setting a label, don't try to use free'd memory. + + -- Michael Terry Thu, 06 Oct 2011 10:35:21 -0400 + +libdbusmenu (0.5.0-0ubuntu2) oneiric; urgency=low + + * libdbusmenu-glib/client.c + - id of 0 in dbusmenu_client_send_about_to_show is valid, and used in + appindicators like nm-applet (LP: #862989) + + -- Ken VanDine Fri, 30 Sep 2011 10:06:19 -0400 + +libdbusmenu (0.5.0-0ubuntu1) oneiric; urgency=low + + * New upstream release. + * Protect functions against NULL results (LP: #757569, LP: #742909, + LP: #743050, LP: #743661) + + -- Ted Gould Thu, 29 Sep 2011 14:46:57 -0500 + +libdbusmenu (0.4.94-0ubuntu1) oneiric; urgency=low + + [ Ted Gould ] + * New upstream release. + ∘ Protect functions from NULL submenus (LP: #803667) + ∘ Build fixes (LP: #552526, LP: #552530, LP: #552538, LP: #709761, + LP: #713690, LP: #643871, LP: #713685) + + [ Ken VanDine ] + * debian/control + - build dep on valac-0.14 + + -- Ken VanDine Tue, 20 Sep 2011 09:16:41 -0700 + +libdbusmenu (0.4.93-0ubuntu1) oneiric; urgency=low + + * New upstream release. + * Fix packing of generic menu items to use toggle-spacing + + -- Ted Gould Thu, 25 Aug 2011 09:50:21 -0500 + +libdbusmenu (0.4.92-0ubuntu1) oneiric; urgency=low + + [ Ted Gould ] + * New upstream release (0.4.92). + * Add in a property for setting the menuitem disposition + * Fix GTK 2 build for style properties + * Fixed proxied menu events not getting returned (LP: #799878) + * Removed debian/patches: + * All upstream + + [ Ken VanDine ] + * debian/libdbusmenu-gtk4.symbols debian/libdbusmenu-gtk3-4.symbols + - Added new symbols + + -- Ken VanDine Wed, 24 Aug 2011 20:22:14 -0400 + +libdbusmenu (0.4.90-0ubuntu4) oneiric; urgency=low + + * debian/rules: + - avoid making indicator-appmenu* depends on gtk2/3 by dpkg-shlibdeps. + The library doesn't hurt if gtk isn't installed and that enable + pre-installlation of the indicator stack without requiring the full gtk + stack being there without any gtk app installed. + + -- Didier Roche Mon, 25 Jul 2011 18:18:11 +0200 + +libdbusmenu (0.4.90-0ubuntu3) oneiric; urgency=low + + * debian/patches/lp799878.patch + - Fixed proxied menu events not getting returned (LP: #799878) + + -- Ken VanDine Tue, 28 Jun 2011 17:53:31 +0100 + +libdbusmenu (0.4.90-0ubuntu2) oneiric; urgency=low + + * debian/control + - Also a a breaks to libdbusmenu-glib4 for gir1.2-unity-3.0 and + gir1.2-indicate-0.5 to make sure the library gets held back too. + + -- Ken VanDine Fri, 24 Jun 2011 16:05:56 -0400 + +libdbusmenu (0.4.90-0ubuntu1) oneiric; urgency=low + + [ Ted Gould ] + * debian/control, debian/*: Renaming packages for library version + bump from 3 to 4. + * New upstream release. + * Fixing visibility for Eclipse (LP: #770263 and LP: #618587) + * Unseting a GValue properly (LP: #785828) + * Memory leaks for GVariant usage (LP: #784890) + * Making GTK 3 default build + * Removing the SerializableMenuitem object + * debian/rules: Making GTK2 the special build + + [ Ken VanDine ] + * +debian/libdbusmenu-jsonloader4.symbols + * debian/*.symbols + - Fixed sonames and removed all the duplicate symbols + * debian/*.install, debian/rules + - Use cdbs to do the dual builds for gtk2/gtk3 + * debian/control + - Updated standards version to 3.9.2 + - Set version on the json-glib build depends to >= 0.13.4 + - Make gir1.2-dbusmenu-glib-0.4 break gir1.2-unity-3.0 and + gir1.2-indicate-0.5 built against older versions of dbusmenu to + prevent breakage in python apps that use gir loading multiple versions + of dbusmenu-glib + + -- Ken VanDine Fri, 24 Jun 2011 14:55:59 -0400 + +libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low + + * New upstream release. + - Fix a typo in the signal name to make it match the XML + files (LP: #641209) + - Ref'ing the server for the entire time we're getting the + bus (LP: #738568) + - Watch additions/removals from submenus that get added + - Activate new toplevel menu items as they get added + - Make sure we don't activate toplevel children that aren't + menu items or don't have submenus (LP: #761112) + + -- Ted Gould Mon, 25 Apr 2011 15:19:25 -0500 + +libdbusmenu (0.4.3-1) unstable; urgency=low + + * Merge new upstream release from Ubuntu. + * Do not build-depend on gir-repository-dev, libgtk2.0-dev + has Gtk-2.0.gir since 2.24.4-1 (bump B-D accordingly). + * Standards-Version: 3.9.2 + + -- Evgeni Golov Wed, 27 Apr 2011 14:00:04 +0200 + +libdbusmenu (0.4.3-0ubuntu3) natty; urgency=low + + * Backport bug fixes from trunk: + - Fix a typo in the signal name to make it match the XML + files (LP: #641209) + - Ref'ing the server for the entire time we're getting the + bus (LP: #738568) + + -- Ken VanDine Tue, 19 Apr 2011 15:14:23 -0400 + +libdbusmenu (0.4.3-0ubuntu2) natty; urgency=low + + * Backport bug fixes from trunk: + - Watch additions/removals from submenus that get added + - Activate new toplevel menu items as they get added + - Make sure we don't activate toplevel children that aren't + menu items or don't have submenus (LP: #761112) + + -- Michael Terry Fri, 15 Apr 2011 15:55:37 -0400 + +libdbusmenu (0.4.3-0ubuntu1) natty; urgency=low + + [ Ken VanDine ] + * debian/rules + - Fixed package names in build targets (LP: #760102) + - Dropped makeshlibs in favor of symbols files + * +debian/libdbusmenu-glib3.symbols + * +debian/libdbusmenu-gtk3-3.symbols + * +debian/libdbusmenu-gtk3.symbols + + [ Ted Gould ] + * New upstream release. + ∘ Handle cases where labels are added later as subwidgets + in the menuitem (LP: #758759) + ∘ Fix the destruction of the attached GTK menuitem (LP: #746091) + ∘ Guard against an activation that does not actually have an + associated menu-hide (LP: #750588) + + -- Ted Gould Thu, 14 Apr 2011 16:49:13 -0500 + +libdbusmenu (0.4.2-1) unstable; urgency=low + + * Merge new upstream release from Ubuntu. + + -- Evgeni Golov Mon, 11 Apr 2011 12:43:49 +0200 + +libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low + + * Merged fix, guard against an activation that does not actually have + an associated menu-hide (LP: #750588) + + -- Ken VanDine Mon, 11 Apr 2011 00:56:02 -0400 + +libdbusmenu (0.4.2-0ubuntu2) natty; urgency=low + + * debian/libdbusmenu-gtk3-dev.install: + - Add missing header files to gtk3 dev package + + -- Michael Terry Thu, 07 Apr 2011 20:20:25 -0400 + +libdbusmenu (0.4.2-0ubuntu1) natty; urgency=low + + * New upstream release. + * Fix GIR scan to not include duplicate namespaces (LP: #750575) + * Keep refs to the client and makes sure to disconnect all handlers. + (LP: #749609) + * Add GTK side handlers for the open/close events to ensure GTK apps + can use those events still (LP: #750588) + * Create submenus for menuitems that don't have children but still + have told us they need them with the child-display property. + (LP: #619811) + + -- Ted Gould Thu, 07 Apr 2011 10:32:51 -0500 + +libdbusmenu (0.4.1-0ubuntu1) natty; urgency=low + + * New upstream release. + * Managed variant iterators better to stop crash when dealing + with apps that have multiple shortcuts (LP: #741726) + * Handled GtkMenuItems with no labels as separators (LP: #729187) + + -- Ted Gould Thu, 31 Mar 2011 13:56:54 -0500 + +libdbusmenu (0.4.0-2) unstable; urgency=low + + * Build-depend on gir1.2-atk-1.0, it's not pulled in by gir1.2-gtk-2.0 + on ia64, mipsel and sparc64, causing FTBFS there. + + -- Evgeni Golov Wed, 30 Mar 2011 10:16:59 +0200 + +libdbusmenu (0.4.0-1) unstable; urgency=low + + * Merge new upstream release from Ubuntu. + This builds with gir-1.2 and thus closes: #614490. + Also builds fine with --as-needed, closes: #615741. + * Disable GTK3 packages for now. + * Fix DEB_DH_MAKESHLIBS_ARGS_* for the latest SONAME bump. + * Also fix cdbs targets for it. + * Use valac-0.10, valac-0.12 is only in experimental. + * Add gir-repository-dev back to Build-Depends, + it still has Gtk-2.0.gir on Debian. + + -- Evgeni Golov Fri, 25 Mar 2011 15:55:16 +0100 + +libdbusmenu (0.4.0-0ubuntu2) natty; urgency=low + + * Cherry picked fix for potential memory issues to fix unity-panel-service + crashed with SIGABRT in __kernel_vsyscall() (LP: #741726) + + -- Ken VanDine Mon, 28 Mar 2011 14:56:59 -0400 + +libdbusmenu (0.4.0-0ubuntu1) natty; urgency=low + + * New upstream release. + * Protect from NULL variants by using iter_loop (LP: #737844) + * Look for accellerators inside the labels as well + * Protecting properties that are getting updated from an + extra remove signal. (LP: #730925) + * Enter and exit the GDK threads before calling GTK (LP: #717162) + + -- Ted Gould Wed, 23 Mar 2011 14:56:24 -0500 + +libdbusmenu (0.3.102-0ubuntu1) natty; urgency=low + + * New upstream release. + ∘ Remove child items when they're removed by GTK + ∘ Adding opened and closed events for menu visibility + ∘ Handle empty image types + ∘ Remove critical warning on parser menuitem check (LP: #733918) + ∘ Fix dependencies in pkgconfig files (LP: #733263) + ∘ Handle NULL labels (LP: #733688) + ∘ Fix memory leaks from variants (LP: #722972) + + -- Ted Gould Wed, 16 Mar 2011 14:08:13 -0500 + +libdbusmenu (0.3.101-0ubuntu1) natty; urgency=low + + * New upstream release. + ∘ Add helper to get cached menuitem from widget + ∘ Have the GTK Dbusmenu Client handle theme directories (LP: #727325) + ∘ Fix a bunch of memory leaks (LP: #722972) + ∘ Handle _ in menuitems more correctly when parsing (LP: #621301) + ∘ Protect from NULL layout_props (LP: #729722) + ∘ Remove the property from the hashtable before signaling that + it's been changed (LP: #725603) + ∘ Wrap emitted properties in a variant + ∘ Fix enum templates so they can be included by other programs + without error + ∘ Setting the cached menu item (LP: #723463) (LP: #729128) (LP: #729194) + + -- Ted Gould Thu, 10 Mar 2011 11:12:50 -0600 + +libdbusmenu (0.3.100-0ubuntu4) natty; urgency=low + + * libdbusmenu-gtk/parser.c + - Ensure we set the CACHED_MENUITEM data on GtkWidget's, this fixes a few + bugs (LP: #723463) (LP: #729128) (LP: #729194) + + -- Ken VanDine Tue, 08 Mar 2011 20:49:41 -0500 + +libdbusmenu (0.3.100-0ubuntu3) natty; urgency=low + + * libdbusmenu-glib/menuitem.c + - Steal earlier instead of later so that signal handlers don't find the + value in the hashtable (LP: #725603) (LP: #730198) + + -- Ken VanDine Mon, 07 Mar 2011 14:27:09 -0500 + +libdbusmenu (0.3.100-0ubuntu2) natty; urgency=low + + * Cherry picked fix for path to find types.h + + -- Ken VanDine Fri, 04 Mar 2011 10:22:36 -0500 + +libdbusmenu (0.3.100-0ubuntu1) natty; urgency=low + + * New upstream release. + * GTK application menus are not correctly displayed (LP: #726678) + * Fix LP: #723873 - ensure that changing a menuitem property to a + default value gets propagated properly in the client + * Fix some crashes by disconnecting more signals when a menuitem is + deleted. LP: #725980 and LP: #726153 + * Making sure to grab the variant and dispose of it in handle_event. + * Change the destroy prototype to fix GIR warnings + * Fix emitting property changes to use tuples + * Track the icon theme directories + * Handle cases where passed in property names could be in the + properties hash table + * Making property names match DBus protocol recommendations + * Restricting GIR scanner to exported interfaces + * Use the library i18n libraries instead of the app ones + * Make GetLayout use the parent parameter + * debian/patches: All submitted upstream + + -- Ted Gould Thu, 03 Mar 2011 13:54:31 -0600 + +libdbusmenu (0.3.99-0ubuntu5) natty; urgency=low + + * debian/patches/lp726678.patch + - GTK application menus are not correctly displayed (LP: #726678) + + -- Ken VanDine Tue, 01 Mar 2011 12:14:35 -0500 + +libdbusmenu (0.3.99-0ubuntu4) natty; urgency=low + + * Fix a warning in gedit + - update debian/patches/fix-defaults-in-client.patch + * Fix missing submenus in bluetooth-applet + - add debian/patches/bluetooth-applet-fix.patch + - update debian/patches/series + + -- Chris Coulson Tue, 01 Mar 2011 15:13:00 +0000 + +libdbusmenu (0.3.99-0ubuntu3) natty; urgency=low + + * Fix LP: #723873 - ensure that changing a menuitem property to a default + value gets propagated properly in the client + - add debian/patches/fix-defaults-in-client.patch + - update debian/patches/series + + -- Chris Coulson Tue, 01 Mar 2011 00:47:24 +0000 + +libdbusmenu (0.3.99-0ubuntu2) natty; urgency=low + + * debian/patches/disconnect-more-signals.patch: + - Fix some crashes by disconnecting more signals when a menuitem is + deleted. LP: #725980 and LP: #726153 + + -- Michael Terry Mon, 28 Feb 2011 10:09:57 -0500 + +libdbusmenu (0.3.99-0ubuntu1) natty; urgency=low + + [ Ted Gould ] + * New upstream release. + * Add a signal on the menuitem for generic event support + * Handle the case of a single NULL entry as well. + * Not checking defaults when value is NULL + * Add the 'type' variable first when processing new + menuitems + * Protection from unref'ing NULL variants + * Only send the requested properties and request fewer + * Add in a defaults database + * Only send property updates if the menu item has been + seen on the bus. + * Add a property for text direction. + * Add a property for needing attention. + * Documentation fixes + * Making menuitems track their own parents + * Resolving property changes by looking at the properties + directly. + + [ Ken VanDine ] + * libdbusmenu-glib/menuitem.c + - Making sure to grab the variant and dispose of it in handle_event. + + -- Ken VanDine Thu, 24 Feb 2011 22:54:54 -0500 + +libdbusmenu (0.3.98-0ubuntu4) natty; urgency=low + + * Merged from trunk (rev 220) + - Cleaning up cleaning up so we don't unref twice and crash + - Fixing the signatures to make them more consistent + - Adding defaults to translatable files + - Support a set of defaults and not sending them over the bus. + - Fixing annotations and adding tests with python. + + -- Ken VanDine Wed, 23 Feb 2011 11:34:57 -0500 + +libdbusmenu (0.3.98-0ubuntu3) natty; urgency=low + + * debian/control: + - Use new libgtk-3-dev build-depends + + -- Robert Ancell Tue, 22 Feb 2011 16:16:44 +1100 + +libdbusmenu (0.3.98-0ubuntu2) natty; urgency=low + + * libdbusmenu-glib/{client,menuitem,server}.c + * Be more selective on unref + + -- Ken VanDine Tue, 22 Feb 2011 09:23:38 -0500 + +libdbusmenu (0.3.98-0ubuntu1) natty; urgency=low + + * New upstream release. + ∘ Fixing distcheck + ∘ Grouping Property Change events into a single DBus signal + ∘ Removing XML from the GetLayout function + ∘ Clean up icon handling in the parser (LP: #715864) + ∘ Fixing signatures on dbusmenu-dumper + * debian/control: Removing libxml2 Build-Dep + + -- Ted Gould Thu, 17 Feb 2011 11:11:40 -0600 + +libdbusmenu (0.3.97-0ubuntu1) natty; urgency=low + + [Ted Gould] + * New upstream release. + ∘ Handle ChildAdded on GtkShell items (LP: #709839) + ∘ Fixing take_children() to not unref + ∘ Fix naming of the GIR file (LP: #713099) + + [Ken VanDine] + * debian/gir1.2-dbusmenu-glib-0.4.install, + debian/libdbusmenu-glib-dev.install: Changing gir, typelib and vala + file names + + -- Ted Gould Thu, 10 Feb 2011 14:40:14 -0600 + +libdbusmenu (0.3.96-0ubuntu3) natty; urgency=low + + * libdbusmenu-gtk/parser.c + - Handle ChildAdded on GtkShell items and clean up the code so that it + has single functions for doing common operations. (LP: #709839) + + -- Ken VanDine Mon, 07 Feb 2011 09:29:09 -0500 + +libdbusmenu (0.3.96-0ubuntu2) natty; urgency=low + + * libdbusmenu-glib/menuitem.c + - take_children() shouldn't unref as the caller wouldn't get a chance + to use the items if this was the last ref. + + -- Ken VanDine Fri, 04 Feb 2011 12:18:13 -0500 + +libdbusmenu (0.3.96-0ubuntu1) natty; urgency=low + + * New upstream release. + * Remove signal handlers for correct objects + + -- Ted Gould Thu, 03 Feb 2011 14:11:16 -0600 + +libdbusmenu (0.3.95-0ubuntu1) natty; urgency=low + + * New upstream release. + * Fix crashes on rapidly creating and destroying client + and menu objects (LP: #709754) + * Fix dynamically changed submenus to get the parsed + (LP: #696896) + * Fix bad signature on GetProperties with no hits + + -- Ted Gould Mon, 31 Jan 2011 16:03:06 -0600 + +libdbusmenu (0.3.94-0ubuntu1) natty; urgency=low + + * New upstream release. + * Fixing setting toggle to a boolean + * Fixing some memory leaks + * Fixing signatures in GetChildren + * Look for the serializable menuitems and use their + build functions + * Fix critical message from being printed + * Fixing shutdown messages on destruction + * Fixing warnings from 'use-fallback' + * Adding a parser + * Adding a serializable menu item + + -- Ted Gould Thu, 27 Jan 2011 14:26:19 -0600 + +libdbusmenu (0.3.93-0ubuntu1) natty; urgency=low + + [ Ted Gould ] + * New upstream release. + * Fixing scanner export + * Increasing scanner warnings + * Signalling to DBus when object is registered + * Handling errors in GVariant better than crashing + + [ Ken VanDine ] + * debian/control + - Bumped build depends for libgtk3.0-dev to >= 2.99.2-1ubuntu2, a gir + related patch we needed was dropped in 2.99.2-1ubuntu1 but re-added + in 2.99.2-1ubuntu2 + + -- Ken VanDine Thu, 20 Jan 2011 15:05:52 -0500 + +libdbusmenu (0.3.92-0ubuntu3) natty; urgency=low + + * libdbusmenu-glib/server.c + * Better error handling when parsing g_variants (LP: #703039) + + -- Ken VanDine Tue, 18 Jan 2011 12:19:37 -0500 + +libdbusmenu (0.3.92-0ubuntu2) natty; urgency=low + + * libdbusmenu-glib/Makefile.am, libdbusmenu-gtk/Makefile.am + - Use EXPORT_PACKAGES to prevent circular build depends + + -- Ken VanDine Tue, 18 Jan 2011 10:05:15 -0500 + +libdbusmenu (0.3.92-0ubuntu1) natty; urgency=low + + * New upstream release. + * Fixing handle event to send unboxed values + * Build fixes + + -- Ted Gould Fri, 14 Jan 2011 10:43:44 -0600 + +libdbusmenu (0.3.91-0ubuntu1) natty; urgency=low + + * New upstream release. + * Porting from dbus-glib to GDBus + * Bumping the library ABI version + * debian/*.install: Changing to be the 0.4 version of the dbusmenu + API of all the filenames and paths. + * debian/control: Bumping ABI version in package names + * debian/control: Changing the GIR package names from "0.2" to + "0.4" which now the names of the actual files. + + -- Ted Gould Thu, 13 Jan 2011 10:24:28 -0600 + +libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low + + * Updated for the gir abi transition + + -- Ken VanDine Thu, 16 Dec 2010 10:06:26 -0500 + +libdbusmenu (0.3.90-0ubuntu2) natty; urgency=low + + * libdbusmenu-gtk/genericmenuitem.c + - Switching away from using set_activate as that doesn't actually set + the value, it just signals + + -- Ken VanDine Thu, 09 Dec 2010 17:46:41 -0500 + +libdbusmenu (0.3.90-0ubuntu1) natty; urgency=low + + * debian/rules + - Added build targets to build with gtk3 enabled in additional to + default build with gtk2 + * debian/control + - Updated build depends to support building with gtk+-3.0 + - Added dh-autoreconf build depends + - Added libdbusmenu-gtk3-2, libdbusmenu-gtk3-dev, gir1.0-dbusmenu-gtk3-0.2 + binaries + - build depend on libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed + for GIR fixes + - Removed build depends for gir-repository-dev (LP: #677382) + - Use gir:Depends + * docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am, + libdbusmenu-gtk/Makefile.am + - Fixes needed for building with-gtk=3 + + [ Ted Gould ] + * New upstream release. + * Breaking ABI and getting reserved back + * Adding build support for GTK2/3 builds + * Only force a flush of top level items, allow others to be + based on the count. + * debian/control, debian/libdbusmenu-glib2.install, + debian/libdbusmenu-gtk2.install: Switching package names to + match .so bump. + + -- Ken VanDine Wed, 24 Nov 2010 12:05:39 -0500 + +libdbusmenu (0.3.16-0ubuntu1) maverick; urgency=low + + * New upstream release: + * Don't use a typedef in the signal handler in the class to + avoid confusing vapigen. + + -- Ted Gould Wed, 22 Sep 2010 10:28:01 -0500 + +libdbusmenu (0.3.15-0ubuntu1) UNRELEASED; urgency=low + + * New upstream release: + - fix Action for top-level dropdown menu item not activated (LP: #637692) + + -- Didier Roche Wed, 22 Sep 2010 14:55:44 +0200 + +libdbusmenu (0.3.14-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Fixing a memory leak by unref'ing a hashtable + * Making a callback for the event dbus function happen off + of the mainloop so it returns a response. (LP: #636756) + + -- Ted Gould Wed, 15 Sep 2010 11:36:09 -0500 + +libdbusmenu (0.3.13-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Handling window grabs on activated signals (LP: #633275) + * Fixing the passing of the value to the results signal + * Adding a test for checking event results signal + * Changing the timeouts on event calls for better detection + of failing applications + + [Ken VanDine] + * debian/control + - Dropped build depends for dbus-test-runner, it isn't in the archive + yet, we should add that next cycle + + -- Ted Gould Thu, 09 Sep 2010 09:50:15 -0500 + +libdbusmenu (0.3.12-0ubuntu1) maverick; urgency=low + + * debian/rules: update the shlibs + + [ Ted Gould ] + * New upstream release. + * Support activation of menus client side + * Increase layout XML size (LP: #621238) + * Display an event for the status of the signal to the server + + -- Sebastien Bacher Thu, 26 Aug 2010 23:34:45 +0200 + +libdbusmenu (0.3.11-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Fix to handle whitespace in layout XML better + * Fixes to test scripts on ARM + + -- Ted Gould Thu, 19 Aug 2010 13:47:33 -0500 + +libdbusmenu (0.3.10-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Fixes to dbusmenu-dumper + + -- Ted Gould Thu, 12 Aug 2010 11:28:37 -0500 + +libdbusmenu (0.3.9-0ubuntu2) maverick; urgency=low + + * Rebuild with the current gobject introspection version + + -- Sebastien Bacher Tue, 10 Aug 2010 21:50:16 +0200 + +libdbusmenu (0.3.9-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Making it so that properties are requested bredth first + * Globbing layout signaling from the server + * Globbing property requests into group requests (LP: #604670) + + -- Ted Gould Mon, 02 Aug 2010 20:28:58 -0500 + +libdbusmenu (0.3.8-0ubuntu1) maverick; urgency=low + + * New upstream release. + - Added ItemActivationRequested signal. + + -- Ken VanDine Fri, 30 Jul 2010 13:44:34 -0400 + +libdbusmenu (0.3.7-1) unstable; urgency=low + + * Merge latest upstream from Ubuntu. + * Standards-Version: 3.9.1 + + -- Evgeni Golov Thu, 29 Jul 2010 12:00:04 +0200 + +libdbusmenu (0.3.7-0ubuntu1) maverick; urgency=low + + * New upstream release. + + -- Ken VanDine Thu, 22 Jul 2010 21:17:13 +0200 + +libdbusmenu (0.3.6-1) unstable; urgency=low + + * Merge new upstream from Ubuntu. + + -- Evgeni Golov Sat, 17 Jul 2010 10:47:35 +0200 + +libdbusmenu (0.3.6-0ubuntu2~ppa1) lucid; urgency=low + + * Upstream Merge + * Making dbusmenu-dumper have a click to dump feature. + * Autogen update + + -- Ted Gould Tue, 20 Jul 2010 16:40:29 -0500 + +libdbusmenu (0.3.6-0ubuntu1) maverick; urgency=low + + * New upstream release. + ∘ Protect against NULL values as event + + -- Ted Gould Thu, 15 Jul 2010 09:42:07 -0500 + +libdbusmenu (0.3.5-1) unstable; urgency=low + + * Merge new upstream and changes from Ubuntu. + * debian/control: + + Add missing "used" to the json package description. + + -- Evgeni Golov Wed, 14 Jul 2010 10:21:29 +0200 + +libdbusmenu (0.3.5-0ubuntu1) maverick; urgency=low + + * New upstream release. + ∘ Protect against NULL nodes (LP: #602444) + ∘ Remove extra warnings and messages + ∘ Handle not having a session bus better (LP: #598715) + + -- Ted Gould Thu, 08 Jul 2010 10:24:18 -0500 + +libdbusmenu (0.3.4-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Block building submenus on separators (LP: #598620) + * Adding more through JSON support for testing + * Fixing up value handling in dbusmenu-dumper + * debian/control, debian/libdbusmenu-jsonloader*install: Adding + two binary packages for the jsonloader test library. + + -- Ted Gould Thu, 01 Jul 2010 09:00:16 -0500 + +libdbusmenu (0.3.3-1) unstable; urgency=low + + * Merge Ubuntu. + Preserve Maintainer and Vcs-* fields. + * Standards-Version: 3.9.0 + * Source-Format: 1.0 for now + + -- Evgeni Golov Thu, 01 Jul 2010 11:42:23 +0200 + +libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Adding support for menu shortcuts (LP: #591293) + * Fixing distcheck of documentation builds + * Autogen.sh fix for adding custom prefix (LP: #595565) + * Fixing children property name to match spec (LP: #597321) + * Merging in Debian branch + * debian/control: Switching branch on this branch to be the + dbusmenu-team. + * debian/rules: Updating shlibs to 0.3.3 for shortcut API additions + + -- Ted Gould Thu, 24 Jun 2010 09:32:42 -0500 + +libdbusmenu (0.3.2-1) unstable; urgency=low + + * Merge from Ubuntu. + Closes: #586069 + * debian/control: + - Set Maintainer to pkg-ayatana. + - Add myself as Uploader. + - Update package descriptions. + - Standards-Version: 3.8.4 + - Fix Homepage URL. + - Update Vcs-* fields. + - -doc packages are Arch:all + * debian/copyright: + - Convert to DEP5 format. + - Add Ken and Sebastien, according to changelog. + - Add Aurélien Gâteau, according to headers. + + -- Evgeni Golov Sun, 20 Jun 2010 13:56:00 +0200 + +libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low + + * debian/control + - added doc packages + - added build dep for gtk-doc-tools + * debian/libdbusmenu-glib-doc.install added + * debian/libdbusmenu-gtk-doc.install added + * debian/rules + - enabled gtk-doc for configure + + [Ted Gould] + * New upstream release. + * Set the 'child-display' property on menuitems that + have child menuitems. + * gtk-doc support + * Document the 'shortcut' property + + -- Ken VanDine Thu, 10 Jun 2010 16:33:42 -0400 + +libdbusmenu (0.3.1-0ubuntu1) maverick; urgency=low + + * New upstream release. + * Fix annotations for GIR scanner + * Add function to get submenu of GTK-ified items + * Fix signal prototype of ID update + * Fixing up VAPI files to build them correctly + * Fixing the version string in the GIR file + * Fix documentation title page + * Reject text nodes early (warnings with Qt integration) + * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file + names for package list. + * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the + typelib file. + + -- Ted Gould Fri, 04 Jun 2010 14:42:26 -0500 + +libdbusmenu (0.3.0-0ubuntu1~ppa1) lucid; urgency=low + + * New upstream release. + * Add function to get submenu of GTK-ified items + * Fix signal prototype of ID update + * Fixing up VAPI files to build them correctly + * Fixing the version string in the GIR file + * Fix documentation title page + * Reject text nodes early (warnings with Qt integration) + * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file + names for package list. + * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the + typelib file. + + -- Ted Gould Thu, 27 May 2010 11:47:05 -0500 + +libdbusmenu (0.2.9-0ubuntu3) lucid; urgency=low + + * Upstream Merge + * Only unref root if the root has changed. + * Ensure that callbacks retain references to objects incase + they get deleted quickly. + * Protecting references before signalling + * Decrementing refs when added to child menus + + -- Ted Gould Sat, 17 Apr 2010 13:09:57 -0500 + +libdbusmenu (0.2.9-0ubuntu2) lucid; urgency=low + + * Upstream Merge + * Changing GTK layer to look at position in realized + children to avoid realization races. (LP: #555816) + * Don't allow setting children twice + * Ref children of a menuitem + * Return error when parent ID of getlayout can't be found + * Adding in visible property to docs + * Helpful comments in the code + + -- Ted Gould Thu, 15 Apr 2010 01:25:42 -0500 + +libdbusmenu (0.2.9-0ubuntu1) lucid; urgency=low + + * New upstream release. + * Documentation fix + * Changing the parse function to get_children instead of + taking them. (LP: #471044) + * Supporting AboutToShow in event callbacks to catch up + with QT implementation. + * Unrefing on layout updates (LP: #545026) + * Resetting sync versions on disconnection + * Removing useless warning + + -- Ted Gould Thu, 01 Apr 2010 09:14:36 -0500 + +libdbusmenu (0.2.8-0ubuntu2) lucid; urgency=low + + * debian/control: + - restore vcs location, we move back to the non import version, the other + one don't allow merging trunk changes + + [ Ted Gould ] + * Upstream Merge + * Changing the parse function to get_children instead of + taking them. (LP: #471044) + * Supporting AboutToShow in event callbacks to catch up + with QT implementation. + * Unrefing on layout updates (LP: #545026) + * Resetting sync versions on disconnection + * Removing useless warning + + -- Sebastien Bacher Thu, 01 Apr 2010 12:36:06 +0200 + +libdbusmenu (0.2.8-0ubuntu1) lucid; urgency=low + + * debian/control + - Dropped Vcs-Bzr and Vcs-Browser + - Added extended description for gir1.0-dbusmenu-gtk-0.2 and + gir1.0-dbusmenu-glib-0.2 + + * debian/rules + - bumped shlibs version to 0.2.8 for libdbusmenu-glib1 + + [Ted Gould] + * Upstream release 0.2.8 + * Adding support for blank icons (LP: #534854) + * Remove unneeded warning (LP: #537312) + * Fix typo in documentation + + -- Ken VanDine Thu, 25 Mar 2010 11:35:46 -0400 + +libdbusmenu (0.2.7-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.7 + * Adding in building of the GObject Introspection details + * Adding in building of VAPI files + * debian/control: + * Adding dependency on valac + * Adding in gir's as build dependencies. + * Adding in build dependencies for GIR dev + * Adding dependencies for gir-repository-dev and + gobject-introspection to ensure we get all the GI goodies. + * debian/control, debian/gir1.0-dbusmenu-glib-0.2.install, + debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to + hold the typelib files generated by GObject introspection. + * debian/libdbusmenu-glib-dev.install, + debian/libdbusmenu-gtk-dev.install: + * Added VAPI files to the packages. + * Added GIR files to the packages. + + -- Ted Gould Thu, 04 Mar 2010 11:13:43 -0600 + +libdbusmenu (0.2.6-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.6 + * Fix testing to make it more reliable + * Remove delayed property queueing as it was causing properties to not + get updated. (lp: #524308) + + -- Ted Gould Thu, 25 Feb 2010 10:23:49 -0600 + +libdbusmenu (0.2.5-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.5 + * Adding in menuitem proxy object. + * Adding ID to default item. + * debian/rules: Updating shlibs + + -- Ted Gould Thu, 18 Feb 2010 11:00:24 -0600 + +libdbusmenu (0.2.4-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.4 + * Remove uneccessary reference to stop duplication of menus + * Handle dbus method errors better + + -- Ted Gould Thu, 11 Feb 2010 10:13:56 -0600 + +libdbusmenu (0.2.3-0ubuntu3) lucid; urgency=low + + * Backported lp:~ted/dbusmenu/dbus-error-handling to fix the + indicator-applet crashing sometime on softwares close + (lp: #518900, #519019) + + -- Sebastien Bacher Wed, 10 Feb 2010 00:12:35 +0100 + +libdbusmenu (0.2.3-0ubuntu2) lucid; urgency=low + + * Upstream Merge + * Removing the ref to root and a setting of root + + -- Ted Gould Tue, 09 Feb 2010 08:53:00 -0600 + +libdbusmenu (0.2.3-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.3 + * Fixing handing of root IDs being zero + * Handling syncing of properties when reusing items + * Shipping new JSON files and READMEs for testing. + * libdbusmenu-tools.install: Add in json file and README so + that they're put in the right directories. + + -- Ted Gould Fri, 05 Feb 2010 11:24:58 -0800 + +libdbusmenu (0.2.2-0ubuntu3) lucid; urgency=low + + * debian/control: + - let libdbusmenu-glib1 breaks libdbusmenu-glib0 since they are create + issues at runtime if both got loaded + + -- Sebastien Bacher Thu, 04 Feb 2010 18:10:56 -0800 + +libdbusmenu (0.2.2-0ubuntu2) lucid; urgency=low + + * debian/control: fix a typo in the tools depends + + -- Sebastien Bacher Thu, 04 Feb 2010 14:18:47 -0800 + +libdbusmenu (0.2.2-0ubuntu1) lucid; urgency=low + + * Updated for the soname changes + + [ Ted Gould ] + * Upstream Release 0.2.2 + * Interoperability fixes + * Adding timestamps to events + * Better handling of XML + * Adding tools for timing dbusmenu + * debian/libdbusmenu-tools.install: Adding a wildcard to get + all of the tools in libexec + + -- Sebastien Bacher Thu, 04 Feb 2010 13:56:49 -0800 + +libdbusmenu (0.2.1-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.1 + - Fix to not destroy the image if we're still using it. + - Adding code to support icon names that have an implied direction in them. + - Fix to put a small amount of padding between the icon and the label. + + -- Ken VanDine Tue, 12 Jan 2010 11:03:39 -0500 + +libdbusmenu (0.2.0-0ubuntu3) lucid; urgency=low + + * debian/rules: + - updated shlibs version (lp: #505258) + + -- Sebastien Bacher Mon, 11 Jan 2010 16:04:11 +0100 + +libdbusmenu (0.2.0-0ubuntu2) lucid; urgency=low + + * Added debian/libdbusmenu-tools.install + * debian/control + - improved description for libdbusmenu-tools + + -- Ken VanDine Sat, 09 Jan 2010 09:05:47 -0500 + +libdbusmenu (0.2.0-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.0 + - Remove unused libdbusmenu-qt + - Changing API to be V0.2 for reals + - Adding underline support + - Test suite fixes and automation support + - dbus-dumper tool + - Switch to org.ayatana + - Fixing the handling of typed properties, especially bools. + - Adding GetChildren function for getting a single submenu + - Starting to watch DBus if the proxy builds fail. + - Test suite fixes + - Fixing the consistency between the #defines and what + was used in the code. + * debian/control, debian/libdbusmenu-tools.install: Setting + up a package for the new dbusmenu-dumper tool. + * debian/control: Mentioning nicely that this will cause + indicator-messages << 0.3 and indicator-session << 0.2 to + break. + + -- Ted Gould Fri, 08 Jan 2010 08:42:59 -0600 + +libdbusmenu (0.1.8-0ubuntu1) lucid; urgency=low + + * Upstream release 0.1.8 + * Changing the name to org.ayatana + * Underline fixes + * Documenation of the DBus API + * Adding the GPL v3 Copying file so that we're all legal. + + -- Ted Gould Thu, 10 Dec 2009 12:55:07 -0600 + +libdbusmenu (0.1.6-0ubuntu1) karmic; urgency=low + + * Upstream release 0.1.6 (LP: #442822) + * Managing the life-cycle of the GTK Menu item better to + ensure that it is positioned correctly and dies + appropriately. (LP: #430904) and (LP: #419953) + * Checking returned properties to ensure that there wasn't + DBus errors. (LP: #433719) + + -- Ted Gould Fri, 02 Oct 2009 17:00:45 -0500 + +libdbusmenu (0.1.5-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #436185) + + -- Ken VanDine Thu, 24 Sep 2009 17:12:25 -0400 + +libdbusmenu (0.1.4-0ubuntu1) karmic; urgency=low + + * Upstream release (LP: #432003) + - Applying a fix by not blocking if we're calling for the root. Everyone + should be listening for root changes anyway (lp: #427819) + + -- Ted Gould Thu, 17 Sep 2009 11:29:40 -0500 + +libdbusmenu (0.1.3-0ubuntu1) karmic; urgency=low + + * Upstream update 0.1.3 (LP: #427360) + * Fixes reordering of menu item issue + + -- Ted Gould Thu, 10 Sep 2009 08:43:47 -0500 + +libdbusmenu (0.1.2-0ubuntu1) karmic; urgency=low + + * debian/rules: + - updated shlib version + + [ Ted Gould ] + * Upstream release 0.1.2 (LP: #423958) + + [ Ken VanDine ] + * debian/control + - Specify full urls for Vcs-Bzr + + -- Sebastien Bacher Fri, 04 Sep 2009 11:12:38 +0200 + +libdbusmenu (0.1.0-0ubuntu1) karmic; urgency=low + + [ Ted Gould ] + * Upstream release 0.1.0 + * debian/watch: Added for tarball + * debian/control: + - Specify both Vcs-Bzr and Vcs-Browser + - Fixed the project name + + [ Martin Pitt ] + * Add bzr-builddep configuration for merge mode. + * debian/control: Fix Vcs-* links. + + -- Martin Pitt Thu, 27 Aug 2009 20:55:55 +0200 + +libdbusmenu (0.1~bzr5-0ubuntu1) karmic; urgency=low + + * First version. + + -- Ted Gould Wed, 05 Aug 2009 00:46:41 +0100 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..45a4fb7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +8 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..a7ff43d --- /dev/null +++ b/debian/control @@ -0,0 +1,243 @@ +Source: libdbusmenu +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: The Ayatana Packagers +Uploaders: Evgeni Golov +Build-Depends: debhelper (>= 8.1.3), + cdbs (>= 0.4.93), + quilt, + libgtk2.0-dev (>= 2.24.4-1~), + libgtk-3-dev (>= 2.99.2-1ubuntu2), + libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), + libdbus-glib-1-dev, + gnome-doc-utils, + gtk-doc-tools, + libtool, + intltool, + libjson-glib-dev (>= 0.13.4), + gobject-introspection, + libgirepository1.0-dev (>= 0.9.3), + gir1.2-glib-2.0, + gir1.2-gtk-2.0, + gir1.2-gtk-3.0, + libx11-dev (>= 1.3), + dh-autoreconf, + valac-0.14 +Standards-Version: 3.9.2 +Homepage: https://launchpad.net/dbusmenu +Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian +Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian + +Package: libdbusmenu-glib4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Breaks: indicator-messages (<< 0.3.0), + indicator-session (<< 0.2.0), + libdbusmenu-glib0, + gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2), + gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4) +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Description: library for passing menus over DBus + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains shared libraries to be used by applications. + +Package: libdbusmenu-glib-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbusmenu-glib4 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libgtk2.0-dev (>= 2.12.0) +Multi-Arch: same +Description: library for passing menus over DBus - development files + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains files that are needed to build applications. + +Package: libdbusmenu-gtk4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Description: library for passing menus over DBus - GTK+ version + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains shared libraries to be used by GTK+ applications. + +Package: libdbusmenu-gtk-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbusmenu-gtk4 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libgtk2.0-dev (>= 2.12.0), + libdbusmenu-glib-dev +Multi-Arch: same +Description: library for passing menus over DBus - GTK+ version developement files + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains files that are needed to build GTK+ applications. + +Package: libdbusmenu-tools +Section: devel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + python, + libdbusmenu-glib4 (= ${binary:Version}) +Multi-Arch: foreign +Description: tools useful during development with libdbusmenu + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains tools that are useful when developing and building + applications with libdbusmenu. + +Package: gir1.2-dbusmenu-glib-0.4 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + libdbusmenu-glib4 (= ${binary:Version}), + ${gir:Depends} +Breaks: gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2), + gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4) +Description: typelib file for libdbusmenu-glib4 + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libdbusmenu-glib4. + +Package: gir1.2-dbusmenu-gtk-0.4 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + libdbusmenu-gtk4 (= ${binary:Version}), + ${gir:Depends} +Description: typelib file for libdbusmenu-gtk4 + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libdbusmenu-gtk4. + +Package: libdbusmenu-glib-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: library for passing menus over DBus - documentation + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains developer documentation for libdbusmenu-glib. + +Package: libdbusmenu-gtk-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: library for passing menus over DBus - GTK+ version documentation + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains developer documentation for libdbusmenu-gtk. + +Package: libdbusmenu-jsonloader4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Description: library for passing menus over DBus - Test lib + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains shared libraries to be used by test suites in + applications or libraries using dbusmenu. + +Package: libdbusmenu-jsonloader-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbusmenu-jsonloader4 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libdbusmenu-glib-dev (= ${binary:Version}), + libjson-glib-dev +Multi-Arch: same +Description: library for passing menus over DBus - Test lib development files + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains files that are needed to build test suites in + applications or libraries using dbusmenu. + +Package: libdbusmenu-gtk3-4 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same +Description: library for passing menus over DBus - GTK+ version + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains shared libraries to be used by GTK+ applications. + +Package: libdbusmenu-gtk3-dev +Section: libdevel +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbusmenu-gtk3-4 (= ${binary:Version}), + libdbus-glib-1-dev (>= 0.76), + libgtk-3-dev (>= 2.91.4-0ubuntu1), + libdbusmenu-glib-dev +Multi-Arch: same +Description: library for passing menus over DBus - GTK+ version developement files + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package contains files that are needed to build GTK+ applications. + +Package: gir1.2-dbusmenu-gtk3-0.4 +Section: libs +Architecture: any +Depends: ${misc:Depends}, + libdbusmenu-gtk3-4 (= ${binary:Version}), + ${gir:Depends} +Description: typelib file for libdbusmenu-gtk3-4 + libdbusmenu passes a menu structure across DBus so that a program can + create a menu simply without worrying about how it is displayed on the + other side of the bus. + . + This package can be used by other packages using the GIRepository format to + generate dynamic bindings for libdbusmenu-gtk4. + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..6d7c11b --- /dev/null +++ b/debian/copyright @@ -0,0 +1,40 @@ +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: libdbusmenu +Maintainer: Ted Gould +Source: https://launchpad.net/dbusmenu + +Files: * +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +License: GPL-3 + +Files: libdbusmenu-{glib,gtk}/* +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +License: LGPL-2.1 | LGPL-3 + +Files: libdbusmenu-glib/dbus-menu.xml +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +Copyright: 2009-2010 Aurélien Gâteau +License: LGPL-2.1 | LGPL-3 + +Files: tools/{dbusmenu-bench,testapp/main.c} +Copyright: 2009-2010 Aurélien Gâteau +License: LGPL-2.1 | LGPL-3 + +Files: debian/* +Copyright: 2009-2010 Evgeni Golov +Copyright: 2009-2010 Ted Gould , Canonical Ltd. +Copyright: 2009-2010 Sebastien Bacher +Copyright: 2009-2010 Ken VanDine +License: GPL-3 + +License: GPL-3 + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. + +License: LGPL-2.1 + On Debian systems, the complete text of the GNU Lesser General + Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. + +License: LGPL-3 + On Debian systems, the complete text of the GNU Lesser General + Public License version 3 can be found in `/usr/share/common-licenses/LGPL-3'. diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install new file mode 100644 index 0000000..da62142 --- /dev/null +++ b/debian/gir1.2-dbusmenu-glib-0.4.install @@ -0,0 +1 @@ +usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install new file mode 100644 index 0000000..1a62fd5 --- /dev/null +++ b/debian/gir1.2-dbusmenu-gtk-0.4.install @@ -0,0 +1 @@ +usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install new file mode 100644 index 0000000..4c56230 --- /dev/null +++ b/debian/gir1.2-dbusmenu-gtk3-0.4.install @@ -0,0 +1 @@ +usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install new file mode 100644 index 0000000..fc7079c --- /dev/null +++ b/debian/libdbusmenu-glib-dev.install @@ -0,0 +1,6 @@ +usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/ +usr/lib/*/pkgconfig/dbusmenu-glib-0.4.pc +usr/lib/*/libdbusmenu-glib.a +usr/lib/*/libdbusmenu-glib.so +usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/ +usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/ diff --git a/debian/libdbusmenu-glib-doc.install b/debian/libdbusmenu-glib-doc.install new file mode 100644 index 0000000..5d99d73 --- /dev/null +++ b/debian/libdbusmenu-glib-doc.install @@ -0,0 +1 @@ +usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-glib4.install b/debian/libdbusmenu-glib4.install new file mode 100644 index 0000000..4c05f07 --- /dev/null +++ b/debian/libdbusmenu-glib4.install @@ -0,0 +1 @@ +usr/lib/*/libdbusmenu-glib.so.* diff --git a/debian/libdbusmenu-glib4.symbols b/debian/libdbusmenu-glib4.symbols new file mode 100644 index 0000000..0e0dcb4 --- /dev/null +++ b/debian/libdbusmenu-glib4.symbols @@ -0,0 +1,80 @@ +libdbusmenu-glib.so.4 libdbusmenu-glib4 #MINVER# + dbus_menu_clean_xml@Base 0.4.2 + dbusmenu_client_add_type_handler@Base 0.4.2 + dbusmenu_client_add_type_handler_full@Base 0.4.2 + dbusmenu_client_get_icon_paths@Base 0.4.2 + dbusmenu_client_get_root@Base 0.4.2 + dbusmenu_client_get_status@Base 0.4.2 + dbusmenu_client_get_text_direction@Base 0.4.2 + dbusmenu_client_get_type@Base 0.4.2 + dbusmenu_client_menuitem_get_type@Base 0.4.2 + dbusmenu_client_menuitem_new@Base 0.4.2 + dbusmenu_client_new@Base 0.4.2 + dbusmenu_client_send_about_to_show@Base 0.4.2 + dbusmenu_client_send_event@Base 0.4.2 + dbusmenu_defaults_default_get@Base 0.4.2 + dbusmenu_defaults_default_get_type@Base 0.4.2 + dbusmenu_defaults_default_set@Base 0.4.2 + dbusmenu_defaults_get_type@Base 0.4.2 + dbusmenu_defaults_ref_default@Base 0.4.2 + dbusmenu_menuitem_build_variant@Base 0.4.2 + dbusmenu_menuitem_child_add_position@Base 0.4.2 + dbusmenu_menuitem_child_append@Base 0.4.2 + dbusmenu_menuitem_child_delete@Base 0.4.2 + dbusmenu_menuitem_child_find@Base 0.4.2 + dbusmenu_menuitem_child_prepend@Base 0.4.2 + dbusmenu_menuitem_child_reorder@Base 0.4.2 + dbusmenu_menuitem_exposed@Base 0.4.2 + dbusmenu_menuitem_find_id@Base 0.4.2 + dbusmenu_menuitem_foreach@Base 0.4.2 + dbusmenu_menuitem_get_children@Base 0.4.2 + dbusmenu_menuitem_get_id@Base 0.4.2 + dbusmenu_menuitem_get_parent@Base 0.4.2 + dbusmenu_menuitem_get_position@Base 0.4.2 + dbusmenu_menuitem_get_position_realized@Base 0.4.2 + dbusmenu_menuitem_get_root@Base 0.4.2 + dbusmenu_menuitem_get_type@Base 0.4.2 + dbusmenu_menuitem_handle_event@Base 0.4.2 + dbusmenu_menuitem_new@Base 0.4.2 + dbusmenu_menuitem_new_with_id@Base 0.4.2 + dbusmenu_menuitem_properties_copy@Base 0.4.2 + dbusmenu_menuitem_properties_list@Base 0.4.2 + dbusmenu_menuitem_properties_variant@Base 0.4.2 + dbusmenu_menuitem_property_exist@Base 0.4.2 + dbusmenu_menuitem_property_get@Base 0.4.2 + dbusmenu_menuitem_property_get_bool@Base 0.4.2 + dbusmenu_menuitem_property_get_int@Base 0.4.2 + dbusmenu_menuitem_property_get_variant@Base 0.4.2 + dbusmenu_menuitem_property_is_default@Base 0.4.2 + dbusmenu_menuitem_property_remove@Base 0.4.2 + dbusmenu_menuitem_property_set@Base 0.4.2 + dbusmenu_menuitem_property_set_bool@Base 0.4.2 + dbusmenu_menuitem_property_set_int@Base 0.4.2 + dbusmenu_menuitem_property_set_variant@Base 0.4.2 + dbusmenu_menuitem_proxy_get_type@Base 0.4.2 + dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2 + dbusmenu_menuitem_proxy_new@Base 0.4.2 + dbusmenu_menuitem_realized@Base 0.4.2 + dbusmenu_menuitem_send_about_to_show@Base 0.4.2 + dbusmenu_menuitem_set_parent@Base 0.4.2 + dbusmenu_menuitem_set_realized@Base 0.4.2 + dbusmenu_menuitem_set_root@Base 0.4.2 + dbusmenu_menuitem_show_to_user@Base 0.4.2 + dbusmenu_menuitem_take_children@Base 0.4.2 + dbusmenu_menuitem_unparent@Base 0.4.2 + dbusmenu_server_get_icon_paths@Base 0.4.2 + dbusmenu_server_get_status@Base 0.4.2 + dbusmenu_server_get_text_direction@Base 0.4.2 + dbusmenu_server_get_type@Base 0.4.2 + dbusmenu_server_new@Base 0.4.2 + dbusmenu_server_set_icon_paths@Base 0.4.2 + dbusmenu_server_set_root@Base 0.4.2 + dbusmenu_server_set_status@Base 0.4.2 + dbusmenu_server_set_text_direction@Base 0.4.2 + dbusmenu_status_get_nick@Base 0.4.2 + dbusmenu_status_get_type@Base 0.4.2 + dbusmenu_status_get_value_from_nick@Base 0.4.2 + dbusmenu_text_direction_get_nick@Base 0.4.2 + dbusmenu_text_direction_get_type@Base 0.4.2 + dbusmenu_text_direction_get_value_from_nick@Base 0.4.2 + session_bus_cb@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install new file mode 100644 index 0000000..ab8e8a9 --- /dev/null +++ b/debian/libdbusmenu-gtk-dev.install @@ -0,0 +1,6 @@ +usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/ +usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc +usr/lib/*/libdbusmenu-gtk.a +usr/lib/*/libdbusmenu-gtk.so +usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/ +usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/ diff --git a/debian/libdbusmenu-gtk-doc.install b/debian/libdbusmenu-gtk-doc.install new file mode 100644 index 0000000..664f00c --- /dev/null +++ b/debian/libdbusmenu-gtk-doc.install @@ -0,0 +1 @@ +usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-gtk3-4.install b/debian/libdbusmenu-gtk3-4.install new file mode 100644 index 0000000..a425da7 --- /dev/null +++ b/debian/libdbusmenu-gtk3-4.install @@ -0,0 +1 @@ +usr/lib/*/libdbusmenu-gtk3.so.* diff --git a/debian/libdbusmenu-gtk3-4.symbols b/debian/libdbusmenu-gtk3-4.symbols new file mode 100644 index 0000000..efc696c --- /dev/null +++ b/debian/libdbusmenu-gtk3-4.symbols @@ -0,0 +1,36 @@ +libdbusmenu-gtk3.so.4 libdbusmenu-gtk3-4 #MINVER# + dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 + dbusmenu_gtk_parse_menu_structure@Base 0.4.2 + dbusmenu_gtkclient_get_accel_group@Base 0.4.2 + dbusmenu_gtkclient_get_type@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 + dbusmenu_gtkclient_new@Base 0.4.2 + dbusmenu_gtkclient_newitem_base@Base 0.4.2 + dbusmenu_gtkclient_set_accel_group@Base 0.4.2 + dbusmenu_gtkmenu_get_client@Base 0.4.2 + dbusmenu_gtkmenu_get_type@Base 0.4.2 + dbusmenu_gtkmenu_new@Base 0.4.2 + dbusmenu_menuitem_property_get_image@Base 0.4.2 + dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_image@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 + genericmenuitem_check_type_get_nick@Base 0.4.92 + genericmenuitem_check_type_get_type@Base 0.4.92 + genericmenuitem_check_type_get_value_from_nick@Base 0.4.92 + genericmenuitem_disposition_get_nick@Base 0.4.92 + genericmenuitem_disposition_get_type@Base 0.4.92 + genericmenuitem_disposition_get_value_from_nick@Base 0.4.92 + genericmenuitem_get_disposition@Base 0.4.92 + genericmenuitem_get_image@Base 0.4.2 + genericmenuitem_get_type@Base 0.4.2 + genericmenuitem_set_check_type@Base 0.4.2 + genericmenuitem_set_disposition@Base 0.4.92 + genericmenuitem_set_image@Base 0.4.2 + genericmenuitem_set_state@Base 0.4.2 + genericmenuitem_state_get_nick@Base 0.4.92 + genericmenuitem_state_get_type@Base 0.4.92 + genericmenuitem_state_get_value_from_nick@Base 0.4.92 + theme_dir_db@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install new file mode 100644 index 0000000..56f8fba --- /dev/null +++ b/debian/libdbusmenu-gtk3-dev.install @@ -0,0 +1,6 @@ +usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/ +usr/lib/*/pkgconfig/dbusmenu-gtk3-0.4.pc +usr/lib/*/libdbusmenu-gtk3.a +usr/lib/*/libdbusmenu-gtk3.so +usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/ +usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/ diff --git a/debian/libdbusmenu-gtk4.install b/debian/libdbusmenu-gtk4.install new file mode 100644 index 0000000..546d698 --- /dev/null +++ b/debian/libdbusmenu-gtk4.install @@ -0,0 +1 @@ +usr/lib/*/libdbusmenu-gtk.so.* diff --git a/debian/libdbusmenu-gtk4.symbols b/debian/libdbusmenu-gtk4.symbols new file mode 100644 index 0000000..eacb806 --- /dev/null +++ b/debian/libdbusmenu-gtk4.symbols @@ -0,0 +1,36 @@ +libdbusmenu-gtk.so.4 libdbusmenu-gtk4 #MINVER# + dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 + dbusmenu_gtk_parse_menu_structure@Base 0.4.2 + dbusmenu_gtkclient_get_accel_group@Base 0.4.2 + dbusmenu_gtkclient_get_type@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get@Base 0.4.2 + dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 + dbusmenu_gtkclient_new@Base 0.4.2 + dbusmenu_gtkclient_newitem_base@Base 0.4.2 + dbusmenu_gtkclient_set_accel_group@Base 0.4.2 + dbusmenu_gtkmenu_get_client@Base 0.4.2 + dbusmenu_gtkmenu_get_type@Base 0.4.2 + dbusmenu_gtkmenu_new@Base 0.4.2 + dbusmenu_menuitem_property_get_image@Base 0.4.2 + dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_image@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 + dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 + genericmenuitem_check_type_get_nick@Base 0.4.92 + genericmenuitem_check_type_get_type@Base 0.4.92 + genericmenuitem_check_type_get_value_from_nick@Base 0.4.92 + genericmenuitem_disposition_get_nick@Base 0.4.92 + genericmenuitem_disposition_get_type@Base 0.4.92 + genericmenuitem_disposition_get_value_from_nick@Base 0.4.92 + genericmenuitem_get_disposition@Base 0.4.92 + genericmenuitem_get_image@Base 0.4.2 + genericmenuitem_get_type@Base 0.4.2 + genericmenuitem_set_check_type@Base 0.4.2 + genericmenuitem_set_disposition@Base 0.4.92 + genericmenuitem_set_image@Base 0.4.2 + genericmenuitem_set_state@Base 0.4.2 + genericmenuitem_state_get_nick@Base 0.4.92 + genericmenuitem_state_get_type@Base 0.4.92 + genericmenuitem_state_get_value_from_nick@Base 0.4.92 + theme_dir_db@Base 0.4.2 diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install new file mode 100644 index 0000000..ebbb5ea --- /dev/null +++ b/debian/libdbusmenu-jsonloader-dev.install @@ -0,0 +1,4 @@ +usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/ +usr/lib/*/pkgconfig/dbusmenu-jsonloader-0.4.pc +usr/lib/*/libdbusmenu-jsonloader.a +usr/lib/*/libdbusmenu-jsonloader.so diff --git a/debian/libdbusmenu-jsonloader4.install b/debian/libdbusmenu-jsonloader4.install new file mode 100644 index 0000000..67976fd --- /dev/null +++ b/debian/libdbusmenu-jsonloader4.install @@ -0,0 +1 @@ +usr/lib/*/libdbusmenu-jsonloader.so.* diff --git a/debian/libdbusmenu-jsonloader4.symbols b/debian/libdbusmenu-jsonloader4.symbols new file mode 100644 index 0000000..38a6868 --- /dev/null +++ b/debian/libdbusmenu-jsonloader4.symbols @@ -0,0 +1,3 @@ +libdbusmenu-jsonloader.so.4 libdbusmenu-jsonloader4 #MINVER# + dbusmenu_json_build_from_file@Base 0.4.2 + dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install new file mode 100644 index 0000000..1a79739 --- /dev/null +++ b/debian/libdbusmenu-tools.install @@ -0,0 +1,3 @@ +usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/ +usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ +usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..8eeb376 --- /dev/null +++ b/debian/rules @@ -0,0 +1,44 @@ +#!/usr/bin/make -f + +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 + +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/autoreconf.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ + +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk4 += --sourcedir=debian/tmp/gtk2 +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-dev += --sourcedir=debian/tmp/gtk2 +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-doc += --sourcedir=debian/tmp/gtk2 +DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk-0.4 += --sourcedir=debian/tmp/gtk2 + +DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-glib-0.4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk3-0.4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-glib4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-glib-dev += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-glib-doc += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-dev += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader4 += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader-dev += --sourcedir=debian/tmp/gtk3 +DEB_DH_INSTALL_ARGS_libdbusmenu-tools += --sourcedir=debian/tmp/gtk3 + +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + +DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk4 = -- -xlibgtk2.0-0 +DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk3-4 = -- -xlibgtk-3-0 + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) + +common-install-arch:: + find debian/tmp -name \*.la -delete diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..9f089a5 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/dbusmenu/+download .*/libdbusmenu-([0-9.]+)\.tar\.gz -- cgit v1.2.3 From 2a3f37670e9572bb5997a400fd0400a8cd81ce07 Mon Sep 17 00:00:00 2001 From: Alex Launi Date: Fri, 16 Dec 2011 15:49:25 -0500 Subject: set full path of glib enum files --- libdbusmenu-glib/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 7d4ea5d..519ba5f 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -70,8 +70,8 @@ libdbusmenu_glib_la_LIBADD = \ pkgconfig_DATA = dbusmenu-glib-0.4.pc pkgconfigdir = $(libdir)/pkgconfig -glib_enum_h = enum-types.h -glib_enum_c = enum-types.c +glib_enum_h = $(srcdir)/enum-types.h +glib_enum_c = $(srcdir)/enum-types.c glib_enum_headers = $(addprefix $(srcdir)/, $(libdbusmenu_glibinclude_HEADERS)) DISTCLEANFILES += \ -- cgit v1.2.3 From 1f1799195f06cef8aef00cdd2ec7dffec481d5c0 Mon Sep 17 00:00:00 2001 From: Alex Launi Date: Fri, 16 Dec 2011 15:55:33 -0500 Subject: remove the debian dir I accidentally added (blame bzr build weirdness) --- debian/changelog | 1177 ----------------------------- debian/compat | 1 - debian/control | 243 ------ debian/copyright | 40 - debian/gir1.2-dbusmenu-glib-0.4.install | 1 - debian/gir1.2-dbusmenu-gtk-0.4.install | 1 - debian/gir1.2-dbusmenu-gtk3-0.4.install | 1 - debian/libdbusmenu-glib-dev.install | 6 - debian/libdbusmenu-glib-doc.install | 1 - debian/libdbusmenu-glib4.install | 1 - debian/libdbusmenu-glib4.symbols | 80 -- debian/libdbusmenu-gtk-dev.install | 6 - debian/libdbusmenu-gtk-doc.install | 1 - debian/libdbusmenu-gtk3-4.install | 1 - debian/libdbusmenu-gtk3-4.symbols | 36 - debian/libdbusmenu-gtk3-dev.install | 6 - debian/libdbusmenu-gtk4.install | 1 - debian/libdbusmenu-gtk4.symbols | 36 - debian/libdbusmenu-jsonloader-dev.install | 4 - debian/libdbusmenu-jsonloader4.install | 1 - debian/libdbusmenu-jsonloader4.symbols | 3 - debian/libdbusmenu-tools.install | 3 - debian/rules | 44 -- debian/source/format | 1 - debian/watch | 2 - 25 files changed, 1697 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/gir1.2-dbusmenu-glib-0.4.install delete mode 100644 debian/gir1.2-dbusmenu-gtk-0.4.install delete mode 100644 debian/gir1.2-dbusmenu-gtk3-0.4.install delete mode 100644 debian/libdbusmenu-glib-dev.install delete mode 100644 debian/libdbusmenu-glib-doc.install delete mode 100644 debian/libdbusmenu-glib4.install delete mode 100644 debian/libdbusmenu-glib4.symbols delete mode 100644 debian/libdbusmenu-gtk-dev.install delete mode 100644 debian/libdbusmenu-gtk-doc.install delete mode 100644 debian/libdbusmenu-gtk3-4.install delete mode 100644 debian/libdbusmenu-gtk3-4.symbols delete mode 100644 debian/libdbusmenu-gtk3-dev.install delete mode 100644 debian/libdbusmenu-gtk4.install delete mode 100644 debian/libdbusmenu-gtk4.symbols delete mode 100644 debian/libdbusmenu-jsonloader-dev.install delete mode 100644 debian/libdbusmenu-jsonloader4.install delete mode 100644 debian/libdbusmenu-jsonloader4.symbols delete mode 100644 debian/libdbusmenu-tools.install delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 4428c75..0000000 --- a/debian/changelog +++ /dev/null @@ -1,1177 +0,0 @@ -libdbusmenu (0.5.1-0ubuntu2) precise; urgency=low - - * libdbusmenu-gtk/parser.c - - Don't try to get objects from boolean values. Handle the - 'always show image' property by getting the image from the object - and using that (LP: #870742) - - -- Ken VanDine Thu, 01 Dec 2011 11:07:36 -0500 - -libdbusmenu (0.5.1-0ubuntu1) precise; urgency=low - - * New upstream release. - * Allow for an ID of 0 in about_to_show for indicators (LP: #862989) - * Clear the image pointer when we take it - * Ensure we drop all references to the GTK widget when a menuitem - gets destroyed (LP: #835646) - - -- Ted Gould Fri, 28 Oct 2011 09:35:13 -0400 - -libdbusmenu (0.5.0-1ubuntu1) precise; urgency=low - - * Multiarch conversion (partial, gobject instrospection not touched) - (LP: #859512) - - -- Riku Voipio Mon, 26 Sep 2011 12:13:07 +0300 - -libdbusmenu (0.5.0-1) experimental; urgency=low - - * Merge from Ubuntu. - + Re-enable GTK3 packages. - * Re-order includes in debian/rules to prevent lintian's - E: libdbusmenu source: temporary-debhelper-file - - -- Evgeni Golov Sat, 15 Oct 2011 09:29:54 +0200 - -libdbusmenu (0.5.0-0ubuntu3) oneiric; urgency=low - - * libdbusmenu-gtk/client.c: - - Make sure to actually free memory associated with GtkMenuItems we - create. We are holding the sunk floating ref, so we have to - actually unref as well as destroy the widget. Part of bug 835646. - * libdbusmenu-gtk/genericmenuitem.c: - - When setting an image on a menu item for the second time before - setting a label, don't try to use free'd memory. - - -- Michael Terry Thu, 06 Oct 2011 10:35:21 -0400 - -libdbusmenu (0.5.0-0ubuntu2) oneiric; urgency=low - - * libdbusmenu-glib/client.c - - id of 0 in dbusmenu_client_send_about_to_show is valid, and used in - appindicators like nm-applet (LP: #862989) - - -- Ken VanDine Fri, 30 Sep 2011 10:06:19 -0400 - -libdbusmenu (0.5.0-0ubuntu1) oneiric; urgency=low - - * New upstream release. - * Protect functions against NULL results (LP: #757569, LP: #742909, - LP: #743050, LP: #743661) - - -- Ted Gould Thu, 29 Sep 2011 14:46:57 -0500 - -libdbusmenu (0.4.94-0ubuntu1) oneiric; urgency=low - - [ Ted Gould ] - * New upstream release. - ∘ Protect functions from NULL submenus (LP: #803667) - ∘ Build fixes (LP: #552526, LP: #552530, LP: #552538, LP: #709761, - LP: #713690, LP: #643871, LP: #713685) - - [ Ken VanDine ] - * debian/control - - build dep on valac-0.14 - - -- Ken VanDine Tue, 20 Sep 2011 09:16:41 -0700 - -libdbusmenu (0.4.93-0ubuntu1) oneiric; urgency=low - - * New upstream release. - * Fix packing of generic menu items to use toggle-spacing - - -- Ted Gould Thu, 25 Aug 2011 09:50:21 -0500 - -libdbusmenu (0.4.92-0ubuntu1) oneiric; urgency=low - - [ Ted Gould ] - * New upstream release (0.4.92). - * Add in a property for setting the menuitem disposition - * Fix GTK 2 build for style properties - * Fixed proxied menu events not getting returned (LP: #799878) - * Removed debian/patches: - * All upstream - - [ Ken VanDine ] - * debian/libdbusmenu-gtk4.symbols debian/libdbusmenu-gtk3-4.symbols - - Added new symbols - - -- Ken VanDine Wed, 24 Aug 2011 20:22:14 -0400 - -libdbusmenu (0.4.90-0ubuntu4) oneiric; urgency=low - - * debian/rules: - - avoid making indicator-appmenu* depends on gtk2/3 by dpkg-shlibdeps. - The library doesn't hurt if gtk isn't installed and that enable - pre-installlation of the indicator stack without requiring the full gtk - stack being there without any gtk app installed. - - -- Didier Roche Mon, 25 Jul 2011 18:18:11 +0200 - -libdbusmenu (0.4.90-0ubuntu3) oneiric; urgency=low - - * debian/patches/lp799878.patch - - Fixed proxied menu events not getting returned (LP: #799878) - - -- Ken VanDine Tue, 28 Jun 2011 17:53:31 +0100 - -libdbusmenu (0.4.90-0ubuntu2) oneiric; urgency=low - - * debian/control - - Also a a breaks to libdbusmenu-glib4 for gir1.2-unity-3.0 and - gir1.2-indicate-0.5 to make sure the library gets held back too. - - -- Ken VanDine Fri, 24 Jun 2011 16:05:56 -0400 - -libdbusmenu (0.4.90-0ubuntu1) oneiric; urgency=low - - [ Ted Gould ] - * debian/control, debian/*: Renaming packages for library version - bump from 3 to 4. - * New upstream release. - * Fixing visibility for Eclipse (LP: #770263 and LP: #618587) - * Unseting a GValue properly (LP: #785828) - * Memory leaks for GVariant usage (LP: #784890) - * Making GTK 3 default build - * Removing the SerializableMenuitem object - * debian/rules: Making GTK2 the special build - - [ Ken VanDine ] - * +debian/libdbusmenu-jsonloader4.symbols - * debian/*.symbols - - Fixed sonames and removed all the duplicate symbols - * debian/*.install, debian/rules - - Use cdbs to do the dual builds for gtk2/gtk3 - * debian/control - - Updated standards version to 3.9.2 - - Set version on the json-glib build depends to >= 0.13.4 - - Make gir1.2-dbusmenu-glib-0.4 break gir1.2-unity-3.0 and - gir1.2-indicate-0.5 built against older versions of dbusmenu to - prevent breakage in python apps that use gir loading multiple versions - of dbusmenu-glib - - -- Ken VanDine Fri, 24 Jun 2011 14:55:59 -0400 - -libdbusmenu (0.4.4-0ubuntu1~ppa1) natty; urgency=low - - * New upstream release. - - Fix a typo in the signal name to make it match the XML - files (LP: #641209) - - Ref'ing the server for the entire time we're getting the - bus (LP: #738568) - - Watch additions/removals from submenus that get added - - Activate new toplevel menu items as they get added - - Make sure we don't activate toplevel children that aren't - menu items or don't have submenus (LP: #761112) - - -- Ted Gould Mon, 25 Apr 2011 15:19:25 -0500 - -libdbusmenu (0.4.3-1) unstable; urgency=low - - * Merge new upstream release from Ubuntu. - * Do not build-depend on gir-repository-dev, libgtk2.0-dev - has Gtk-2.0.gir since 2.24.4-1 (bump B-D accordingly). - * Standards-Version: 3.9.2 - - -- Evgeni Golov Wed, 27 Apr 2011 14:00:04 +0200 - -libdbusmenu (0.4.3-0ubuntu3) natty; urgency=low - - * Backport bug fixes from trunk: - - Fix a typo in the signal name to make it match the XML - files (LP: #641209) - - Ref'ing the server for the entire time we're getting the - bus (LP: #738568) - - -- Ken VanDine Tue, 19 Apr 2011 15:14:23 -0400 - -libdbusmenu (0.4.3-0ubuntu2) natty; urgency=low - - * Backport bug fixes from trunk: - - Watch additions/removals from submenus that get added - - Activate new toplevel menu items as they get added - - Make sure we don't activate toplevel children that aren't - menu items or don't have submenus (LP: #761112) - - -- Michael Terry Fri, 15 Apr 2011 15:55:37 -0400 - -libdbusmenu (0.4.3-0ubuntu1) natty; urgency=low - - [ Ken VanDine ] - * debian/rules - - Fixed package names in build targets (LP: #760102) - - Dropped makeshlibs in favor of symbols files - * +debian/libdbusmenu-glib3.symbols - * +debian/libdbusmenu-gtk3-3.symbols - * +debian/libdbusmenu-gtk3.symbols - - [ Ted Gould ] - * New upstream release. - ∘ Handle cases where labels are added later as subwidgets - in the menuitem (LP: #758759) - ∘ Fix the destruction of the attached GTK menuitem (LP: #746091) - ∘ Guard against an activation that does not actually have an - associated menu-hide (LP: #750588) - - -- Ted Gould Thu, 14 Apr 2011 16:49:13 -0500 - -libdbusmenu (0.4.2-1) unstable; urgency=low - - * Merge new upstream release from Ubuntu. - - -- Evgeni Golov Mon, 11 Apr 2011 12:43:49 +0200 - -libdbusmenu (0.4.2-0ubuntu3) natty; urgency=low - - * Merged fix, guard against an activation that does not actually have - an associated menu-hide (LP: #750588) - - -- Ken VanDine Mon, 11 Apr 2011 00:56:02 -0400 - -libdbusmenu (0.4.2-0ubuntu2) natty; urgency=low - - * debian/libdbusmenu-gtk3-dev.install: - - Add missing header files to gtk3 dev package - - -- Michael Terry Thu, 07 Apr 2011 20:20:25 -0400 - -libdbusmenu (0.4.2-0ubuntu1) natty; urgency=low - - * New upstream release. - * Fix GIR scan to not include duplicate namespaces (LP: #750575) - * Keep refs to the client and makes sure to disconnect all handlers. - (LP: #749609) - * Add GTK side handlers for the open/close events to ensure GTK apps - can use those events still (LP: #750588) - * Create submenus for menuitems that don't have children but still - have told us they need them with the child-display property. - (LP: #619811) - - -- Ted Gould Thu, 07 Apr 2011 10:32:51 -0500 - -libdbusmenu (0.4.1-0ubuntu1) natty; urgency=low - - * New upstream release. - * Managed variant iterators better to stop crash when dealing - with apps that have multiple shortcuts (LP: #741726) - * Handled GtkMenuItems with no labels as separators (LP: #729187) - - -- Ted Gould Thu, 31 Mar 2011 13:56:54 -0500 - -libdbusmenu (0.4.0-2) unstable; urgency=low - - * Build-depend on gir1.2-atk-1.0, it's not pulled in by gir1.2-gtk-2.0 - on ia64, mipsel and sparc64, causing FTBFS there. - - -- Evgeni Golov Wed, 30 Mar 2011 10:16:59 +0200 - -libdbusmenu (0.4.0-1) unstable; urgency=low - - * Merge new upstream release from Ubuntu. - This builds with gir-1.2 and thus closes: #614490. - Also builds fine with --as-needed, closes: #615741. - * Disable GTK3 packages for now. - * Fix DEB_DH_MAKESHLIBS_ARGS_* for the latest SONAME bump. - * Also fix cdbs targets for it. - * Use valac-0.10, valac-0.12 is only in experimental. - * Add gir-repository-dev back to Build-Depends, - it still has Gtk-2.0.gir on Debian. - - -- Evgeni Golov Fri, 25 Mar 2011 15:55:16 +0100 - -libdbusmenu (0.4.0-0ubuntu2) natty; urgency=low - - * Cherry picked fix for potential memory issues to fix unity-panel-service - crashed with SIGABRT in __kernel_vsyscall() (LP: #741726) - - -- Ken VanDine Mon, 28 Mar 2011 14:56:59 -0400 - -libdbusmenu (0.4.0-0ubuntu1) natty; urgency=low - - * New upstream release. - * Protect from NULL variants by using iter_loop (LP: #737844) - * Look for accellerators inside the labels as well - * Protecting properties that are getting updated from an - extra remove signal. (LP: #730925) - * Enter and exit the GDK threads before calling GTK (LP: #717162) - - -- Ted Gould Wed, 23 Mar 2011 14:56:24 -0500 - -libdbusmenu (0.3.102-0ubuntu1) natty; urgency=low - - * New upstream release. - ∘ Remove child items when they're removed by GTK - ∘ Adding opened and closed events for menu visibility - ∘ Handle empty image types - ∘ Remove critical warning on parser menuitem check (LP: #733918) - ∘ Fix dependencies in pkgconfig files (LP: #733263) - ∘ Handle NULL labels (LP: #733688) - ∘ Fix memory leaks from variants (LP: #722972) - - -- Ted Gould Wed, 16 Mar 2011 14:08:13 -0500 - -libdbusmenu (0.3.101-0ubuntu1) natty; urgency=low - - * New upstream release. - ∘ Add helper to get cached menuitem from widget - ∘ Have the GTK Dbusmenu Client handle theme directories (LP: #727325) - ∘ Fix a bunch of memory leaks (LP: #722972) - ∘ Handle _ in menuitems more correctly when parsing (LP: #621301) - ∘ Protect from NULL layout_props (LP: #729722) - ∘ Remove the property from the hashtable before signaling that - it's been changed (LP: #725603) - ∘ Wrap emitted properties in a variant - ∘ Fix enum templates so they can be included by other programs - without error - ∘ Setting the cached menu item (LP: #723463) (LP: #729128) (LP: #729194) - - -- Ted Gould Thu, 10 Mar 2011 11:12:50 -0600 - -libdbusmenu (0.3.100-0ubuntu4) natty; urgency=low - - * libdbusmenu-gtk/parser.c - - Ensure we set the CACHED_MENUITEM data on GtkWidget's, this fixes a few - bugs (LP: #723463) (LP: #729128) (LP: #729194) - - -- Ken VanDine Tue, 08 Mar 2011 20:49:41 -0500 - -libdbusmenu (0.3.100-0ubuntu3) natty; urgency=low - - * libdbusmenu-glib/menuitem.c - - Steal earlier instead of later so that signal handlers don't find the - value in the hashtable (LP: #725603) (LP: #730198) - - -- Ken VanDine Mon, 07 Mar 2011 14:27:09 -0500 - -libdbusmenu (0.3.100-0ubuntu2) natty; urgency=low - - * Cherry picked fix for path to find types.h - - -- Ken VanDine Fri, 04 Mar 2011 10:22:36 -0500 - -libdbusmenu (0.3.100-0ubuntu1) natty; urgency=low - - * New upstream release. - * GTK application menus are not correctly displayed (LP: #726678) - * Fix LP: #723873 - ensure that changing a menuitem property to a - default value gets propagated properly in the client - * Fix some crashes by disconnecting more signals when a menuitem is - deleted. LP: #725980 and LP: #726153 - * Making sure to grab the variant and dispose of it in handle_event. - * Change the destroy prototype to fix GIR warnings - * Fix emitting property changes to use tuples - * Track the icon theme directories - * Handle cases where passed in property names could be in the - properties hash table - * Making property names match DBus protocol recommendations - * Restricting GIR scanner to exported interfaces - * Use the library i18n libraries instead of the app ones - * Make GetLayout use the parent parameter - * debian/patches: All submitted upstream - - -- Ted Gould Thu, 03 Mar 2011 13:54:31 -0600 - -libdbusmenu (0.3.99-0ubuntu5) natty; urgency=low - - * debian/patches/lp726678.patch - - GTK application menus are not correctly displayed (LP: #726678) - - -- Ken VanDine Tue, 01 Mar 2011 12:14:35 -0500 - -libdbusmenu (0.3.99-0ubuntu4) natty; urgency=low - - * Fix a warning in gedit - - update debian/patches/fix-defaults-in-client.patch - * Fix missing submenus in bluetooth-applet - - add debian/patches/bluetooth-applet-fix.patch - - update debian/patches/series - - -- Chris Coulson Tue, 01 Mar 2011 15:13:00 +0000 - -libdbusmenu (0.3.99-0ubuntu3) natty; urgency=low - - * Fix LP: #723873 - ensure that changing a menuitem property to a default - value gets propagated properly in the client - - add debian/patches/fix-defaults-in-client.patch - - update debian/patches/series - - -- Chris Coulson Tue, 01 Mar 2011 00:47:24 +0000 - -libdbusmenu (0.3.99-0ubuntu2) natty; urgency=low - - * debian/patches/disconnect-more-signals.patch: - - Fix some crashes by disconnecting more signals when a menuitem is - deleted. LP: #725980 and LP: #726153 - - -- Michael Terry Mon, 28 Feb 2011 10:09:57 -0500 - -libdbusmenu (0.3.99-0ubuntu1) natty; urgency=low - - [ Ted Gould ] - * New upstream release. - * Add a signal on the menuitem for generic event support - * Handle the case of a single NULL entry as well. - * Not checking defaults when value is NULL - * Add the 'type' variable first when processing new - menuitems - * Protection from unref'ing NULL variants - * Only send the requested properties and request fewer - * Add in a defaults database - * Only send property updates if the menu item has been - seen on the bus. - * Add a property for text direction. - * Add a property for needing attention. - * Documentation fixes - * Making menuitems track their own parents - * Resolving property changes by looking at the properties - directly. - - [ Ken VanDine ] - * libdbusmenu-glib/menuitem.c - - Making sure to grab the variant and dispose of it in handle_event. - - -- Ken VanDine Thu, 24 Feb 2011 22:54:54 -0500 - -libdbusmenu (0.3.98-0ubuntu4) natty; urgency=low - - * Merged from trunk (rev 220) - - Cleaning up cleaning up so we don't unref twice and crash - - Fixing the signatures to make them more consistent - - Adding defaults to translatable files - - Support a set of defaults and not sending them over the bus. - - Fixing annotations and adding tests with python. - - -- Ken VanDine Wed, 23 Feb 2011 11:34:57 -0500 - -libdbusmenu (0.3.98-0ubuntu3) natty; urgency=low - - * debian/control: - - Use new libgtk-3-dev build-depends - - -- Robert Ancell Tue, 22 Feb 2011 16:16:44 +1100 - -libdbusmenu (0.3.98-0ubuntu2) natty; urgency=low - - * libdbusmenu-glib/{client,menuitem,server}.c - * Be more selective on unref - - -- Ken VanDine Tue, 22 Feb 2011 09:23:38 -0500 - -libdbusmenu (0.3.98-0ubuntu1) natty; urgency=low - - * New upstream release. - ∘ Fixing distcheck - ∘ Grouping Property Change events into a single DBus signal - ∘ Removing XML from the GetLayout function - ∘ Clean up icon handling in the parser (LP: #715864) - ∘ Fixing signatures on dbusmenu-dumper - * debian/control: Removing libxml2 Build-Dep - - -- Ted Gould Thu, 17 Feb 2011 11:11:40 -0600 - -libdbusmenu (0.3.97-0ubuntu1) natty; urgency=low - - [Ted Gould] - * New upstream release. - ∘ Handle ChildAdded on GtkShell items (LP: #709839) - ∘ Fixing take_children() to not unref - ∘ Fix naming of the GIR file (LP: #713099) - - [Ken VanDine] - * debian/gir1.2-dbusmenu-glib-0.4.install, - debian/libdbusmenu-glib-dev.install: Changing gir, typelib and vala - file names - - -- Ted Gould Thu, 10 Feb 2011 14:40:14 -0600 - -libdbusmenu (0.3.96-0ubuntu3) natty; urgency=low - - * libdbusmenu-gtk/parser.c - - Handle ChildAdded on GtkShell items and clean up the code so that it - has single functions for doing common operations. (LP: #709839) - - -- Ken VanDine Mon, 07 Feb 2011 09:29:09 -0500 - -libdbusmenu (0.3.96-0ubuntu2) natty; urgency=low - - * libdbusmenu-glib/menuitem.c - - take_children() shouldn't unref as the caller wouldn't get a chance - to use the items if this was the last ref. - - -- Ken VanDine Fri, 04 Feb 2011 12:18:13 -0500 - -libdbusmenu (0.3.96-0ubuntu1) natty; urgency=low - - * New upstream release. - * Remove signal handlers for correct objects - - -- Ted Gould Thu, 03 Feb 2011 14:11:16 -0600 - -libdbusmenu (0.3.95-0ubuntu1) natty; urgency=low - - * New upstream release. - * Fix crashes on rapidly creating and destroying client - and menu objects (LP: #709754) - * Fix dynamically changed submenus to get the parsed - (LP: #696896) - * Fix bad signature on GetProperties with no hits - - -- Ted Gould Mon, 31 Jan 2011 16:03:06 -0600 - -libdbusmenu (0.3.94-0ubuntu1) natty; urgency=low - - * New upstream release. - * Fixing setting toggle to a boolean - * Fixing some memory leaks - * Fixing signatures in GetChildren - * Look for the serializable menuitems and use their - build functions - * Fix critical message from being printed - * Fixing shutdown messages on destruction - * Fixing warnings from 'use-fallback' - * Adding a parser - * Adding a serializable menu item - - -- Ted Gould Thu, 27 Jan 2011 14:26:19 -0600 - -libdbusmenu (0.3.93-0ubuntu1) natty; urgency=low - - [ Ted Gould ] - * New upstream release. - * Fixing scanner export - * Increasing scanner warnings - * Signalling to DBus when object is registered - * Handling errors in GVariant better than crashing - - [ Ken VanDine ] - * debian/control - - Bumped build depends for libgtk3.0-dev to >= 2.99.2-1ubuntu2, a gir - related patch we needed was dropped in 2.99.2-1ubuntu1 but re-added - in 2.99.2-1ubuntu2 - - -- Ken VanDine Thu, 20 Jan 2011 15:05:52 -0500 - -libdbusmenu (0.3.92-0ubuntu3) natty; urgency=low - - * libdbusmenu-glib/server.c - * Better error handling when parsing g_variants (LP: #703039) - - -- Ken VanDine Tue, 18 Jan 2011 12:19:37 -0500 - -libdbusmenu (0.3.92-0ubuntu2) natty; urgency=low - - * libdbusmenu-glib/Makefile.am, libdbusmenu-gtk/Makefile.am - - Use EXPORT_PACKAGES to prevent circular build depends - - -- Ken VanDine Tue, 18 Jan 2011 10:05:15 -0500 - -libdbusmenu (0.3.92-0ubuntu1) natty; urgency=low - - * New upstream release. - * Fixing handle event to send unboxed values - * Build fixes - - -- Ted Gould Fri, 14 Jan 2011 10:43:44 -0600 - -libdbusmenu (0.3.91-0ubuntu1) natty; urgency=low - - * New upstream release. - * Porting from dbus-glib to GDBus - * Bumping the library ABI version - * debian/*.install: Changing to be the 0.4 version of the dbusmenu - API of all the filenames and paths. - * debian/control: Bumping ABI version in package names - * debian/control: Changing the GIR package names from "0.2" to - "0.4" which now the names of the actual files. - - -- Ted Gould Thu, 13 Jan 2011 10:24:28 -0600 - -libdbusmenu (0.3.90-0ubuntu3) natty; urgency=low - - * Updated for the gir abi transition - - -- Ken VanDine Thu, 16 Dec 2010 10:06:26 -0500 - -libdbusmenu (0.3.90-0ubuntu2) natty; urgency=low - - * libdbusmenu-gtk/genericmenuitem.c - - Switching away from using set_activate as that doesn't actually set - the value, it just signals - - -- Ken VanDine Thu, 09 Dec 2010 17:46:41 -0500 - -libdbusmenu (0.3.90-0ubuntu1) natty; urgency=low - - * debian/rules - - Added build targets to build with gtk3 enabled in additional to - default build with gtk2 - * debian/control - - Updated build depends to support building with gtk+-3.0 - - Added dh-autoreconf build depends - - Added libdbusmenu-gtk3-2, libdbusmenu-gtk3-dev, gir1.0-dbusmenu-gtk3-0.2 - binaries - - build depend on libgdk-pixbuf2.0-dev >= 2.22.1-0ubuntu4, needed - for GIR fixes - - Removed build depends for gir-repository-dev (LP: #677382) - - Use gir:Depends - * docs/libdbusmenu-gtk/reference/Makefile.am, libdbusmenu-glib/Makefile.am, - libdbusmenu-gtk/Makefile.am - - Fixes needed for building with-gtk=3 - - [ Ted Gould ] - * New upstream release. - * Breaking ABI and getting reserved back - * Adding build support for GTK2/3 builds - * Only force a flush of top level items, allow others to be - based on the count. - * debian/control, debian/libdbusmenu-glib2.install, - debian/libdbusmenu-gtk2.install: Switching package names to - match .so bump. - - -- Ken VanDine Wed, 24 Nov 2010 12:05:39 -0500 - -libdbusmenu (0.3.16-0ubuntu1) maverick; urgency=low - - * New upstream release: - * Don't use a typedef in the signal handler in the class to - avoid confusing vapigen. - - -- Ted Gould Wed, 22 Sep 2010 10:28:01 -0500 - -libdbusmenu (0.3.15-0ubuntu1) UNRELEASED; urgency=low - - * New upstream release: - - fix Action for top-level dropdown menu item not activated (LP: #637692) - - -- Didier Roche Wed, 22 Sep 2010 14:55:44 +0200 - -libdbusmenu (0.3.14-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Fixing a memory leak by unref'ing a hashtable - * Making a callback for the event dbus function happen off - of the mainloop so it returns a response. (LP: #636756) - - -- Ted Gould Wed, 15 Sep 2010 11:36:09 -0500 - -libdbusmenu (0.3.13-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Handling window grabs on activated signals (LP: #633275) - * Fixing the passing of the value to the results signal - * Adding a test for checking event results signal - * Changing the timeouts on event calls for better detection - of failing applications - - [Ken VanDine] - * debian/control - - Dropped build depends for dbus-test-runner, it isn't in the archive - yet, we should add that next cycle - - -- Ted Gould Thu, 09 Sep 2010 09:50:15 -0500 - -libdbusmenu (0.3.12-0ubuntu1) maverick; urgency=low - - * debian/rules: update the shlibs - - [ Ted Gould ] - * New upstream release. - * Support activation of menus client side - * Increase layout XML size (LP: #621238) - * Display an event for the status of the signal to the server - - -- Sebastien Bacher Thu, 26 Aug 2010 23:34:45 +0200 - -libdbusmenu (0.3.11-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Fix to handle whitespace in layout XML better - * Fixes to test scripts on ARM - - -- Ted Gould Thu, 19 Aug 2010 13:47:33 -0500 - -libdbusmenu (0.3.10-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Fixes to dbusmenu-dumper - - -- Ted Gould Thu, 12 Aug 2010 11:28:37 -0500 - -libdbusmenu (0.3.9-0ubuntu2) maverick; urgency=low - - * Rebuild with the current gobject introspection version - - -- Sebastien Bacher Tue, 10 Aug 2010 21:50:16 +0200 - -libdbusmenu (0.3.9-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Making it so that properties are requested bredth first - * Globbing layout signaling from the server - * Globbing property requests into group requests (LP: #604670) - - -- Ted Gould Mon, 02 Aug 2010 20:28:58 -0500 - -libdbusmenu (0.3.8-0ubuntu1) maverick; urgency=low - - * New upstream release. - - Added ItemActivationRequested signal. - - -- Ken VanDine Fri, 30 Jul 2010 13:44:34 -0400 - -libdbusmenu (0.3.7-1) unstable; urgency=low - - * Merge latest upstream from Ubuntu. - * Standards-Version: 3.9.1 - - -- Evgeni Golov Thu, 29 Jul 2010 12:00:04 +0200 - -libdbusmenu (0.3.7-0ubuntu1) maverick; urgency=low - - * New upstream release. - - -- Ken VanDine Thu, 22 Jul 2010 21:17:13 +0200 - -libdbusmenu (0.3.6-1) unstable; urgency=low - - * Merge new upstream from Ubuntu. - - -- Evgeni Golov Sat, 17 Jul 2010 10:47:35 +0200 - -libdbusmenu (0.3.6-0ubuntu2~ppa1) lucid; urgency=low - - * Upstream Merge - * Making dbusmenu-dumper have a click to dump feature. - * Autogen update - - -- Ted Gould Tue, 20 Jul 2010 16:40:29 -0500 - -libdbusmenu (0.3.6-0ubuntu1) maverick; urgency=low - - * New upstream release. - ∘ Protect against NULL values as event - - -- Ted Gould Thu, 15 Jul 2010 09:42:07 -0500 - -libdbusmenu (0.3.5-1) unstable; urgency=low - - * Merge new upstream and changes from Ubuntu. - * debian/control: - + Add missing "used" to the json package description. - - -- Evgeni Golov Wed, 14 Jul 2010 10:21:29 +0200 - -libdbusmenu (0.3.5-0ubuntu1) maverick; urgency=low - - * New upstream release. - ∘ Protect against NULL nodes (LP: #602444) - ∘ Remove extra warnings and messages - ∘ Handle not having a session bus better (LP: #598715) - - -- Ted Gould Thu, 08 Jul 2010 10:24:18 -0500 - -libdbusmenu (0.3.4-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Block building submenus on separators (LP: #598620) - * Adding more through JSON support for testing - * Fixing up value handling in dbusmenu-dumper - * debian/control, debian/libdbusmenu-jsonloader*install: Adding - two binary packages for the jsonloader test library. - - -- Ted Gould Thu, 01 Jul 2010 09:00:16 -0500 - -libdbusmenu (0.3.3-1) unstable; urgency=low - - * Merge Ubuntu. - Preserve Maintainer and Vcs-* fields. - * Standards-Version: 3.9.0 - * Source-Format: 1.0 for now - - -- Evgeni Golov Thu, 01 Jul 2010 11:42:23 +0200 - -libdbusmenu (0.3.3-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Adding support for menu shortcuts (LP: #591293) - * Fixing distcheck of documentation builds - * Autogen.sh fix for adding custom prefix (LP: #595565) - * Fixing children property name to match spec (LP: #597321) - * Merging in Debian branch - * debian/control: Switching branch on this branch to be the - dbusmenu-team. - * debian/rules: Updating shlibs to 0.3.3 for shortcut API additions - - -- Ted Gould Thu, 24 Jun 2010 09:32:42 -0500 - -libdbusmenu (0.3.2-1) unstable; urgency=low - - * Merge from Ubuntu. - Closes: #586069 - * debian/control: - - Set Maintainer to pkg-ayatana. - - Add myself as Uploader. - - Update package descriptions. - - Standards-Version: 3.8.4 - - Fix Homepage URL. - - Update Vcs-* fields. - - -doc packages are Arch:all - * debian/copyright: - - Convert to DEP5 format. - - Add Ken and Sebastien, according to changelog. - - Add Aurélien Gâteau, according to headers. - - -- Evgeni Golov Sun, 20 Jun 2010 13:56:00 +0200 - -libdbusmenu (0.3.2-0ubuntu1) maverick; urgency=low - - * debian/control - - added doc packages - - added build dep for gtk-doc-tools - * debian/libdbusmenu-glib-doc.install added - * debian/libdbusmenu-gtk-doc.install added - * debian/rules - - enabled gtk-doc for configure - - [Ted Gould] - * New upstream release. - * Set the 'child-display' property on menuitems that - have child menuitems. - * gtk-doc support - * Document the 'shortcut' property - - -- Ken VanDine Thu, 10 Jun 2010 16:33:42 -0400 - -libdbusmenu (0.3.1-0ubuntu1) maverick; urgency=low - - * New upstream release. - * Fix annotations for GIR scanner - * Add function to get submenu of GTK-ified items - * Fix signal prototype of ID update - * Fixing up VAPI files to build them correctly - * Fixing the version string in the GIR file - * Fix documentation title page - * Reject text nodes early (warnings with Qt integration) - * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file - names for package list. - * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the - typelib file. - - -- Ted Gould Fri, 04 Jun 2010 14:42:26 -0500 - -libdbusmenu (0.3.0-0ubuntu1~ppa1) lucid; urgency=low - - * New upstream release. - * Add function to get submenu of GTK-ified items - * Fix signal prototype of ID update - * Fixing up VAPI files to build them correctly - * Fixing the version string in the GIR file - * Fix documentation title page - * Reject text nodes early (warnings with Qt integration) - * debian/libdbusmenu-glib-dev.install: Updating gir and vapi file - names for package list. - * debian/gir1.0-dbusmenu-glib-0.2.install: Changing the name of the - typelib file. - - -- Ted Gould Thu, 27 May 2010 11:47:05 -0500 - -libdbusmenu (0.2.9-0ubuntu3) lucid; urgency=low - - * Upstream Merge - * Only unref root if the root has changed. - * Ensure that callbacks retain references to objects incase - they get deleted quickly. - * Protecting references before signalling - * Decrementing refs when added to child menus - - -- Ted Gould Sat, 17 Apr 2010 13:09:57 -0500 - -libdbusmenu (0.2.9-0ubuntu2) lucid; urgency=low - - * Upstream Merge - * Changing GTK layer to look at position in realized - children to avoid realization races. (LP: #555816) - * Don't allow setting children twice - * Ref children of a menuitem - * Return error when parent ID of getlayout can't be found - * Adding in visible property to docs - * Helpful comments in the code - - -- Ted Gould Thu, 15 Apr 2010 01:25:42 -0500 - -libdbusmenu (0.2.9-0ubuntu1) lucid; urgency=low - - * New upstream release. - * Documentation fix - * Changing the parse function to get_children instead of - taking them. (LP: #471044) - * Supporting AboutToShow in event callbacks to catch up - with QT implementation. - * Unrefing on layout updates (LP: #545026) - * Resetting sync versions on disconnection - * Removing useless warning - - -- Ted Gould Thu, 01 Apr 2010 09:14:36 -0500 - -libdbusmenu (0.2.8-0ubuntu2) lucid; urgency=low - - * debian/control: - - restore vcs location, we move back to the non import version, the other - one don't allow merging trunk changes - - [ Ted Gould ] - * Upstream Merge - * Changing the parse function to get_children instead of - taking them. (LP: #471044) - * Supporting AboutToShow in event callbacks to catch up - with QT implementation. - * Unrefing on layout updates (LP: #545026) - * Resetting sync versions on disconnection - * Removing useless warning - - -- Sebastien Bacher Thu, 01 Apr 2010 12:36:06 +0200 - -libdbusmenu (0.2.8-0ubuntu1) lucid; urgency=low - - * debian/control - - Dropped Vcs-Bzr and Vcs-Browser - - Added extended description for gir1.0-dbusmenu-gtk-0.2 and - gir1.0-dbusmenu-glib-0.2 - - * debian/rules - - bumped shlibs version to 0.2.8 for libdbusmenu-glib1 - - [Ted Gould] - * Upstream release 0.2.8 - * Adding support for blank icons (LP: #534854) - * Remove unneeded warning (LP: #537312) - * Fix typo in documentation - - -- Ken VanDine Thu, 25 Mar 2010 11:35:46 -0400 - -libdbusmenu (0.2.7-0ubuntu1) lucid; urgency=low - - * Upstream release 0.2.7 - * Adding in building of the GObject Introspection details - * Adding in building of VAPI files - * debian/control: - * Adding dependency on valac - * Adding in gir's as build dependencies. - * Adding in build dependencies for GIR dev - * Adding dependencies for gir-repository-dev and - gobject-introspection to ensure we get all the GI goodies. - * debian/control, debian/gir1.0-dbusmenu-glib-0.2.install, - debian/gir1.0-dbusmenu-gtk-0.2.install: Adding new packages to - hold the typelib files generated by GObject introspection. - * debian/libdbusmenu-glib-dev.install, - debian/libdbusmenu-gtk-dev.install: - * Added VAPI files to the packages. - * Added GIR files to the packages. - - -- Ted Gould Thu, 04 Mar 2010 11:13:43 -0600 - -libdbusmenu (0.2.6-0ubuntu1) lucid; urgency=low - - * Upstream release 0.2.6 - * Fix testing to make it more reliable - * Remove delayed property queueing as it was causing properties to not - get updated. (lp: #524308) - - -- Ted Gould Thu, 25 Feb 2010 10:23:49 -0600 - -libdbusmenu (0.2.5-0ubuntu1) lucid; urgency=low - - * Upstream release 0.2.5 - * Adding in menuitem proxy object. - * Adding ID to default item. - * debian/rules: Updating shlibs - - -- Ted Gould Thu, 18 Feb 2010 11:00:24 -0600 - -libdbusmenu (0.2.4-0ubuntu1) lucid; urgency=low - - * Upstream release 0.2.4 - * Remove uneccessary reference to stop duplication of menus - * Handle dbus method errors better - - -- Ted Gould Thu, 11 Feb 2010 10:13:56 -0600 - -libdbusmenu (0.2.3-0ubuntu3) lucid; urgency=low - - * Backported lp:~ted/dbusmenu/dbus-error-handling to fix the - indicator-applet crashing sometime on softwares close - (lp: #518900, #519019) - - -- Sebastien Bacher Wed, 10 Feb 2010 00:12:35 +0100 - -libdbusmenu (0.2.3-0ubuntu2) lucid; urgency=low - - * Upstream Merge - * Removing the ref to root and a setting of root - - -- Ted Gould Tue, 09 Feb 2010 08:53:00 -0600 - -libdbusmenu (0.2.3-0ubuntu1) lucid; urgency=low - - * Upstream release 0.2.3 - * Fixing handing of root IDs being zero - * Handling syncing of properties when reusing items - * Shipping new JSON files and READMEs for testing. - * libdbusmenu-tools.install: Add in json file and README so - that they're put in the right directories. - - -- Ted Gould Fri, 05 Feb 2010 11:24:58 -0800 - -libdbusmenu (0.2.2-0ubuntu3) lucid; urgency=low - - * debian/control: - - let libdbusmenu-glib1 breaks libdbusmenu-glib0 since they are create - issues at runtime if both got loaded - - -- Sebastien Bacher Thu, 04 Feb 2010 18:10:56 -0800 - -libdbusmenu (0.2.2-0ubuntu2) lucid; urgency=low - - * debian/control: fix a typo in the tools depends - - -- Sebastien Bacher Thu, 04 Feb 2010 14:18:47 -0800 - -libdbusmenu (0.2.2-0ubuntu1) lucid; urgency=low - - * Updated for the soname changes - - [ Ted Gould ] - * Upstream Release 0.2.2 - * Interoperability fixes - * Adding timestamps to events - * Better handling of XML - * Adding tools for timing dbusmenu - * debian/libdbusmenu-tools.install: Adding a wildcard to get - all of the tools in libexec - - -- Sebastien Bacher Thu, 04 Feb 2010 13:56:49 -0800 - -libdbusmenu (0.2.1-0ubuntu1) lucid; urgency=low - - * Upstream release 0.2.1 - - Fix to not destroy the image if we're still using it. - - Adding code to support icon names that have an implied direction in them. - - Fix to put a small amount of padding between the icon and the label. - - -- Ken VanDine Tue, 12 Jan 2010 11:03:39 -0500 - -libdbusmenu (0.2.0-0ubuntu3) lucid; urgency=low - - * debian/rules: - - updated shlibs version (lp: #505258) - - -- Sebastien Bacher Mon, 11 Jan 2010 16:04:11 +0100 - -libdbusmenu (0.2.0-0ubuntu2) lucid; urgency=low - - * Added debian/libdbusmenu-tools.install - * debian/control - - improved description for libdbusmenu-tools - - -- Ken VanDine Sat, 09 Jan 2010 09:05:47 -0500 - -libdbusmenu (0.2.0-0ubuntu1) lucid; urgency=low - - * Upstream release 0.2.0 - - Remove unused libdbusmenu-qt - - Changing API to be V0.2 for reals - - Adding underline support - - Test suite fixes and automation support - - dbus-dumper tool - - Switch to org.ayatana - - Fixing the handling of typed properties, especially bools. - - Adding GetChildren function for getting a single submenu - - Starting to watch DBus if the proxy builds fail. - - Test suite fixes - - Fixing the consistency between the #defines and what - was used in the code. - * debian/control, debian/libdbusmenu-tools.install: Setting - up a package for the new dbusmenu-dumper tool. - * debian/control: Mentioning nicely that this will cause - indicator-messages << 0.3 and indicator-session << 0.2 to - break. - - -- Ted Gould Fri, 08 Jan 2010 08:42:59 -0600 - -libdbusmenu (0.1.8-0ubuntu1) lucid; urgency=low - - * Upstream release 0.1.8 - * Changing the name to org.ayatana - * Underline fixes - * Documenation of the DBus API - * Adding the GPL v3 Copying file so that we're all legal. - - -- Ted Gould Thu, 10 Dec 2009 12:55:07 -0600 - -libdbusmenu (0.1.6-0ubuntu1) karmic; urgency=low - - * Upstream release 0.1.6 (LP: #442822) - * Managing the life-cycle of the GTK Menu item better to - ensure that it is positioned correctly and dies - appropriately. (LP: #430904) and (LP: #419953) - * Checking returned properties to ensure that there wasn't - DBus errors. (LP: #433719) - - -- Ted Gould Fri, 02 Oct 2009 17:00:45 -0500 - -libdbusmenu (0.1.5-0ubuntu1) karmic; urgency=low - - * New upstream release (LP: #436185) - - -- Ken VanDine Thu, 24 Sep 2009 17:12:25 -0400 - -libdbusmenu (0.1.4-0ubuntu1) karmic; urgency=low - - * Upstream release (LP: #432003) - - Applying a fix by not blocking if we're calling for the root. Everyone - should be listening for root changes anyway (lp: #427819) - - -- Ted Gould Thu, 17 Sep 2009 11:29:40 -0500 - -libdbusmenu (0.1.3-0ubuntu1) karmic; urgency=low - - * Upstream update 0.1.3 (LP: #427360) - * Fixes reordering of menu item issue - - -- Ted Gould Thu, 10 Sep 2009 08:43:47 -0500 - -libdbusmenu (0.1.2-0ubuntu1) karmic; urgency=low - - * debian/rules: - - updated shlib version - - [ Ted Gould ] - * Upstream release 0.1.2 (LP: #423958) - - [ Ken VanDine ] - * debian/control - - Specify full urls for Vcs-Bzr - - -- Sebastien Bacher Fri, 04 Sep 2009 11:12:38 +0200 - -libdbusmenu (0.1.0-0ubuntu1) karmic; urgency=low - - [ Ted Gould ] - * Upstream release 0.1.0 - * debian/watch: Added for tarball - * debian/control: - - Specify both Vcs-Bzr and Vcs-Browser - - Fixed the project name - - [ Martin Pitt ] - * Add bzr-builddep configuration for merge mode. - * debian/control: Fix Vcs-* links. - - -- Martin Pitt Thu, 27 Aug 2009 20:55:55 +0200 - -libdbusmenu (0.1~bzr5-0ubuntu1) karmic; urgency=low - - * First version. - - -- Ted Gould Wed, 05 Aug 2009 00:46:41 +0100 - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 45a4fb7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/control b/debian/control deleted file mode 100644 index a7ff43d..0000000 --- a/debian/control +++ /dev/null @@ -1,243 +0,0 @@ -Source: libdbusmenu -Section: gnome -Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: The Ayatana Packagers -Uploaders: Evgeni Golov -Build-Depends: debhelper (>= 8.1.3), - cdbs (>= 0.4.93), - quilt, - libgtk2.0-dev (>= 2.24.4-1~), - libgtk-3-dev (>= 2.99.2-1ubuntu2), - libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), - libdbus-glib-1-dev, - gnome-doc-utils, - gtk-doc-tools, - libtool, - intltool, - libjson-glib-dev (>= 0.13.4), - gobject-introspection, - libgirepository1.0-dev (>= 0.9.3), - gir1.2-glib-2.0, - gir1.2-gtk-2.0, - gir1.2-gtk-3.0, - libx11-dev (>= 1.3), - dh-autoreconf, - valac-0.14 -Standards-Version: 3.9.2 -Homepage: https://launchpad.net/dbusmenu -Vcs-Bzr: http://bzr.debian.org/bzr/pkg-ayatana/libdbusmenu/debian -Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-ayatana/libdbusmenu/debian - -Package: libdbusmenu-glib4 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Breaks: indicator-messages (<< 0.3.0), - indicator-session (<< 0.2.0), - libdbusmenu-glib0, - gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2), - gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4) -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Description: library for passing menus over DBus - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package contains shared libraries to be used by applications. - -Package: libdbusmenu-glib-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libdbusmenu-glib4 (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76), - libgtk2.0-dev (>= 2.12.0) -Multi-Arch: same -Description: library for passing menus over DBus - development files - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package contains files that are needed to build applications. - -Package: libdbusmenu-gtk4 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Description: library for passing menus over DBus - GTK+ version - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package contains shared libraries to be used by GTK+ applications. - -Package: libdbusmenu-gtk-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libdbusmenu-gtk4 (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76), - libgtk2.0-dev (>= 2.12.0), - libdbusmenu-glib-dev -Multi-Arch: same -Description: library for passing menus over DBus - GTK+ version developement files - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package contains files that are needed to build GTK+ applications. - -Package: libdbusmenu-tools -Section: devel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - python, - libdbusmenu-glib4 (= ${binary:Version}) -Multi-Arch: foreign -Description: tools useful during development with libdbusmenu - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package contains tools that are useful when developing and building - applications with libdbusmenu. - -Package: gir1.2-dbusmenu-glib-0.4 -Section: libs -Architecture: any -Depends: ${misc:Depends}, - libdbusmenu-glib4 (= ${binary:Version}), - ${gir:Depends} -Breaks: gir1.2-unity-3.0 (<< 3.8.4-0ubuntu2), - gir1.2-indicate-0.5 (<< 0.5.0-0ubuntu4) -Description: typelib file for libdbusmenu-glib4 - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-glib4. - -Package: gir1.2-dbusmenu-gtk-0.4 -Section: libs -Architecture: any -Depends: ${misc:Depends}, - libdbusmenu-gtk4 (= ${binary:Version}), - ${gir:Depends} -Description: typelib file for libdbusmenu-gtk4 - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-gtk4. - -Package: libdbusmenu-glib-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Description: library for passing menus over DBus - documentation - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package contains developer documentation for libdbusmenu-glib. - -Package: libdbusmenu-gtk-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Description: library for passing menus over DBus - GTK+ version documentation - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package contains developer documentation for libdbusmenu-gtk. - -Package: libdbusmenu-jsonloader4 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Description: library for passing menus over DBus - Test lib - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package contains shared libraries to be used by test suites in - applications or libraries using dbusmenu. - -Package: libdbusmenu-jsonloader-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libdbusmenu-jsonloader4 (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76), - libdbusmenu-glib-dev (= ${binary:Version}), - libjson-glib-dev -Multi-Arch: same -Description: library for passing menus over DBus - Test lib development files - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package contains files that are needed to build test suites in - applications or libraries using dbusmenu. - -Package: libdbusmenu-gtk3-4 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends} -Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same -Description: library for passing menus over DBus - GTK+ version - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package contains shared libraries to be used by GTK+ applications. - -Package: libdbusmenu-gtk3-dev -Section: libdevel -Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - libdbusmenu-gtk3-4 (= ${binary:Version}), - libdbus-glib-1-dev (>= 0.76), - libgtk-3-dev (>= 2.91.4-0ubuntu1), - libdbusmenu-glib-dev -Multi-Arch: same -Description: library for passing menus over DBus - GTK+ version developement files - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package contains files that are needed to build GTK+ applications. - -Package: gir1.2-dbusmenu-gtk3-0.4 -Section: libs -Architecture: any -Depends: ${misc:Depends}, - libdbusmenu-gtk3-4 (= ${binary:Version}), - ${gir:Depends} -Description: typelib file for libdbusmenu-gtk3-4 - libdbusmenu passes a menu structure across DBus so that a program can - create a menu simply without worrying about how it is displayed on the - other side of the bus. - . - This package can be used by other packages using the GIRepository format to - generate dynamic bindings for libdbusmenu-gtk4. - diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 6d7c11b..0000000 --- a/debian/copyright +++ /dev/null @@ -1,40 +0,0 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Name: libdbusmenu -Maintainer: Ted Gould -Source: https://launchpad.net/dbusmenu - -Files: * -Copyright: 2009-2010 Ted Gould , Canonical Ltd. -License: GPL-3 - -Files: libdbusmenu-{glib,gtk}/* -Copyright: 2009-2010 Ted Gould , Canonical Ltd. -License: LGPL-2.1 | LGPL-3 - -Files: libdbusmenu-glib/dbus-menu.xml -Copyright: 2009-2010 Ted Gould , Canonical Ltd. -Copyright: 2009-2010 Aurélien Gâteau -License: LGPL-2.1 | LGPL-3 - -Files: tools/{dbusmenu-bench,testapp/main.c} -Copyright: 2009-2010 Aurélien Gâteau -License: LGPL-2.1 | LGPL-3 - -Files: debian/* -Copyright: 2009-2010 Evgeni Golov -Copyright: 2009-2010 Ted Gould , Canonical Ltd. -Copyright: 2009-2010 Sebastien Bacher -Copyright: 2009-2010 Ken VanDine -License: GPL-3 - -License: GPL-3 - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. - -License: LGPL-2.1 - On Debian systems, the complete text of the GNU Lesser General - Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. - -License: LGPL-3 - On Debian systems, the complete text of the GNU Lesser General - Public License version 3 can be found in `/usr/share/common-licenses/LGPL-3'. diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install deleted file mode 100644 index da62142..0000000 --- a/debian/gir1.2-dbusmenu-glib-0.4.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/girepository-1.0/Dbusmenu-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/gir1.2-dbusmenu-gtk-0.4.install b/debian/gir1.2-dbusmenu-gtk-0.4.install deleted file mode 100644 index 1a62fd5..0000000 --- a/debian/gir1.2-dbusmenu-gtk-0.4.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/girepository-1.0/DbusmenuGtk-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/gir1.2-dbusmenu-gtk3-0.4.install b/debian/gir1.2-dbusmenu-gtk3-0.4.install deleted file mode 100644 index 4c56230..0000000 --- a/debian/gir1.2-dbusmenu-gtk3-0.4.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/girepository-1.0/DbusmenuGtk3-0.4.typelib /usr/lib/girepository-1.0/ diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install deleted file mode 100644 index fc7079c..0000000 --- a/debian/libdbusmenu-glib-dev.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/include/libdbusmenu-0.4/libdbusmenu-glib /usr/include/libdbusmenu-0.4/ -usr/lib/*/pkgconfig/dbusmenu-glib-0.4.pc -usr/lib/*/libdbusmenu-glib.a -usr/lib/*/libdbusmenu-glib.so -usr/share/gir-1.0/Dbusmenu-0.4.gir /usr/share/gir-1.0/ -usr/share/vala/vapi/Dbusmenu-0.4.vapi /usr/share/vala/vapi/ diff --git a/debian/libdbusmenu-glib-doc.install b/debian/libdbusmenu-glib-doc.install deleted file mode 100644 index 5d99d73..0000000 --- a/debian/libdbusmenu-glib-doc.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/gtk-doc/html/libdbusmenu-glib /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-glib4.install b/debian/libdbusmenu-glib4.install deleted file mode 100644 index 4c05f07..0000000 --- a/debian/libdbusmenu-glib4.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libdbusmenu-glib.so.* diff --git a/debian/libdbusmenu-glib4.symbols b/debian/libdbusmenu-glib4.symbols deleted file mode 100644 index 0e0dcb4..0000000 --- a/debian/libdbusmenu-glib4.symbols +++ /dev/null @@ -1,80 +0,0 @@ -libdbusmenu-glib.so.4 libdbusmenu-glib4 #MINVER# - dbus_menu_clean_xml@Base 0.4.2 - dbusmenu_client_add_type_handler@Base 0.4.2 - dbusmenu_client_add_type_handler_full@Base 0.4.2 - dbusmenu_client_get_icon_paths@Base 0.4.2 - dbusmenu_client_get_root@Base 0.4.2 - dbusmenu_client_get_status@Base 0.4.2 - dbusmenu_client_get_text_direction@Base 0.4.2 - dbusmenu_client_get_type@Base 0.4.2 - dbusmenu_client_menuitem_get_type@Base 0.4.2 - dbusmenu_client_menuitem_new@Base 0.4.2 - dbusmenu_client_new@Base 0.4.2 - dbusmenu_client_send_about_to_show@Base 0.4.2 - dbusmenu_client_send_event@Base 0.4.2 - dbusmenu_defaults_default_get@Base 0.4.2 - dbusmenu_defaults_default_get_type@Base 0.4.2 - dbusmenu_defaults_default_set@Base 0.4.2 - dbusmenu_defaults_get_type@Base 0.4.2 - dbusmenu_defaults_ref_default@Base 0.4.2 - dbusmenu_menuitem_build_variant@Base 0.4.2 - dbusmenu_menuitem_child_add_position@Base 0.4.2 - dbusmenu_menuitem_child_append@Base 0.4.2 - dbusmenu_menuitem_child_delete@Base 0.4.2 - dbusmenu_menuitem_child_find@Base 0.4.2 - dbusmenu_menuitem_child_prepend@Base 0.4.2 - dbusmenu_menuitem_child_reorder@Base 0.4.2 - dbusmenu_menuitem_exposed@Base 0.4.2 - dbusmenu_menuitem_find_id@Base 0.4.2 - dbusmenu_menuitem_foreach@Base 0.4.2 - dbusmenu_menuitem_get_children@Base 0.4.2 - dbusmenu_menuitem_get_id@Base 0.4.2 - dbusmenu_menuitem_get_parent@Base 0.4.2 - dbusmenu_menuitem_get_position@Base 0.4.2 - dbusmenu_menuitem_get_position_realized@Base 0.4.2 - dbusmenu_menuitem_get_root@Base 0.4.2 - dbusmenu_menuitem_get_type@Base 0.4.2 - dbusmenu_menuitem_handle_event@Base 0.4.2 - dbusmenu_menuitem_new@Base 0.4.2 - dbusmenu_menuitem_new_with_id@Base 0.4.2 - dbusmenu_menuitem_properties_copy@Base 0.4.2 - dbusmenu_menuitem_properties_list@Base 0.4.2 - dbusmenu_menuitem_properties_variant@Base 0.4.2 - dbusmenu_menuitem_property_exist@Base 0.4.2 - dbusmenu_menuitem_property_get@Base 0.4.2 - dbusmenu_menuitem_property_get_bool@Base 0.4.2 - dbusmenu_menuitem_property_get_int@Base 0.4.2 - dbusmenu_menuitem_property_get_variant@Base 0.4.2 - dbusmenu_menuitem_property_is_default@Base 0.4.2 - dbusmenu_menuitem_property_remove@Base 0.4.2 - dbusmenu_menuitem_property_set@Base 0.4.2 - dbusmenu_menuitem_property_set_bool@Base 0.4.2 - dbusmenu_menuitem_property_set_int@Base 0.4.2 - dbusmenu_menuitem_property_set_variant@Base 0.4.2 - dbusmenu_menuitem_proxy_get_type@Base 0.4.2 - dbusmenu_menuitem_proxy_get_wrapped@Base 0.4.2 - dbusmenu_menuitem_proxy_new@Base 0.4.2 - dbusmenu_menuitem_realized@Base 0.4.2 - dbusmenu_menuitem_send_about_to_show@Base 0.4.2 - dbusmenu_menuitem_set_parent@Base 0.4.2 - dbusmenu_menuitem_set_realized@Base 0.4.2 - dbusmenu_menuitem_set_root@Base 0.4.2 - dbusmenu_menuitem_show_to_user@Base 0.4.2 - dbusmenu_menuitem_take_children@Base 0.4.2 - dbusmenu_menuitem_unparent@Base 0.4.2 - dbusmenu_server_get_icon_paths@Base 0.4.2 - dbusmenu_server_get_status@Base 0.4.2 - dbusmenu_server_get_text_direction@Base 0.4.2 - dbusmenu_server_get_type@Base 0.4.2 - dbusmenu_server_new@Base 0.4.2 - dbusmenu_server_set_icon_paths@Base 0.4.2 - dbusmenu_server_set_root@Base 0.4.2 - dbusmenu_server_set_status@Base 0.4.2 - dbusmenu_server_set_text_direction@Base 0.4.2 - dbusmenu_status_get_nick@Base 0.4.2 - dbusmenu_status_get_type@Base 0.4.2 - dbusmenu_status_get_value_from_nick@Base 0.4.2 - dbusmenu_text_direction_get_nick@Base 0.4.2 - dbusmenu_text_direction_get_type@Base 0.4.2 - dbusmenu_text_direction_get_value_from_nick@Base 0.4.2 - session_bus_cb@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk-dev.install b/debian/libdbusmenu-gtk-dev.install deleted file mode 100644 index ab8e8a9..0000000 --- a/debian/libdbusmenu-gtk-dev.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/include/libdbusmenu-0.4/libdbusmenu-gtk /usr/include/libdbusmenu-0.4/ -usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc -usr/lib/*/libdbusmenu-gtk.a -usr/lib/*/libdbusmenu-gtk.so -usr/share/gir-1.0/DbusmenuGtk-0.4.gir /usr/share/gir-1.0/ -usr/share/vala/vapi/DbusmenuGtk-0.4.vapi /usr/share/vala/vapi/ diff --git a/debian/libdbusmenu-gtk-doc.install b/debian/libdbusmenu-gtk-doc.install deleted file mode 100644 index 664f00c..0000000 --- a/debian/libdbusmenu-gtk-doc.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/ diff --git a/debian/libdbusmenu-gtk3-4.install b/debian/libdbusmenu-gtk3-4.install deleted file mode 100644 index a425da7..0000000 --- a/debian/libdbusmenu-gtk3-4.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libdbusmenu-gtk3.so.* diff --git a/debian/libdbusmenu-gtk3-4.symbols b/debian/libdbusmenu-gtk3-4.symbols deleted file mode 100644 index efc696c..0000000 --- a/debian/libdbusmenu-gtk3-4.symbols +++ /dev/null @@ -1,36 +0,0 @@ -libdbusmenu-gtk3.so.4 libdbusmenu-gtk3-4 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_check_type_get_nick@Base 0.4.92 - genericmenuitem_check_type_get_type@Base 0.4.92 - genericmenuitem_check_type_get_value_from_nick@Base 0.4.92 - genericmenuitem_disposition_get_nick@Base 0.4.92 - genericmenuitem_disposition_get_type@Base 0.4.92 - genericmenuitem_disposition_get_value_from_nick@Base 0.4.92 - genericmenuitem_get_disposition@Base 0.4.92 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_disposition@Base 0.4.92 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - genericmenuitem_state_get_nick@Base 0.4.92 - genericmenuitem_state_get_type@Base 0.4.92 - genericmenuitem_state_get_value_from_nick@Base 0.4.92 - theme_dir_db@Base 0.4.2 diff --git a/debian/libdbusmenu-gtk3-dev.install b/debian/libdbusmenu-gtk3-dev.install deleted file mode 100644 index 56f8fba..0000000 --- a/debian/libdbusmenu-gtk3-dev.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/include/libdbusmenu-0.4/libdbusmenu-gtk3 /usr/include/libdbusmenu-0.4/ -usr/lib/*/pkgconfig/dbusmenu-gtk3-0.4.pc -usr/lib/*/libdbusmenu-gtk3.a -usr/lib/*/libdbusmenu-gtk3.so -usr/share/gir-1.0/DbusmenuGtk3-0.4.gir /usr/share/gir-1.0/ -usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi /usr/share/gir-1.0/ diff --git a/debian/libdbusmenu-gtk4.install b/debian/libdbusmenu-gtk4.install deleted file mode 100644 index 546d698..0000000 --- a/debian/libdbusmenu-gtk4.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libdbusmenu-gtk.so.* diff --git a/debian/libdbusmenu-gtk4.symbols b/debian/libdbusmenu-gtk4.symbols deleted file mode 100644 index eacb806..0000000 --- a/debian/libdbusmenu-gtk4.symbols +++ /dev/null @@ -1,36 +0,0 @@ -libdbusmenu-gtk.so.4 libdbusmenu-gtk4 #MINVER# - dbusmenu_gtk_parse_get_cached_item@Base 0.4.2 - dbusmenu_gtk_parse_menu_structure@Base 0.4.2 - dbusmenu_gtkclient_get_accel_group@Base 0.4.2 - dbusmenu_gtkclient_get_type@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get@Base 0.4.2 - dbusmenu_gtkclient_menuitem_get_submenu@Base 0.4.2 - dbusmenu_gtkclient_new@Base 0.4.2 - dbusmenu_gtkclient_newitem_base@Base 0.4.2 - dbusmenu_gtkclient_set_accel_group@Base 0.4.2 - dbusmenu_gtkmenu_get_client@Base 0.4.2 - dbusmenu_gtkmenu_get_type@Base 0.4.2 - dbusmenu_gtkmenu_new@Base 0.4.2 - dbusmenu_menuitem_property_get_image@Base 0.4.2 - dbusmenu_menuitem_property_get_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_image@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_menuitem@Base 0.4.2 - dbusmenu_menuitem_property_set_shortcut_string@Base 0.4.2 - genericmenuitem_check_type_get_nick@Base 0.4.92 - genericmenuitem_check_type_get_type@Base 0.4.92 - genericmenuitem_check_type_get_value_from_nick@Base 0.4.92 - genericmenuitem_disposition_get_nick@Base 0.4.92 - genericmenuitem_disposition_get_type@Base 0.4.92 - genericmenuitem_disposition_get_value_from_nick@Base 0.4.92 - genericmenuitem_get_disposition@Base 0.4.92 - genericmenuitem_get_image@Base 0.4.2 - genericmenuitem_get_type@Base 0.4.2 - genericmenuitem_set_check_type@Base 0.4.2 - genericmenuitem_set_disposition@Base 0.4.92 - genericmenuitem_set_image@Base 0.4.2 - genericmenuitem_set_state@Base 0.4.2 - genericmenuitem_state_get_nick@Base 0.4.92 - genericmenuitem_state_get_type@Base 0.4.92 - genericmenuitem_state_get_value_from_nick@Base 0.4.92 - theme_dir_db@Base 0.4.2 diff --git a/debian/libdbusmenu-jsonloader-dev.install b/debian/libdbusmenu-jsonloader-dev.install deleted file mode 100644 index ebbb5ea..0000000 --- a/debian/libdbusmenu-jsonloader-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/include/libdbusmenu-0.4/libdbusmenu-jsonloader /usr/include/libdbusmenu-0.4/ -usr/lib/*/pkgconfig/dbusmenu-jsonloader-0.4.pc -usr/lib/*/libdbusmenu-jsonloader.a -usr/lib/*/libdbusmenu-jsonloader.so diff --git a/debian/libdbusmenu-jsonloader4.install b/debian/libdbusmenu-jsonloader4.install deleted file mode 100644 index 67976fd..0000000 --- a/debian/libdbusmenu-jsonloader4.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/*/libdbusmenu-jsonloader.so.* diff --git a/debian/libdbusmenu-jsonloader4.symbols b/debian/libdbusmenu-jsonloader4.symbols deleted file mode 100644 index 38a6868..0000000 --- a/debian/libdbusmenu-jsonloader4.symbols +++ /dev/null @@ -1,3 +0,0 @@ -libdbusmenu-jsonloader.so.4 libdbusmenu-jsonloader4 #MINVER# - dbusmenu_json_build_from_file@Base 0.4.2 - dbusmenu_json_build_from_node@Base 0.4.2 diff --git a/debian/libdbusmenu-tools.install b/debian/libdbusmenu-tools.install deleted file mode 100644 index 1a79739..0000000 --- a/debian/libdbusmenu-tools.install +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/libdbusmenu/dbusmenu-* /usr/lib/libdbusmenu/ -usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ -usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 8eeb376..0000000 --- a/debian/rules +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/make -f - -DEB_BUILDDIR = build -DEB_MAKE_FLAVORS = gtk2 gtk3 - -include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/autoreconf.mk -include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/debhelper.mk - -DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ -DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ - -DEB_DH_INSTALL_ARGS_libdbusmenu-gtk4 += --sourcedir=debian/tmp/gtk2 -DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-dev += --sourcedir=debian/tmp/gtk2 -DEB_DH_INSTALL_ARGS_libdbusmenu-gtk-doc += --sourcedir=debian/tmp/gtk2 -DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk-0.4 += --sourcedir=debian/tmp/gtk2 - -DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-glib-0.4 += --sourcedir=debian/tmp/gtk3 -DEB_DH_INSTALL_ARGS_gir1.2-dbusmenu-gtk3-0.4 += --sourcedir=debian/tmp/gtk3 -DEB_DH_INSTALL_ARGS_libdbusmenu-glib4 += --sourcedir=debian/tmp/gtk3 -DEB_DH_INSTALL_ARGS_libdbusmenu-glib-dev += --sourcedir=debian/tmp/gtk3 -DEB_DH_INSTALL_ARGS_libdbusmenu-glib-doc += --sourcedir=debian/tmp/gtk3 -DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-4 += --sourcedir=debian/tmp/gtk3 -DEB_DH_INSTALL_ARGS_libdbusmenu-gtk3-dev += --sourcedir=debian/tmp/gtk3 -DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader4 += --sourcedir=debian/tmp/gtk3 -DEB_DH_INSTALL_ARGS_libdbusmenu-jsonloader-dev += --sourcedir=debian/tmp/gtk3 -DEB_DH_INSTALL_ARGS_libdbusmenu-tools += --sourcedir=debian/tmp/gtk3 - -DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 -DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 - -DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) - -DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk4 = -- -xlibgtk2.0-0 -DEB_DH_SHLIBDEPS_ARGS_libdbusmenu-gtk3-4 = -- -xlibgtk-3-0 - -LDFLAGS += -Wl,-z,defs -Wl,--as-needed - -debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) -debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) - -common-install-arch:: - find debian/tmp -name \*.la -delete diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index d3827e7..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -1.0 diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 9f089a5..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://launchpad.net/dbusmenu/+download .*/libdbusmenu-([0-9.]+)\.tar\.gz -- cgit v1.2.3 From 0845cb4986d649c38e7f9b9784af76539bfb2dea Mon Sep 17 00:00:00 2001 From: Alex Launi Date: Fri, 16 Dec 2011 16:43:22 -0500 Subject: build fixes --- Makefile.am.enum | 2 +- libdbusmenu-glib/Makefile.am | 27 ++++++++++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/Makefile.am.enum b/Makefile.am.enum index 0503de0..a85061a 100644 --- a/Makefile.am.enum +++ b/Makefile.am.enum @@ -35,7 +35,7 @@ stamp-enum-types: $(glib_enum_headers) $(glib_enum_h): stamp-enum-types @true -$(glib_enum_c): $(glib_enum_h) +$(glib_enum_c): $(builddir)/$(glib_enum_h) $(QUIET_GEN)mkdir -p `dirname $(builddir)/$(glib_enum_c)` $(QUIET_GEN)$(GLIB_MKENUMS) \ --template $(srcdir)/$(enum_tmpl_c) \ diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 519ba5f..591bf30 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -19,7 +19,6 @@ libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-glib/ EXPORTED_OBJECTS = \ - enum-types.h \ menuitem.h \ menuitem-proxy.h \ server.h \ @@ -27,6 +26,7 @@ EXPORTED_OBJECTS = \ libdbusmenu_glibinclude_HEADERS = \ $(EXPORTED_OBJECTS) \ + enum-types.h \ dbusmenu-glib.h \ types.h @@ -70,9 +70,16 @@ libdbusmenu_glib_la_LIBADD = \ pkgconfig_DATA = dbusmenu-glib-0.4.pc pkgconfigdir = $(libdir)/pkgconfig -glib_enum_h = $(srcdir)/enum-types.h -glib_enum_c = $(srcdir)/enum-types.c -glib_enum_headers = $(addprefix $(srcdir)/, $(libdbusmenu_glibinclude_HEADERS)) +ENUMHEADERS = \ + menuitem.h \ + menuitem-proxy.h \ + server.h \ + client.h \ + types.h + +glib_enum_h = enum-types.h +glib_enum_c = enum-types.c +glib_enum_headers = $(addprefix $(srcdir)/, $(ENUMHEADERS)) DISTCLEANFILES += \ enum-types.c \ @@ -158,16 +165,22 @@ INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) if HAVE_INTROSPECTION +introspection_objects = \ + $(addprefix $(srcdir)/, $(EXPORTED_OBJECTS)) \ + $(builddir)/enum-types.h + introspection_sources = \ - $(libdbusmenu_glibinclude_HEADERS) \ - $(EXPORTED_OBJECTS:.h=.c) + $(addprefix $(srcdir)/, $(EXPORTED_OBJECTS)) \ + $(srcdir)/dbusmenu-glib.h \ + $(srcdir)/types.h \ + $(introspection_objects:.h=.c) Dbusmenu-0.4.gir: libdbusmenu-glib.la Dbusmenu_0_4_gir_INCLUDES = \ GObject-2.0 Dbusmenu_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir) Dbusmenu_0_4_gir_LIBS = libdbusmenu-glib.la -Dbusmenu_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources)) +Dbusmenu_0_4_gir_FILES = $(introspection_sources) Dbusmenu_0_4_gir_NAMESPACE = Dbusmenu Dbusmenu_0_4_gir_VERSION = 0.4 Dbusmenu_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4 -- cgit v1.2.3 From 82f99f0a30316807d0c261308bc207e74eacbd33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Thu, 5 Jan 2012 20:39:42 +0100 Subject: Separate libdbusmenu-glib and libdbusmenu-gtk include directories --- libdbusmenu-glib/Makefile.am | 2 +- libdbusmenu-glib/dbusmenu-glib-0.4.pc.in | 2 +- libdbusmenu-gtk/Makefile.am | 2 +- libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in | 2 +- libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in | 2 +- tests/Makefile.am | 2 +- tests/dbusmenu-jsonloader-0.4.pc.in | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 7d4ea5d..5a04900 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -15,7 +15,7 @@ include $(top_srcdir)/Makefile.am.enum lib_LTLIBRARIES = \ libdbusmenu-glib.la -libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-glib/ +libdbusmenu_glibincludedir=$(includedir)/libdbusmenu-glib-0.4/libdbusmenu-glib/ EXPORTED_OBJECTS = \ diff --git a/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in b/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in index 31a1eac..fd71acf 100644 --- a/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in +++ b/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -Cflags: -I${includedir}/libdbusmenu-0.4 +Cflags: -I${includedir}/libdbusmenu-glib-0.4 Requires: Libs: -L${libdir} -ldbusmenu-glib diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index 7860433..2b3075f 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -33,7 +33,7 @@ glib_enum_headers = $(srcdir)/genericmenuitem.h # Include Directory ##################### -libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu$(VER)-0.4/libdbusmenu-gtk/ +libdbusmenu_gtkincludedir=$(includedir)/libdbusmenu-gtk$(VER)-0.4/libdbusmenu-gtk/ libdbusmenu_gtkinclude_HEADERS = \ dbusmenu-gtk.h \ diff --git a/libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in b/libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in index 9a1b460..cae4c10 100644 --- a/libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in +++ b/libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -Cflags: -I${includedir}/libdbusmenu-0.4 +Cflags: -I${includedir}/libdbusmenu-gtk-0.4 Requires: dbusmenu-glib-0.4 gdk-pixbuf-2.0 gtk+-2.0 Libs: -L${libdir} -ldbusmenu-gtk diff --git a/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in b/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in index c320a57..ba4c1aa 100644 --- a/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in +++ b/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -Cflags: -I${includedir}/libdbusmenu3-0.4 +Cflags: -I${includedir}/libdbusmenu-gtk3-0.4 Requires: dbusmenu-glib-0.4 gdk-pixbuf-2.0 gtk+-3.0 Libs: -L${libdir} -ldbusmenu-gtk3 diff --git a/tests/Makefile.am b/tests/Makefile.am index a4e8682..5110b8e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -86,7 +86,7 @@ TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=$(top_builddir)/libdbusmenu-glib:$(top_b lib_LTLIBRARIES = libdbusmenu-jsonloader.la -libdbusmenu_jsonloaderincludedir=$(includedir)/libdbusmenu-0.4/libdbusmenu-jsonloader/ +libdbusmenu_jsonloaderincludedir=$(includedir)/libdbusmenu-glib-0.4/libdbusmenu-jsonloader/ libdbusmenu_jsonloaderinclude_HEADERS = \ json-loader.h diff --git a/tests/dbusmenu-jsonloader-0.4.pc.in b/tests/dbusmenu-jsonloader-0.4.pc.in index 62bfeb2..1920d02 100644 --- a/tests/dbusmenu-jsonloader-0.4.pc.in +++ b/tests/dbusmenu-jsonloader-0.4.pc.in @@ -4,7 +4,7 @@ libdir=@libdir@ bindir=@bindir@ includedir=@includedir@ -Cflags: -I${includedir}/libdbusmenu-0.1 +Cflags: -I${includedir}/libdbusmenu-glib-0.4 Requires: dbusmenu-glib-0.4 json-glib-1.0 Libs: -L${libdir} -ldbusmenu-jsonloader -- cgit v1.2.3 From 59b738bce8ad3b94f468f01486b503bfd4470920 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Thu, 12 Jan 2012 11:17:14 +0100 Subject: Make use of deprecated API non-fatal. --- configure.ac | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index ba5cd4b..13efd3c 100644 --- a/configure.ac +++ b/configure.ac @@ -23,14 +23,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) -AC_ARG_ENABLE([deprecations], - [AS_HELP_STRING([--enable-deprecations], - [allow deprecated API usage @<:@default=yes@:>@])], - [], - [enable_deprecations=yes]) -AS_IF([test "x$enable_deprecations" = xno], - [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"] -) +CFLAGS="$CFLAGS -Wno-error=deprecated-declarations" ########################### # GTK Doc -- cgit v1.2.3 From 248e0c0f0ce3883579caa56369e7e92340ae9c64 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Thu, 12 Jan 2012 11:35:50 +0100 Subject: in gtk3, use stock signals instead of Ubuntu-specific ones --- libdbusmenu-gtk/Makefile.am | 2 +- libdbusmenu-gtk/parser.c | 35 +++++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index b4564d1..9e0967f 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -76,7 +76,7 @@ libdbusmenu_gtk3includedir = $(libdbusmenu_gtkincludedir) libdbusmenu_gtk3include_HEADERS = $(libdbusmenu_gtkinclude_HEADERS) libdbusmenu_gtk3_la_SOURCES = $(libdbusmenu_gtk_la_SOURCES) libdbusmenu_gtk3_la_LDFLAGS = $(libdbusmenu_gtk_la_LDFLAGS) -libdbusmenu_gtk3_la_CFLAGS = $(libdbusmenu_gtk_la_CFLAGS) +libdbusmenu_gtk3_la_CFLAGS = $(libdbusmenu_gtk_la_CFLAGS) -DWITH_GTK3 libdbusmenu_gtk3_la_LIBADD = $(libdbusmenu_gtk_la_LIBADD) pkgconfig_DATA = dbusmenu-gtk$(VER)-0.4.pc diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c index 92932c5..5f50dc6 100644 --- a/libdbusmenu-gtk/parser.c +++ b/libdbusmenu-gtk/parser.c @@ -66,10 +66,13 @@ static void image_notify_cb (GtkWidget * widget, static void action_notify_cb (GtkAction * action, GParamSpec * pspec, gpointer data); -static void child_added_cb (GtkContainer * menu, +static void item_inserted_cb (GtkContainer * menu, GtkWidget * widget, +#ifdef WITH_GTK3 + gint position, +#endif gpointer data); -static void child_removed_cb (GtkContainer * menu, +static void item_removed_cb (GtkContainer * menu, GtkWidget * widget, gpointer data); static void theme_changed_cb (GtkIconTheme * theme, @@ -184,9 +187,9 @@ parse_data_free (gpointer data) if (pdata != NULL && pdata->shell != NULL) { g_signal_handlers_disconnect_matched(pdata->shell, (GSignalMatchType)G_SIGNAL_MATCH_FUNC, - 0, 0, NULL, G_CALLBACK(child_added_cb), NULL); + 0, 0, NULL, G_CALLBACK(item_inserted_cb), NULL); g_signal_handlers_disconnect_matched(pdata->shell, (GSignalMatchType)G_SIGNAL_MATCH_FUNC, - 0, 0, NULL, G_CALLBACK(child_removed_cb), NULL); + 0, 0, NULL, G_CALLBACK(item_removed_cb), NULL); g_object_remove_weak_pointer(G_OBJECT(pdata->shell), (gpointer*)&pdata->shell); } @@ -290,12 +293,16 @@ watch_submenu(DbusmenuMenuitem * mi, GtkWidget * menu) pdata->shell = menu; g_signal_connect (G_OBJECT (menu), - "child-added", - G_CALLBACK (child_added_cb), +#ifdef WITH_GTK3 + "insert", +#else + "child-added" +#endif + G_CALLBACK (item_inserted_cb), mi); g_signal_connect (G_OBJECT (menu), - "child-removed", - G_CALLBACK (child_removed_cb), + "remove", + G_CALLBACK (item_removed_cb), mi); g_object_add_weak_pointer(G_OBJECT (menu), (gpointer*)&pdata->shell); @@ -1137,7 +1144,12 @@ widget_add_cb (GtkWidget *widget, /* A child item was added to a menu we're watching. Let's try to integrate it. */ static void -child_added_cb (GtkContainer *menu, GtkWidget *widget, gpointer data) +item_inserted_cb (GtkContainer *menu, + GtkWidget *widget, +#ifdef WITH_GTK3 + gint position, +#endif + gpointer data) { DbusmenuMenuitem *menuitem = (DbusmenuMenuitem *)data; @@ -1152,9 +1164,9 @@ child_added_cb (GtkContainer *menu, GtkWidget *widget, gpointer data) parse_menu_structure_helper(widget, &recurse); } -/* A child item was added to a menu we're watching. Let's try to integrate it. */ +/* A child item was removed from a menu we're watching. */ static void -child_removed_cb (GtkContainer *menu, GtkWidget *widget, gpointer data) +item_removed_cb (GtkContainer *menu, GtkWidget *widget, gpointer data) { gpointer pmi = g_object_get_data(G_OBJECT(widget), CACHED_MENUITEM); if (pmi == NULL) { @@ -1216,4 +1228,3 @@ should_show_image (GtkImage *image) return FALSE; } - -- cgit v1.2.3 From 145fba945cdc582ccdf5dc483acb7f170325549b Mon Sep 17 00:00:00 2001 From: Mikkel Kamstrup Erlandsen Date: Mon, 16 Jan 2012 12:57:11 +0100 Subject: Fix build with gtk3 by ifdeffing the GtkBox/HBox construction in genericmenuitem.c --- libdbusmenu-gtk/genericmenuitem.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c index ef77a2e..098de67 100644 --- a/libdbusmenu-gtk/genericmenuitem.c +++ b/libdbusmenu-gtk/genericmenuitem.c @@ -241,7 +241,12 @@ set_label (GtkMenuItem * menu_item, const gchar * in_label) /* We need to put the child into a new box and make the box the child of the menu item. Basically we're inserting a box in the middle. */ + #ifdef HAVE_GTK3 + GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, + get_toggle_space(GTK_WIDGET(menu_item))); + #else GtkWidget * hbox = gtk_hbox_new(FALSE, get_toggle_space(GTK_WIDGET(menu_item))); + #endif g_object_ref(child); gtk_container_remove(GTK_CONTAINER(menu_item), child); gtk_box_pack_start(GTK_BOX(hbox), child, FALSE, FALSE, 0); @@ -457,7 +462,12 @@ genericmenuitem_set_image (Genericmenuitem * menu_item, GtkWidget * image) /* We need to put the child into a new box and make the box the child of the menu item. Basically we're inserting a box in the middle. */ + #ifdef HAVE_GTK3 + GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, + get_toggle_space(GTK_WIDGET(menu_item))); + #else GtkWidget * hbox = gtk_hbox_new(FALSE, get_toggle_space(GTK_WIDGET(menu_item))); + #endif g_object_ref(child); gtk_container_remove(GTK_CONTAINER(menu_item), child); gtk_box_pack_end(GTK_BOX(hbox), child, TRUE, TRUE, 0); -- cgit v1.2.3 From 9a01ce5b74bd5d2012a59e9d55a49531da1c4d14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= Date: Mon, 23 Jan 2012 14:38:36 +0100 Subject: Change icon-data to contains raw png bytes, without base64 encoding Reasons: - base64 encoding is not necessary because dbusmenu properties can use any dbus-supported types. - faster: no need to base64 decode/encode images - more efficient: base64-encoded data is 1/3 bigger than raw data --- libdbusmenu-glib/menuitem.c | 51 +++++++++++++++++++++++++++++++++++++++++++++ libdbusmenu-glib/menuitem.h | 2 ++ libdbusmenu-gtk/menuitem.c | 14 ++++--------- 3 files changed, 57 insertions(+), 10 deletions(-) diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index c9c7736..30ae277 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -1126,6 +1126,32 @@ dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * propert return dbusmenu_menuitem_property_set_variant(mi, property, variant); } +/** + * dbusmenu_menuitem_property_set_byte_array: + * @mi: The #DbusmenuMenuitem to set the property on. + * @property: Name of the property to set. + * @value: The byte array. + * @nelements: The number of elements in the byte array. + * + * Takes a byte array @value and sets it on @property as a + * property on @mi. If a property already exists by that name, + * then the value is set to the new value. If not, the property + * is added. If the value is changed or the property was previously + * unset then the signal #DbusmenuMenuitem::prop-changed will be + * emitted by this function. + * + * Return value: A boolean representing if the property value was set. + */ +gboolean +dbusmenu_menuitem_property_set_byte_array (DbusmenuMenuitem * mi, const gchar * property, const guchar * value, gsize nelements) +{ + GVariant * variant = NULL; + if (value != NULL) { + variant = g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, value, nelements, sizeof(guchar)); + } + return dbusmenu_menuitem_property_set_variant(mi, property, variant); +} + /** * dbusmenu_menuitem_property_set_variant: * @mi: The #DbusmenuMenuitem to set the property on. @@ -1360,6 +1386,31 @@ dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * propert return 0; } +/** + * dbusmenu_menuitem_property_get_byte_array: + * @mi: The #DbusmenuMenuitem to look for the property on. + * @property: The property to grab. + * @nelements: A pointer to the location to store the number of items (out) + * + * Look up a property on @mi and return the value of it if + * it exits. #NULL will be returned if the property doesn't + * exist. + * + * Return value: (array length=nelements)(element-type guint8)(transfer none): A byte array with the + * value of the property that shouldn't be free'd. Or #NULL if the property + * is not set or is not a byte array. + */ +const guchar * +dbusmenu_menuitem_property_get_byte_array (DbusmenuMenuitem * mi, const gchar * property, gsize * nelements) +{ + GVariant * variant = dbusmenu_menuitem_property_get_variant(mi, property); + if (variant == NULL) { + *nelements = 0; + return NULL; + } + if (!g_variant_type_equal(g_variant_get_type(variant), G_VARIANT_TYPE("ay"))) return NULL; + return g_variant_get_fixed_array(variant, nelements, sizeof(guchar)); +} /** * dbusmenu_menuitem_property_exist: diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h index 985e1a3..64dc87c 100644 --- a/libdbusmenu-glib/menuitem.h +++ b/libdbusmenu-glib/menuitem.h @@ -485,10 +485,12 @@ gboolean dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * pr gboolean dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * property, GVariant * value); gboolean dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * property, const gboolean value); gboolean dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * property, const gint value); +gboolean dbusmenu_menuitem_property_set_byte_array (DbusmenuMenuitem * mi, const gchar * property, const guchar * value, gsize nelements); const gchar * dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property); GVariant * dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property); gboolean dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property); gint dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property); +const guchar * dbusmenu_menuitem_property_get_byte_array (DbusmenuMenuitem * mi, const gchar * property, gsize * nelements); gboolean dbusmenu_menuitem_property_exist (DbusmenuMenuitem * mi, const gchar * property); GList * dbusmenu_menuitem_properties_list (DbusmenuMenuitem * mi) G_GNUC_WARN_UNUSED_RESULT; GHashTable * dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi); diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c index 0f511bc..19ea1a0 100644 --- a/libdbusmenu-gtk/menuitem.c +++ b/libdbusmenu-gtk/menuitem.c @@ -66,11 +66,9 @@ dbusmenu_menuitem_property_set_image (DbusmenuMenuitem * menuitem, const gchar * return FALSE; } - gchar * prop_str = g_base64_encode((guchar *)png_data, png_data_len); gboolean propreturn = FALSE; - propreturn = dbusmenu_menuitem_property_set(menuitem, property, prop_str); + propreturn = dbusmenu_menuitem_property_set_byte_array(menuitem, property, (guchar *)png_data, png_data_len); - g_free(prop_str); g_free(png_data); return propreturn; @@ -94,20 +92,17 @@ dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar * g_return_val_if_fail(DBUSMENU_IS_MENUITEM(menuitem), NULL); g_return_val_if_fail(property != NULL && property[0] != '\0', NULL); - const gchar * value = dbusmenu_menuitem_property_get(menuitem, property); + gsize length = 0; + const guchar * icondata = dbusmenu_menuitem_property_get_byte_array(menuitem, property, &length); /* There is no icon */ - if (value == NULL || value[0] == '\0') { + if (length == 0) { return NULL; } - - gsize length = 0; - guchar * icondata = g_base64_decode(value, &length); GInputStream * input = g_memory_input_stream_new_from_data(icondata, length, NULL); if (input == NULL) { g_warning("Cound not create input stream from icon property data"); - g_free(icondata); return NULL; } @@ -120,7 +115,6 @@ dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar * } g_object_unref(input); - g_free(icondata); return icon; } -- cgit v1.2.3 From abcbb8411ae2fea09b34c93b0c4a67bf3f3db413 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 26 Jan 2012 13:27:51 -0600 Subject: Adding a default type for ICON_DATA so we can catch people using it wrong --- libdbusmenu-glib/defaults.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libdbusmenu-glib/defaults.c b/libdbusmenu-glib/defaults.c index a5caf0b..1cacc34 100644 --- a/libdbusmenu-glib/defaults.c +++ b/libdbusmenu-glib/defaults.c @@ -83,6 +83,7 @@ dbusmenu_defaults_init (DbusmenuDefaults *self) dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_ENABLED, G_VARIANT_TYPE_BOOLEAN, g_variant_new_boolean(TRUE)); dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_LABEL, G_VARIANT_TYPE_STRING, g_variant_new_string(_("Label Empty"))); dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_ICON_NAME, G_VARIANT_TYPE_STRING, NULL); + dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_ICON_DATA, G_VARIANT_TYPE("ay"), NULL); dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, G_VARIANT_TYPE_STRING, NULL); dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, G_VARIANT_TYPE_INT32, NULL); dbusmenu_defaults_default_set(self, DBUSMENU_CLIENT_TYPES_DEFAULT, DBUSMENU_MENUITEM_PROP_SHORTCUT, G_VARIANT_TYPE("aas"), NULL); -- cgit v1.2.3 From d0065933d25307a95644e3ab984de0f4f848d6ad Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 26 Jan 2012 13:33:24 -0600 Subject: Remove custom WITH_GTK3 and use the HAVE_GTK3 --- libdbusmenu-gtk/Makefile.am | 2 +- libdbusmenu-gtk/parser.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index 9e0967f..b4564d1 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -76,7 +76,7 @@ libdbusmenu_gtk3includedir = $(libdbusmenu_gtkincludedir) libdbusmenu_gtk3include_HEADERS = $(libdbusmenu_gtkinclude_HEADERS) libdbusmenu_gtk3_la_SOURCES = $(libdbusmenu_gtk_la_SOURCES) libdbusmenu_gtk3_la_LDFLAGS = $(libdbusmenu_gtk_la_LDFLAGS) -libdbusmenu_gtk3_la_CFLAGS = $(libdbusmenu_gtk_la_CFLAGS) -DWITH_GTK3 +libdbusmenu_gtk3_la_CFLAGS = $(libdbusmenu_gtk_la_CFLAGS) libdbusmenu_gtk3_la_LIBADD = $(libdbusmenu_gtk_la_LIBADD) pkgconfig_DATA = dbusmenu-gtk$(VER)-0.4.pc diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c index 5f50dc6..d222f10 100644 --- a/libdbusmenu-gtk/parser.c +++ b/libdbusmenu-gtk/parser.c @@ -68,7 +68,7 @@ static void action_notify_cb (GtkAction * action, gpointer data); static void item_inserted_cb (GtkContainer * menu, GtkWidget * widget, -#ifdef WITH_GTK3 +#ifdef HAVE_GTK3 gint position, #endif gpointer data); @@ -293,7 +293,7 @@ watch_submenu(DbusmenuMenuitem * mi, GtkWidget * menu) pdata->shell = menu; g_signal_connect (G_OBJECT (menu), -#ifdef WITH_GTK3 +#ifdef HAVE_GTK3 "insert", #else "child-added" @@ -1146,7 +1146,7 @@ widget_add_cb (GtkWidget *widget, static void item_inserted_cb (GtkContainer *menu, GtkWidget *widget, -#ifdef WITH_GTK3 +#ifdef HAVE_GTK3 gint position, #endif gpointer data) -- cgit v1.2.3 From 4eae3efbe5c3aa84035b2ade9ceedd68b7b3e895 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 26 Jan 2012 13:36:57 -0600 Subject: Move the no-error on deprications into the Makefiles so it's always after the -Wall --- configure.ac | 2 -- libdbusmenu-glib/Makefile.am | 4 +++- libdbusmenu-gtk/Makefile.am | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 13efd3c..fd69595 100644 --- a/configure.ac +++ b/configure.ac @@ -23,8 +23,6 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) -CFLAGS="$CFLAGS -Wno-error=deprecated-declarations" - ########################### # GTK Doc ########################### diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am index 591bf30..83b2e7b 100644 --- a/libdbusmenu-glib/Makefile.am +++ b/libdbusmenu-glib/Makefile.am @@ -62,7 +62,9 @@ libdbusmenu_glib_la_LDFLAGS = \ -export-symbols-regex "^[^_].*" libdbusmenu_glib_la_CFLAGS = \ - $(DBUSMENUGLIB_CFLAGS) -Wall -Werror -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\"" + $(DBUSMENUGLIB_CFLAGS) \ + -Wall -Werror -Wno-error=deprecated-declarations \ + -DG_LOG_DOMAIN="\"LIBDBUSMENU-GLIB\"" libdbusmenu_glib_la_LIBADD = \ $(DBUSMENUGLIB_LIBS) diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am index b4564d1..9f297f5 100644 --- a/libdbusmenu-gtk/Makefile.am +++ b/libdbusmenu-gtk/Makefile.am @@ -62,7 +62,10 @@ libdbusmenu_gtk_la_LDFLAGS = \ -export-symbols-regex "^[^_].*" libdbusmenu_gtk_la_CFLAGS = \ - $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir) -Wall -Werror -DG_DISABLE_DEPRECATED -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\"" + $(DBUSMENUGTK_CFLAGS) \ + -I$(top_srcdir) \ + -Wall -Werror -Wno-error=deprecated-declarations \ + -DG_LOG_DOMAIN="\"LIBDBUSMENU-GTK\"" libdbusmenu_gtk_la_LIBADD = \ ../libdbusmenu-glib/libdbusmenu-glib.la \ -- cgit v1.2.3 From 9b2524f59c26df873495b308b2ea7ca2fda602f6 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 26 Jan 2012 13:52:38 -0600 Subject: Fix function calls here --- libdbusmenu-gtk/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 7390fb1..14c71ab 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -894,8 +894,8 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * process_toggle_state(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE)); process_submenu(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY), client); process_disposition(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_DISPOSITION), client); - atk_object_set_name(gtk_widget_Get_accessible(GTK_WIDGET)gmi)), - g_variant_get_string(dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC))); + atk_object_set_name(gtk_widget_get_accessible(GTK_WIDGET(gmi)), + g_variant_get_string(dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC), NULL)); refresh_shortcut(client, item); /* Oh, we're a child, let's deal with that */ -- cgit v1.2.3 From b68c281a6b3761af902a4d4e8a35cf450c298ec0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 26 Jan 2012 13:53:21 -0600 Subject: Missing comma --- libdbusmenu-gtk/parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c index d222f10..2abeccd 100644 --- a/libdbusmenu-gtk/parser.c +++ b/libdbusmenu-gtk/parser.c @@ -296,7 +296,7 @@ watch_submenu(DbusmenuMenuitem * mi, GtkWidget * menu) #ifdef HAVE_GTK3 "insert", #else - "child-added" + "child-added", #endif G_CALLBACK (item_inserted_cb), mi); -- cgit v1.2.3 From a68451b70e621c1c9b59f4d6be78c3e327356eed Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 26 Jan 2012 13:56:13 -0600 Subject: Include config.h to get the HAVE_GTK3 define --- libdbusmenu-gtk/parser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c index 2abeccd..0ecfa1e 100644 --- a/libdbusmenu-gtk/parser.c +++ b/libdbusmenu-gtk/parser.c @@ -29,6 +29,7 @@ License version 3 and version 2.1 along with this program. If not, see #include "parser.h" #include "menuitem.h" #include "client.h" +#include "config.h" #define CACHED_MENUITEM "dbusmenu-gtk-parser-cached-item" #define PARSER_DATA "dbusmenu-gtk-parser-data" -- cgit v1.2.3 From d27208df523d669e2bf86ab0506634d0ae86e558 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 26 Jan 2012 19:53:42 -0600 Subject: Only setting the accessible object name if it has been set --- libdbusmenu-gtk/client.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 14c71ab..9888cbe 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -894,10 +894,13 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * process_toggle_state(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE)); process_submenu(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY), client); process_disposition(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_DISPOSITION), client); - atk_object_set_name(gtk_widget_get_accessible(GTK_WIDGET(gmi)), - g_variant_get_string(dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC), NULL)); refresh_shortcut(client, item); + const gchar * a11y_desc = dbusmenu_menuitem_property_get(item, DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC); + if (a11y_desc != NULL) { + atk_object_set_name(gtk_widget_get_accessible(GTK_WIDGET(gmi)), a11y_desc); + } + /* Oh, we're a child, let's deal with that */ if (parent != NULL) { new_child(parent, item, dbusmenu_menuitem_get_position(item, parent), DBUSMENU_GTKCLIENT(client)); -- cgit v1.2.3 From 73a653d45a9be59d50f0ae14ab595719565cd32f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 26 Jan 2012 20:19:33 -0600 Subject: Adding a way for the node2variant to know the name of what it's parsing --- tests/json-loader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/json-loader.c b/tests/json-loader.c index 36157dc..26fd768 100644 --- a/tests/json-loader.c +++ b/tests/json-loader.c @@ -21,13 +21,13 @@ with this program. If not, see . #include "json-loader.h" -static GVariant * node2variant (JsonNode * node); +static GVariant * node2variant (JsonNode * node, const gchar * name); static void array_foreach (JsonArray * array, guint index, JsonNode * node, gpointer user_data) { GVariantBuilder * builder = (GVariantBuilder *)user_data; - GVariant * variant = node2variant(node); + GVariant * variant = node2variant(node, NULL); if (variant != NULL) { g_variant_builder_add_value(builder, variant); } @@ -38,7 +38,7 @@ static void object_foreach (JsonObject * array, const gchar * member, JsonNode * node, gpointer user_data) { GVariantBuilder * builder = (GVariantBuilder *)user_data; - GVariant * variant = node2variant(node); + GVariant * variant = node2variant(node, member); if (variant != NULL) { g_variant_builder_add(builder, "{sv}", member, variant); } @@ -46,7 +46,7 @@ object_foreach (JsonObject * array, const gchar * member, JsonNode * node, gpoin } static GVariant * -node2variant (JsonNode * node) +node2variant (JsonNode * node, const gchar * name) { if (node == NULL) { return NULL; @@ -105,7 +105,7 @@ set_props (DbusmenuMenuitem * mi, JsonObject * node) if (!g_strcmp0(member, "submenu")) { continue; } JsonNode * lnode = json_object_get_member(node, member); - GVariant * variant = node2variant(lnode); + GVariant * variant = node2variant(lnode, member); if (variant != NULL) { dbusmenu_menuitem_property_set_variant(mi, member, variant); -- cgit v1.2.3 From 5b7844d079fe1579f60c1bc4fbcc5da128c70138 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 26 Jan 2012 20:20:23 -0600 Subject: If we see the 'icon-data' we undo a base64 string and make it a binary --- tests/json-loader.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/json-loader.c b/tests/json-loader.c index 26fd768..7f0ec8e 100644 --- a/tests/json-loader.c +++ b/tests/json-loader.c @@ -62,8 +62,17 @@ node2variant (JsonNode * node, const gchar * name) return g_variant_new_double(json_node_get_double(node)); case G_TYPE_BOOLEAN: return g_variant_new_boolean(json_node_get_boolean(node)); - case G_TYPE_STRING: - return g_variant_new_string(json_node_get_string(node)); + case G_TYPE_STRING: { + if (g_strcmp0(name, DBUSMENU_MENUITEM_PROP_ICON_DATA) != 0) { + return g_variant_new_string(json_node_get_string(node)); + } else { + gsize length; + guchar * b64 = g_base64_decode(json_node_get_string(node), &length); + GVariant * retval = g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, b64, length, sizeof(guchar)); + g_free(b64); + return retval; + } + } default: g_assert_not_reached(); } -- cgit v1.2.3 From 767c767a60a7de0fce7031a3e17c30d54e658962 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Jan 2012 16:23:04 -0600 Subject: Unreffing a variant we never had a reference to --- tests/test-glib-proxy-client.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test-glib-proxy-client.c b/tests/test-glib-proxy-client.c index 2e1e2d2..d20c27c 100644 --- a/tests/test-glib-proxy-client.c +++ b/tests/test-glib-proxy-client.c @@ -152,7 +152,6 @@ layout_verify_timer (gpointer data) GVariant * value = g_variant_new("i", 0); dbusmenu_menuitem_handle_event(menuroot, "clicked", value, layouton); - g_variant_unref(value); return FALSE; } -- cgit v1.2.3 From bd7311b74af63df8ef7ad34a6c56c785c499226a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Jan 2012 22:42:59 -0600 Subject: Turn off the timeouts that are causing the tests to fail --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index a227916..532c14f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,5 +1,5 @@ -DBUS_RUNNER=dbus-test-runner +DBUS_RUNNER=dbus-test-runner --max-wait=0 CLEANFILES= DISTCLEANFILES= -- cgit v1.2.3 From 354931b926297679ffebd38a8f3012e250d89895 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Jan 2012 22:56:12 -0600 Subject: Adding the new functions and property to the documentation --- docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt index d95ec4c..7f11278 100644 --- a/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt +++ b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt @@ -60,6 +60,7 @@ DBUSMENU_MENUITEM_PROP_TOGGLE_STATE DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY DBUSMENU_MENUITEM_PROP_SHORTCUT DBUSMENU_MENUITEM_PROP_DISPOSITION +DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC DBUSMENU_MENUITEM_TOGGLE_CHECK DBUSMENU_MENUITEM_TOGGLE_RADIO DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED @@ -98,10 +99,12 @@ dbusmenu_menuitem_child_find dbusmenu_menuitem_find_id dbusmenu_menuitem_property_set dbusmenu_menuitem_property_set_bool +dbusmenu_menuitem_property_set_byte_array dbusmenu_menuitem_property_set_int dbusmenu_menuitem_property_set_variant dbusmenu_menuitem_property_get dbusmenu_menuitem_property_get_bool +dbusmenu_menuitem_property_get_byte_array dbusmenu_menuitem_property_get_int dbusmenu_menuitem_property_get_variant dbusmenu_menuitem_property_exist -- cgit v1.2.3 From 8d7a4ec5cbf30119b0ec553174853556a480228a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 30 Jan 2012 23:17:07 -0600 Subject: 0.5.90 --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 5ed709d..ce321bc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.5.1, ted@canonical.com) +AC_INIT(libdbusmenu, 0.5.90, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.5.1, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.5.90, [-Wno-portability]) AM_MAINTAINER_MODE @@ -165,7 +165,7 @@ AC_PATH_PROG([XSLT_PROC], [xsltproc]) ########################### LIBDBUSMENU_CURRENT=4 -LIBDBUSMENU_REVISION=6 +LIBDBUSMENU_REVISION=7 LIBDBUSMENU_AGE=0 AC_SUBST(LIBDBUSMENU_CURRENT) -- cgit v1.2.3