Merge lp:~indicator-applet-developers/indicator-me/karmic into lp:~ubuntu-desktop/indicator-me/ubuntu

[Ted Gould]

[Ted Gould (ted)]

0.2.1

=== modified file '.bzrignore'
--- .bzrignore	2010-01-03 05:42:47 +0000
+++ .bzrignore	2010-01-21 17:20:26 +0000
@@ -23,6 +23,7 @@
 indicator-session.service
 indicator-status.service
 indicator-users.service
+indicator-me.service
 status-service-client.h
 status-service-server.h
 debian/indicator-fusa

=== modified file 'Makefile.am'
--- Makefile.am	2009-09-08 15:14:27 +0000
+++ Makefile.am	2010-01-21 17:20:26 +0000
@@ -4,7 +4,5 @@
 	data \
 	po
 
-EXTRA_DIST = COPYING.LGPL
-
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 

=== modified file 'configure.ac'
--- configure.ac	2010-01-08 15:14:12 +0000
+++ configure.ac	2010-01-21 17:20:26 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-me, 0.2.0, [e-mail])
-AC_COPYRIGHT([Copyright 2009 Canonical])
+AC_INIT(indicator-me, 0.2.1, [e-mail])
+AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-me, 0.2.0)
+AM_INIT_AUTOMAKE(indicator-me, 0.2.1)
 
 AM_MAINTAINER_MODE
 
@@ -29,24 +29,16 @@
 GTK_REQUIRED_VERSION=2.12
 INDICATOR_REQUIRED_VERSION=0.3.0
 DBUSMENUGTK_REQUIRED_VERSION=0.2.0
-POLKIT_REQUIRED_VERSION=0.92
-
-PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                          indicator >= $INDICATOR_REQUIRED_VERSION
-						  dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
-AC_SUBST(APPLET_CFLAGS)
-AC_SUBST(APPLET_LIBS)
-
-DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
+DBUSMENUGLIB_REQUIRED_VERSION=0.2.0
 TELEPATHYGLIB_REQUIRED_VERSION=0.9.0
 
-PKG_CHECK_MODULES(STATUSSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
+PKG_CHECK_MODULES(APPLET,        gtk+-2.0 >= $GTK_REQUIRED_VERSION
+                                 indicator >= $INDICATOR_REQUIRED_VERSION
+						         dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
+PKG_CHECK_MODULES(MESERVICE,     dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
                                  indicator >= $INDICATOR_REQUIRED_VERSION
                                  telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION)
 
-AC_SUBST(STATUSERVICE_CFLAGS)
-AC_SUBST(STATUSERVICE_LIBS)
-
 ###########################
 # Check to see if we're local
 ###########################

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-12 16:30:17 +0000
+++ debian/changelog	2010-01-21 17:20:26 +0000
@@ -1,3 +1,14 @@
+indicator-me (0.2.1-0ubuntu1~ppa1) karmic; 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 <[e-mail]>  Thu, 21 Jan 2010 11:13:48 -0600
+
 indicator-me (0.2.0-0ubuntu2) lucid; urgency=low
 
   * debian/patches/mc5-fixes.patch

=== removed file 'debian/patches/mc5-fixes.patch'
--- debian/patches/mc5-fixes.patch	2010-01-12 15:51:59 +0000
+++ debian/patches/mc5-fixes.patch	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-=== modified file 'src/status-provider-mc5.c'
---- src/status-provider-mc5.c	2009-12-08 16:13:30 +0000
-+++ src/status-provider-mc5.c	2010-01-12 15:46:43 +0000
-@@ -72,7 +72,7 @@
- 
- #define STATUS_PROVIDER_MC5_GET_PRIVATE(o) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((o), STATUS_PROVIDER_MC5_TYPE, StatusProviderMC5Private))
--#define MC5_WELL_KNOWN_NAME  "org.freedesktop.Telepathy.MissionControl5"
-+#define MC5_WELL_KNOWN_NAME  "org.freedesktop.Telepathy.AccountManager"
- 
- /* Prototypes */
- /* GObject stuff */
-@@ -134,7 +134,7 @@
- 	priv->manager = TP_ACCOUNT_MANAGER (g_object_new (TP_TYPE_ACCOUNT_MANAGER,
- 		"dbus-daemon", daemon,
- 		"dbus-connection", ((TpProxy *) daemon)->dbus_connection,
--		"bus-name", "org.freedesktop.Telepathy.MissionControl5",
-+		"bus-name", "org.freedesktop.Telepathy.AccountManager",
- 		"object-path", "/org/freedesktop/Telepathy/AccountManager",
- 		NULL));
- 	g_signal_connect(G_OBJECT(priv->manager), "most-available-presence-changed", G_CALLBACK(presence_changed), self);
-

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2010-01-06 05:31:29 +0000
+++ src/Makefile.am	2010-01-21 17:20:26 +0000
@@ -38,8 +38,8 @@
 	status-provider-telepathy.c \
 	status-provider-telepathy-marshal.h \
 	status-provider-telepathy-marshal.c
-indicator_me_service_CFLAGS = $(STATUSSERVICE_CFLAGS) -Wall -Werror
-indicator_me_service_LDADD = $(STATUSSERVICE_LIBS)
+indicator_me_service_CFLAGS = $(MESERVICE_CFLAGS) -Wall -Werror
+indicator_me_service_LDADD = $(MESERVICE_LIBS)
 
 me-service-client.h: $(srcdir)/me-service.xml
 	dbus-binding-tool \

=== modified file 'src/me-service.c'
--- src/me-service.c	2010-01-03 05:42:47 +0000
+++ src/me-service.c	2010-01-21 17:20:26 +0000
@@ -70,7 +70,7 @@
   /* STATUS_PROVIDER_STATUS_DND, */        "user-busy",
   /* STATUS_PROVIDER_STATUS_INVISIBLE, */  "user-invisible",
   /* STATUS_PROVIDER_STATUS_OFFLINE */     "user-offline",
-  /* STATUS_PROVIDER_STATUS_DISCONNECTED */"system-shutdown-panel"
+  /* STATUS_PROVIDER_STATUS_DISCONNECTED */"user-offline"
 };
 
 

=== modified file 'src/status-provider-mc5.c'
--- src/status-provider-mc5.c	2009-12-08 16:13:30 +0000
+++ src/status-provider-mc5.c	2010-01-21 17:20:26 +0000
@@ -72,7 +72,7 @@
 
 #define STATUS_PROVIDER_MC5_GET_PRIVATE(o) \
 (G_TYPE_INSTANCE_GET_PRIVATE ((o), STATUS_PROVIDER_MC5_TYPE, StatusProviderMC5Private))
-#define MC5_WELL_KNOWN_NAME  "org.freedesktop.Telepathy.MissionControl5"
+#define MC5_WELL_KNOWN_NAME  "org.freedesktop.Telepathy.AccountManager"
 
 /* Prototypes */
 /* GObject stuff */
@@ -134,7 +134,7 @@
 	priv->manager = TP_ACCOUNT_MANAGER (g_object_new (TP_TYPE_ACCOUNT_MANAGER,
 		"dbus-daemon", daemon,
 		"dbus-connection", ((TpProxy *) daemon)->dbus_connection,
-		"bus-name", "org.freedesktop.Telepathy.MissionControl5",
+		"bus-name", "org.freedesktop.Telepathy.AccountManager",
 		"object-path", "/org/freedesktop/Telepathy/AccountManager",
 		NULL));
 	g_signal_connect(G_OBJECT(priv->manager), "most-available-presence-changed", G_CALLBACK(presence_changed), self);