diff options
| -rw-r--r-- | .bzrignore | 2 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | debian/changelog | 84 | ||||
| -rw-r--r-- | debian/control | 26 | ||||
| -rw-r--r-- | debian/copyright | 53 | ||||
| -rwxr-xr-x | debian/rules | 15 | ||||
| -rw-r--r-- | debian/watch | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 14 | ||||
| -rw-r--r-- | src/indicator-session.c (renamed from src/indicator-sus.c) | 0 |
10 files changed, 192 insertions, 10 deletions
@@ -38,6 +38,8 @@ debian/indicator-sus.substvars gtk-logout-helper .deps .libs +src/libsession.la +src/libsession_la-indicator-session.lo src/status-provider-pidgin-marshal.c src/status-provider-pidgin-marshal.h src/status-provider-telepathy-marshal.c @@ -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 8c3cb8a..ac90330 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 new file mode 100644 index 0000000..4091c19 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,84 @@ +indicator-session (0.1~bzr17-0ubuntu1~ppa2~morestatus3) UNRELEASED; urgency=low + + * Fixing status. + + -- Ted Gould <ted@ubuntu.com> Mon, 24 Aug 2009 23:47:42 -0500 + +indicator-session (0.1~bzr17-0ubuntu1~ppa2~morestatus2) karmic; urgency=low + + * More status... + + -- Ted Gould <ted@ubuntu.com> Mon, 24 Aug 2009 23:39:14 -0500 + +indicator-session (0.1~bzr17-0ubuntu1~ppa2~morestatus1) karmic; urgency=low + + * Merging in the status work branch + + -- Ted Gould <ted@ubuntu.com> Sat, 22 Aug 2009 13:12:11 -0500 + +indicator-session (0.1~bzr17-0ubuntu1~ppa1) karmic; urgency=low + + * Merging in trunk with rename from 'sus' to 'session' + * debian/control: Switching to indicator-session and conflicting + and replacing indicator-sus + * debian/watch: Switching to indicator-session* + + -- Ted Gould <ted@ubuntu.com> Tue, 18 Aug 2009 17:07:35 -0500 + +indicator-sus (0.1-0ubuntu3~ppa1) karmic; urgency=low + + * Merging in the branch that adds in the status icons to + the panel. + + -- Ted Gould <ted@ubuntu.com> Mon, 17 Aug 2009 09:08:53 -0500 + +indicator-sus (0.1-0ubuntu2) UNRELEASE; urgency=low + + * Fixed Vcs-Bzr location, part of the indicator-applet project + * specify Vcs-Bzr-Browser + + -- Alexander Sack <asac@ubuntu.com> Tue, 11 Aug 2009 17:26:15 +0200 + +indicator-sus (0.1-0ubuntu1) karmic; urgency=low + + * Include icons in the tarball + * Added license files + * Corrected the FSF address + * debian/control + - Set Homepage and Vcs-Bzr + * Added debian/watch + * Changed conflicts for gdm to <= 2.27.4-0ubuntu9 + * Depend on indicator-applet >= 0.2 + + -- Ken VanDine <ken.vandine@canonical.com> Tue, 11 Aug 2009 09:53:56 -0400 + +indicator-sus (0.1~ppa6) karmic; urgency=low + + * debian/control: Conflicting with gdm < 2.27.4-0ubuntu9 or + lower to stop people from having problems with the PPA. + + -- Ted Gould <ted@ubuntu.com> Sat, 08 Aug 2009 00:19:34 +0100 + +indicator-sus (0.1~ppa5) karmic; urgency=low + + * Legal headers on the source files. + + -- Ted Gould <ted@ubuntu.com> Fri, 07 Aug 2009 23:57:19 +0100 + +indicator-sus (0.1~ppa4) karmic; urgency=low + + * Merging in status shuffle branch. + + -- Ted Gould <ted@ubuntu.com> Fri, 07 Aug 2009 21:55:52 +0100 + +indicator-sus (0.1~ppa3) karmic; urgency=low + + * Fleshing out significantly. Inital rerelease. + + -- Ted Gould <ted@ubuntu.com> Sun, 26 Jul 2009 23:50:47 -0500 + +indicator-sus (0.1~ppa1) intrepid; urgency=low + + * Initial release + + -- Ted Gould <ted@ubuntu.com> Thu, 04 Dec 2008 23:51:41 -0800 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..4c76aa7 --- /dev/null +++ b/debian/control @@ -0,0 +1,26 @@ +Source: indicator-session +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com> +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, + libdbusmenu-glib-dev, + libdbusmenu-gtk-dev, + libpolkit-gnome-dev, + intltool +Standards-Version: 3.8.2 +Homepage: https://launchpad.net/indicator-applet +Vcs-Bzr: lp:~ubuntu-core-dev/indicator-applet/sus-ubuntu +Vcs-Bzr-Browser: http://bazaar.launchpad.net/~ubuntu-core-dev/indicator-applet/sus-ubuntu + +Package: indicator-session +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, indicator-applet (>= 0.2), devicekit-power, gdm +Conflicts: gdm (<= 2.27.4-0ubuntu9), indicator-sus +Replaces: indicator-sus +Description: An indicator providing session management, status control and user switching. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..9a36417 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,53 @@ +This package was debianized by Ted Gould <ted@canonical.com> on +Thu, 06 Aug 2009 17:23:01 +0100. + +It was downloaded from https://launchpad.net/indicator-applet + +Upstream Author: + + Ted Gould <ted@canonical.com> + +Copyright: + + Copyright (C) 2009 Canonical Ltd + Copyright (C) 2004 Gustavo Noronha Silva + +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 <http://www.gnu.org/licenses/>. + +Two files (logout-dialog.h logout-dialog.c) are under: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA + + +The Debian packaging is: + + Copyright (C) 2009 Ted Gould <ted@canonical.com> + +On Debian/Ubuntu systems, the full text of the LGPL v2 can be found in +`/usr/share/common-licenses/LGPL-2', the full text of the GPL v3 can be +found in `/usr/share/common-licenses/GPL-3' diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..7f46594 --- /dev/null +++ b/debian/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators + +binary-install/indicator-sus:: + # remove .a/.la clutter + rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.a + rm -f debian/$(cdbs_curpkg)/usr/lib/indicators/*/*.la + diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..22a7bca --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/indicator-applet/+download .*/indicator-session-([0-9.]+)\.tar\.gz diff --git a/src/Makefile.am b/src/Makefile.am index dbe6d0f..599b70a 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 |