ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #02775
[Merge] lp:~ted/indicator-session/log-and-name into lp:indicator-session
Ted Gould has proposed merging lp:~ted/indicator-session/log-and-name into lp:indicator-session.
Requested reviews:
Indicator Applet Developers (indicator-applet-developers)
For more details, see:
https://code.launchpad.net/~ted/indicator-session/log-and-name/+merge/46504
Cleaning up the build and adding a log domain.
--
https://code.launchpad.net/~ted/indicator-session/log-and-name/+merge/46504
Your team ayatana-commits is subscribed to branch lp:indicator-session.
=== modified file 'AUTHORS'
--- AUTHORS 2009-09-24 00:14:01 +0000
+++ AUTHORS 2011-01-17 17:19:51 +0000
@@ -1,2 +1,2 @@
-Ted Gould <ted@xxxxxxxxxxxxx>
-Cody Russell <crussell@xxxxxxxxxxxxx>
+# Generated by Makefile
+
=== modified file 'ChangeLog'
--- ChangeLog 2008-12-05 03:13:41 +0000
+++ ChangeLog 2011-01-17 17:19:51 +0000
@@ -0,0 +1,2 @@
+# Generated by Makefile
+
=== modified file 'Makefile.am'
--- Makefile.am 2010-03-04 02:47:35 +0000
+++ Makefile.am 2011-01-17 17:19:51 +0000
@@ -8,3 +8,28 @@
DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
+dist-hook:
+ @if test -d "$(top_srcdir)/.bzr"; \
+ then \
+ echo Creating ChangeLog && \
+ ( cd "$(top_srcdir)" && \
+ echo '# Generated by Makefile. Do not edit.'; echo; \
+ $(top_srcdir)/missing --run bzr log --gnu-changelog ) > ChangeLog.tmp \
+ && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+ || (rm -f ChangeLog.tmp; \
+ echo Failed to generate ChangeLog >&2 ); \
+ else \
+ echo Failed to generate ChangeLog: not a branch >&2; \
+ fi
+ @if test -d "$(top_srcdir)/.bzr"; \
+ then \
+ echo Creating AUTHORS && \
+ ( cd "$(top_srcdir)" && \
+ echo '# Generated by Makefile. Do not edit.'; echo; \
+ $(top_srcdir)/missing --run bzr log --long --levels=0 | grep -e "^\s*author:" -e "^\s*committer:" | cut -d ":" -f 2 | cut -d "<" -f 1 | sort -u) > AUTHORS.tmp \
+ && mv -f AUTHORS.tmp $(top_distdir)/AUTHORS \
+ || (rm -f AUTHORS.tmp; \
+ echo Failed to generate AUTHORS >&2 ); \
+ else \
+ echo Failed to generate AUTHORS: not a branch >&2; \
+ fi
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2009-12-24 19:24:54 +0000
+++ data/Makefile.am 2011-01-17 17:19:51 +0000
@@ -1,8 +1,7 @@
SUBDIRS = icons
dbus_servicesdir = $(DBUSSERVICEDIR)
-service_in_files = indicator-users.service.in \
- indicator-session.service.in
+service_in_files = indicator-session.service.in
dbus_services_DATA = $(service_in_files:.service.in=.service)
%.service: %.service.in
=== removed file 'data/indicator-users.service.in'
--- data/indicator-users.service.in 2011-01-14 03:07:18 +0000
+++ data/indicator-users.service.in 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.users
-Exec=@libexecdir@/indicator-users-service
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2011-01-11 16:48:07 +0000
+++ src/Makefile.am 2011-01-17 17:19:51 +0000
@@ -15,7 +15,10 @@
dbus-shared-names.h \
dbusmenu-shared.h \
users-service-client.h
-libsession_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror
+libsession_la_CFLAGS = \
+ $(APPLET_CFLAGS) \
+ -Wall -Werror \
+ -DG_LOG_DOMAIN=\"Indicator-Session\"
libsession_la_LIBADD = $(APPLET_LIBS)
libsession_la_LDFLAGS = -module -avoid-version
@@ -90,8 +93,15 @@
users-service-dbus.h \
users-service-dbus.c \
users-service-marshal.c
-indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
-indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS)
+indicator_session_service_CFLAGS = \
+ $(SESSIONSERVICE_CFLAGS) \
+ $(GCONF_CFLAGS) \
+ -DLIBEXECDIR=\"$(libexecdir)\" \
+ -Wall -Werror \
+ -DG_LOG_DOMAIN=\"Indicator-Session\"
+indicator_session_service_LDADD = \
+ $(SESSIONSERVICE_LIBS) \
+ $(GCONF_LIBS)
#################
# GTK Logout Stuff
Follow ups