--- indicator-me-0.2.5.orig/debian/copyright +++ indicator-me-0.2.5/debian/copyright @@ -0,0 +1,33 @@ +This package was debianized by Ted Gould on +Thu Dec 24 11:17:41 CST 2009. + +It was downloaded from https://launchpad.net/indicator-me + +Upstream Author: + + Ted Gould + +Copyright: + + Copyright (C) 2009 Canonical Ltd + +License: + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License version 3 as + published by the Free Software Foundation. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +The Debian packaging is: + + Copyright (C) 2009 Canonical Ltd + +On Debian/Ubuntu systems, the full text of the full text of the GPL v3 can be +found in `/usr/share/common-licenses/GPL-3' --- indicator-me-0.2.5.orig/debian/watch +++ indicator-me-0.2.5/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/indicator-me/+download .*/indicator-me-([0-9.]+)\.tar\.gz --- indicator-me-0.2.5.orig/debian/control +++ indicator-me-0.2.5/debian/control @@ -0,0 +1,33 @@ +Source: indicator-me +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +Build-Depends: debhelper (>= 5.0), + cdbs (>= 0.4.41), + libgtk2.0-dev (>= 2.12.0), + libdbus-glib-1-dev, + gnome-doc-utils, + scrollkeeper, + libindicator-dev (>= 0.3.5), + libdbusmenu-glib-dev (>= 0.2.2), + libdbusmenu-gtk-dev (>= 0.2.2), + intltool, + libtelepathy-glib-dev (>= 0.9.0), + libido-0.1-dev, + libgconf2-dev +Standards-Version: 3.8.3 +Homepage: https://launchpad.net/indicator-me +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-me/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-me/ubuntu + +Package: indicator-me +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-applet-session (>= 0.2) +Recommends: gwibber (>= 2.29.90), ubuntuone-client-gnome (>= 1.1.2) +Conflicts: indicator-session (<< 0.2.0) +Description: indicator showing user information and status + This indicator is designed to be placed on the right side of a panel and + give the user easy control for changing their instant message status. + . + It requires some way to be hosted into a panel. For the GNOME Panel the + appropriate package is indicator-applet-session. --- indicator-me-0.2.5.orig/debian/rules +++ indicator-me-0.2.5/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators + +binary-install/indicator-me:: + # remove .a/.la clutter + rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a + rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la + --- indicator-me-0.2.5.orig/debian/changelog +++ indicator-me-0.2.5/debian/changelog @@ -0,0 +1,104 @@ +indicator-me (0.2.5-0ubuntu2) lucid; urgency=low + + * Backport upstream fixes for this issues: + - "The text field should receive focus automatically" (lp: #528302) + - "status changes to offline on updates" (lp: #538923) + + -- Sebastien Bacher Mon, 15 Mar 2010 16:09:06 +0100 + +indicator-me (0.2.5-0ubuntu1) lucid; urgency=low + + * New upstream release + - use specific -panel icons or fallback gracefully if absent + - Display face in the menu (LP: #525951) + - don't display account/settings items when programs are not + installed (gwibber, empathy or utuntuone) + * debian/patches/u1-preferences.patch + - removed, merged upstream + * debian/patches/empathy_2_29_91.patch + - removed, merged upstream + * debian/control + - bumped build depends version for libindicator-dev to 0.3.5 + - added new build depends for libgconf2-dev + + -- Ken VanDine Thu, 11 Mar 2010 15:21:16 -0500 + +indicator-me (0.2.4-0ubuntu3) lucid; urgency=low + + * debian/patches/empathy_2_29_91.patch + - Fixed to handle accounts launcher rename in 2.29.91 + + -- Ken VanDine Tue, 23 Feb 2010 17:00:22 -0500 + +indicator-me (0.2.4-0ubuntu2) lucid; urgency=low + + * debian/patches/u1-preferences.patch + - Fix the executable for launching u1-preferences + * debian/control + - Added Recommends for gwibber and ubuntuone-client-gnome, the menu + presents the options if they are present or not so we should at + least recommend them + + -- Ken VanDine Mon, 22 Feb 2010 16:17:02 -0500 + +indicator-me (0.2.4-0ubuntu1) lucid; urgency=low + + * New upstream version + * debian/patches/signal.patch: + - the change is in the new version + + -- Sebastien Bacher Thu, 18 Feb 2010 18:25:03 +0100 + +indicator-me (0.2.3-0ubuntu2) lucid; urgency=low + + * debian/patches/signal.patch + - fixed a crasher cause by types changing + + -- Ken VanDine Fri, 05 Feb 2010 10:35:20 -0800 + +indicator-me (0.2.3-0ubuntu1) lucid; urgency=low + + * Upstream Release 0.2.3 + * Fix for the signal prototype change in dbusmenu 0.2.2 + + -- Ted Gould Thu, 04 Feb 2010 17:54:53 -0800 + +indicator-me (0.2.2-0ubuntu1~ppa2) lucid; urgency=low + + * debian/control: Adding in ido + + -- Ted Gould Thu, 04 Feb 2010 17:24:43 -0800 + +indicator-me (0.2.2-0ubuntu1~ppa1) lucid; urgency=low + + * Upstream Release 0.2.2 + * Basic Gwibber support + * autogen.sh in tarball + * debian/control: dbusmenu* to version 0.2.2 + + -- Ted Gould Thu, 04 Feb 2010 17:20:38 -0800 + +indicator-me (0.2.1-0ubuntu1) lucid; urgency=low + + * Upstream Merge + * Change Telepathy well-known name + * Remove unneeded copy of LGPL + * Remove build system cruft + * Don't show shutdown icon. Ever. + * Remove debian/patches/mc5-fixes.patch as merged upstream. + + -- Ted Gould Thu, 21 Jan 2010 11:13:48 -0600 + +indicator-me (0.2.0-0ubuntu2) lucid; urgency=low + + * debian/patches/mc5-fixes.patch + - fixes for monitoring dbus to see when MC5 comes online + + -- Ken VanDine Tue, 12 Jan 2010 09:56:30 -0500 + +indicator-me (0.2.0-0ubuntu1) lucid; urgency=low + + * Upstream release 0.2.0 + * Initial release + + -- Ted Gould Fri, 08 Jan 2010 09:15:32 -0600 --- indicator-me-0.2.5.orig/debian/compat +++ indicator-me-0.2.5/debian/compat @@ -0,0 +1 @@ +5 --- indicator-me-0.2.5.orig/src/indicator-me.c +++ indicator-me-0.2.5/src/indicator-me.c @@ -7,17 +7,18 @@ Authors: Ted Gould + Cody Russell - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License version 3, as published + This program is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License version 3, as published by the Free Software Foundation. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranties of - MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranties of + MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -179,9 +180,7 @@ } gchar *panel_icon = g_strconcat (icons, "-panel", NULL); - GtkImage *temp = indicator_image_helper (panel_icon); - gtk_image_set_from_pixbuf (status_image, gtk_image_get_pixbuf (temp)); - g_object_unref (temp); + indicator_image_helper_update (status_image, panel_icon); g_free (panel_icon); return; @@ -253,9 +252,32 @@ } static gboolean +menu_visibility_changed (GtkWidget *widget, + IdoEntryMenuItem *menuitem) +{ + gtk_menu_shell_select_item (GTK_MENU_SHELL (widget), GTK_WIDGET (menuitem)); + + return FALSE; +} + +static void +entry_parent_changed (GtkWidget *widget, + gpointer user_data) +{ + GtkWidget *parent = gtk_widget_get_parent (widget); + + if (parent && GTK_IS_MENU_SHELL (parent)) + { + g_signal_connect (parent, + "map", G_CALLBACK (menu_visibility_changed), + widget); + } +} + +static gboolean new_entry_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, - DbusmenuClient * client) + DbusmenuClient * client) { g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE); g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE); @@ -267,6 +289,10 @@ gtk_entry_set_text(entry, dbusmenu_menuitem_property_get(newitem, DBUSMENU_ENTRY_MENUITEM_PROP_TEXT)); gtk_entry_set_width_chars (entry, 23); /* set some nice aspect ratio for the menu */ + g_signal_connect (ido, + "notify::parent", G_CALLBACK (entry_parent_changed), + NULL); + dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, GTK_MENU_ITEM(ido), parent); /* disconnect the activate signal that newitem_base connected with the wrong widget, ie menuitem, and re-connect it with the /entry/ instead */