diff options
| -rw-r--r-- | .bzrignore | 2 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 14 | ||||
| -rw-r--r-- | src/indicator-session.c (renamed from src/indicator-sus.c) | 0 |
6 files changed, 18 insertions, 10 deletions
@@ -38,3 +38,5 @@ debian/indicator-sus.substvars gtk-logout-helper .deps .libs +src/libsession.la +src/libsession_la-indicator-session.lo @@ -1,6 +1,6 @@ #!/bin/sh -PKG_NAME="indicator-sus" +PKG_NAME="indicator-session" which gnome-autogen.sh || { echo "You need gnome-common from GNOME SVN" diff --git a/configure.ac b/configure.ac index 3d87072..0baf030 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(src/indicator-sus.c) +AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-sus, 0.1) +AM_INIT_AUTOMAKE(indicator-session, 0.1) AM_MAINTAINER_MODE diff --git a/debian/changelog b/debian/changelog index 3e80322..e369ad5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +indicator-session (0.1~bzr17-0ubuntu1~ppa1) UNRELEASED; urgency=low + + * Merging in trunk with rename from 'sus' to 'session' + + -- Ted Gould <ted@ubuntu.com> Tue, 18 Aug 2009 16:59:58 -0500 + indicator-sus (0.1-0ubuntu3~ppa1) karmic; urgency=low * Merging in the branch that adds in the status icons to diff --git a/src/Makefile.am b/src/Makefile.am index bc3c9d9..bd35910 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,15 +6,15 @@ libexec_PROGRAMS = indicator-status-service indicator-users-service indicator-se # Indicator Stuff ################### -status_users_sessionlibdir = $(INDICATORDIR) -status_users_sessionlib_LTLIBRARIES = libstatus-users-session.la -libstatus_users_session_la_SOURCES = \ - indicator-sus.c \ +sessionlibdir = $(INDICATORDIR) +sessionlib_LTLIBRARIES = libsession.la +libsession_la_SOURCES = \ + indicator-session.c \ dbus-shared-names.h \ status-service-client.h -libstatus_users_session_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror -libstatus_users_session_la_LIBADD = $(APPLET_LIBS) -libstatus_users_session_la_LDFLAGS = -module -avoid-version +libsession_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror +libsession_la_LIBADD = $(APPLET_LIBS) +libsession_la_LDFLAGS = -module -avoid-version ################ # Status Stuff diff --git a/src/indicator-sus.c b/src/indicator-session.c index 07efc86..07efc86 100644 --- a/src/indicator-sus.c +++ b/src/indicator-session.c |