--- appmenu-gtk-0.1.0.orig/configure.ac +++ appmenu-gtk-0.1.0/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.59) -AC_INIT([appmenu-gtk], [0.1.0], [crussell@canonical.com]) +AC_INIT([appmenu-gtk], [0.0.9], [crussell@canonical.com]) AC_COPYRIGHT([Copyright 2010 Canonical]) AC_CONFIG_SRCDIR([src/bridge.c]) AC_CONFIG_MACRO_DIR([build/autotools]) --- appmenu-gtk-0.1.0.orig/debian/copyright +++ appmenu-gtk-0.1.0/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Ken VanDine on +Thu, 27 May 2010 16:52:44 -0400 + + +It was downloaded from + +Upstream Author: + + Cody Russell + +Copyright: + + Copyright (C) 2010 Canonical Ltd. + +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License version 3, as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this library; if not, see . + +On Debian systems, the complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL-3'. + +The Debian packaging is (C) 2010, Canonical Ltd. and +is licensed under the GPLv3, see `/usr/share/common-licenses/GPL-3'. --- appmenu-gtk-0.1.0.orig/debian/watch +++ appmenu-gtk-0.1.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://launchpad.net/appmenu-gtk/+download .*/appmenu-gtk-([0-9.]+)\.tar\.gz --- appmenu-gtk-0.1.0.orig/debian/control +++ appmenu-gtk-0.1.0/debian/control @@ -0,0 +1,24 @@ +Source: appmenu-gtk +Section: libs +Priority: optional +Maintainer: Ubuntu Desktop Team +Build-Depends: debhelper (>= 5.0), + cdbs (>= 0.4.41), + libgtk2.0-dev (>= 2.21.1-1ubuntu2), + libdbus-glib-1-dev, + libdbusmenu-glib-dev (>= 0.3.3), + libdbusmenu-gtk-dev (>= 0.3.3), + libtool +Standards-Version: 3.8.4 +Homepage: https://launchpad.net/appmenu-gtk +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/appmenu-gtk/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/appmenu-gtk/ubuntu + +Package: appmenu-gtk +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Export GTK menus over DBus + . + This package provides support for application menus. --- appmenu-gtk-0.1.0.orig/debian/rules +++ appmenu-gtk-0.1.0/debian/rules @@ -0,0 +1,6 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed --- appmenu-gtk-0.1.0.orig/debian/changelog +++ appmenu-gtk-0.1.0/debian/changelog @@ -0,0 +1,148 @@ +appmenu-gtk (0.1.0-0ubuntu2) maverick; urgency=low + + * Backport upstream changes to fix issues with pixbufs images not being + displayed and with dots being rendered as checkmarks in the indicator + + -- Sebastien Bacher Thu, 08 Jul 2010 15:00:51 +0200 + +appmenu-gtk (0.1.0-0ubuntu1) maverick; urgency=low + + * New upstream version: + - #598623 Gimp: menu item missing + - #594228 [Master] Application is showing a partial menu + - #594230 [Master] Menu items are out of order. + - #600880 Firefox supposedly crashing with appmenu-gtk + - #599817 Weird sub-menu associated with Anjuta's File -> Quit entry + - #598528 doesn't display icons + - #592848 Tabs menu in gnome-terminal does not display correctly + - #598494 Pidgin menu items for accounts are not updated on + the menubar when disabling them + - #601943 Dynamic menu is empty + + -- Sebastien Bacher Tue, 06 Jul 2010 18:09:11 +0200 + +appmenu-gtk (0.0.9-0ubuntu5) maverick; urgency=low + + * src/bridge.c: clean some g_print calls there + + -- Sebastien Bacher Fri, 02 Jul 2010 18:35:48 +0200 + +appmenu-gtk (0.0.9-0ubuntu4) maverick; urgency=low + + * Backport extra upstream fixes for softwares not working + + -- Sebastien Bacher Fri, 02 Jul 2010 12:31:21 +0200 + +appmenu-gtk (0.0.9-0ubuntu3) maverick; urgency=low + + * Backport another set of upstream changes to fix crashing issues + + -- Sebastien Bacher Tue, 29 Jun 2010 23:54:41 +0200 + +appmenu-gtk (0.0.9-0ubuntu2) maverick; urgency=low + + * Backport upstream commit to fix missing menu items issues (lp: #598623) + + -- Sebastien Bacher Tue, 29 Jun 2010 10:42:00 +0200 + +appmenu-gtk (0.0.9-0ubuntu1) maverick; urgency=low + + * New upstream version: + - Fix bug #598244 - Unexpected separators in menus (lp: #598244) + - Fix bug #598311 - Missing menus and menu items (lp: #598311) + + -- Sebastien Bacher Fri, 25 Jun 2010 20:20:12 +0200 + +appmenu-gtk (0.0.8-0ubuntu2) maverick; urgency=low + + * Backport upstream r35 to fix some extra issues + + -- Sebastien Bacher Thu, 24 Jun 2010 22:10:12 +0200 + +appmenu-gtk (0.0.8-0ubuntu1) maverick; urgency=low + + * New upstream release + - memset recurse to 0, then check for NULL before setting root. + - Fix for valid roots always. + - Skip duplicate separator menuitems (LP: #594867) + - Add support for shortcuts (LP: #591293) + - check that the boolean ubuntu-no-proxy exists before using a potential + value to remove proxy support + * debian/control + - build build depends for libdbusmenu to >= 0.3.3 + + -- Ken VanDine Thu, 24 Jun 2010 13:53:20 -0400 + +appmenu-gtk (0.0.7-0ubuntu2) maverick; urgency=low + + * Backporting upstream commit to fix issues in unity + + -- Sebastien Bacher Fri, 18 Jun 2010 12:42:34 +0200 + +appmenu-gtk (0.0.7-0ubuntu1) maverick; urgency=low + + * New upstream release + + -- Ken VanDine Thu, 17 Jun 2010 16:39:13 -0400 + +appmenu-gtk (0.0.6-0ubuntu1) maverick; urgency=low + + * New upstream release + - Sets needed session variables in /etc/X11/Xsession.d + + -- Ken VanDine Fri, 11 Jun 2010 11:47:35 -0400 + +appmenu-gtk (0.0.5-0ubuntu1) maverick; urgency=low + + * New upstream release + * debian/control + - build build-dep version for libgtk2.0-dev to >= 2.21.1-1ubuntu2 + + -- Ken VanDine Thu, 10 Jun 2010 17:30:03 -0400 + +appmenu-gtk (0.0.4-0ubuntu1~ppa1) lucid; urgency=low + + * New upstream release + + -- Ken VanDine Fri, 04 Jun 2010 13:47:36 -0400 + +appmenu-gtk (0.0.3-0ubuntu1~ppa1) lucid; urgency=low + + * New upstream version + * debian/control + - Added Vcs lings + * debian/copyright added + * debian/watch added + + -- Ken VanDine Thu, 27 May 2010 16:52:44 -0400 + +appmenu-gtk (0.0.2~dev-0ubuntu1~ppa1) lucid; urgency=low + + * Version bump to 0.0.2 + + -- Cody Russell Wed, 26 May 2010 11:26:17 -0500 + +appmenu-gtk (0.0.1~dev-0ubuntu1~ppa4) lucid; urgency=low + + * Updates for the latest GtkMenuProxy interface. + + -- Cody Russell Wed, 26 May 2010 09:00:08 -0500 + +appmenu-gtk (0.0.1~dev-0ubuntu1~ppa3) lucid; urgency=low + + * debian/control: Adding libdbusmenu-gtk-dev to the dependency + list. + + -- Ted Gould Wed, 12 May 2010 16:44:47 +0200 + +appmenu-gtk (0.0.1~dev-0ubuntu1~ppa2) lucid; urgency=low + + * Fixing packaging to make it so there aren't two .so's + + -- Ted Gould Tue, 11 May 2010 13:30:04 +0200 + +appmenu-gtk (0.0.1~dev-0ubuntu1~ppa1) lucid; urgency=low + + * Initial release. + + -- Ted Gould Tue, 11 May 2010 13:18:19 +0200 --- appmenu-gtk-0.1.0.orig/src/bridge.c +++ appmenu-gtk-0.1.0/src/bridge.c @@ -590,7 +590,7 @@ { dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE, - GTK_IS_RADIO_MENU_ITEM (widget) ? DBUSMENU_MENUITEM_TOGGLE_RADIO : DBUSMENU_MENUITEM_TOGGLE_CHECK); + gtk_check_menu_item_get_draw_as_radio (GTK_CHECK_MENU_ITEM (widget)) ? DBUSMENU_MENUITEM_TOGGLE_RADIO : DBUSMENU_MENUITEM_TOGGLE_CHECK); dbusmenu_menuitem_property_set_int (mi, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE, @@ -618,6 +618,12 @@ { update_icon_name (mi, image); } + else if (image_type == GTK_IMAGE_PIXBUF) + { + dbusmenu_menuitem_property_set_image (mi, + DBUSMENU_MENUITEM_PROP_ICON_DATA, + gtk_image_get_pixbuf (GTK_IMAGE (image))); + } } dbusmenu_menuitem_property_set (mi,