aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--po/POTFILES.in6
-rw-r--r--src/Makefile.am1
3 files changed, 8 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 48b9d32..ef49e3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+indicator-session (0.2.0~dev-0ubuntu1~ppa5) UNRELEASED; urgency=low
+
+ * Upstream merge
+ * Distcheck fixes
+
+ -- Ted Gould <ted@ubuntu.com> Tue, 05 Jan 2010 23:37:06 -0600
+
indicator-session (0.2.0~dev-0ubuntu1~ppa4) karmic; urgency=low
* Upstream merge
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e3d4a5e..4f28e2a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,9 +6,3 @@ src/gtk-dialog/gtk-logout-helper.c
src/gtk-dialog/logout-dialog.c
src/indicator-session.c
src/session-service.c
-src/status-provider.c
-src/status-provider-pidgin.c
-src/status-provider-telepathy.c
-src/status-service.c
-src/status-service-dbus.c
-src/users-service.c
diff --git a/src/Makefile.am b/src/Makefile.am
index e5d5a3c..2c607f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,6 +43,7 @@ indicator_session_service_SOURCES = \
lock-helper.h \
session-service.c \
gtk-dialog/gconf-helper.c \
+ users-service-dbus.h \
users-service-dbus.c \
users-service-marshal.c
indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror