diff options
| -rw-r--r-- | .bzr-builddeb/default.conf | 2 | ||||
| -rw-r--r-- | debian/changelog | 242 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 36 | ||||
| -rw-r--r-- | debian/copyright | 53 | ||||
| -rw-r--r-- | debian/patches/01_locking_on_autologin.patch | 15 | ||||
| -rwxr-xr-x | debian/rules | 16 | ||||
| -rw-r--r-- | debian/watch | 2 | ||||
| -rw-r--r-- | src/lock-helper.c | 2 |
9 files changed, 369 insertions, 0 deletions
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf new file mode 100644 index 0000000..3165e05 --- /dev/null +++ b/.bzr-builddeb/default.conf @@ -0,0 +1,2 @@ +[BUILDDEB] +merge = True diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..85ce815 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,242 @@ +indicator-session (0.2.0~dev-0ubuntu1~ppa1~update1) UNRELEASED; urgency=low + + * Updating to the libindicate 0.3.0 API + + -- Ted Gould <ted@ubuntu.com> Wed, 04 Nov 2009 16:35:55 -0600 + +indicator-session (0.1.7-0ubuntu3~ppa1) karmic; urgency=low + + * Listen on DBus for MissionControl coming on and off the bus + as EmpathyAccountManager used to do that for us before. + * Remove debian/patches/mc5-fixes.patch + + -- Ted Gould <ted@ubuntu.com> Sat, 10 Oct 2009 08:44:16 -0400 + +indicator-session (0.1.7-0ubuntu3) karmic; urgency=low + + * debian/patches/01_locking_on_autologin.patch: + - don't stop users to lock their screen on autologin configs, + thank David Barth (lp: #438936) + + -- Sebastien Bacher <seb128@ubuntu.com> Wed, 14 Oct 2009 19:16:24 +0200 + +indicator-session (0.1.7-0ubuntu2) karmic; urgency=low + + * debian/patches/mc5-fixes.patch (LP: #427643) + - Fix presence in mc5 + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 09 Oct 2009 08:20:46 +0200 + +indicator-session (0.1.7-0ubuntu1) karmic; urgency=low + + * Upstream release 0.1.7 + * Changing the icon so that if you are disconnected it is + 'system-shutdown-panel' and making sure that we see it + sometimes by not allocating the EmpathyAccountManager isn't + allocated until status is set. (LP: #432635) + * Also fixes by happenstance: (LP: #444170 and LP: #437065) + * Handling the locking of the screensaver so that we ensure + the screensaver is active before suspending. Also, we + throttle it to ensure it doesn't start until after suspend. + (LP: #444391) + * Asynchronized the menu handling so that it's in the right + order with async startup. (LP: #440484) + * String change, "New Session" to "Switch User" (LP: #444494) + * Removed debian/patches/switch_user_lp-444494.patch + + -- Ted Gould <ted@ubuntu.com> Thu, 08 Oct 2009 11:12:07 -0400 + +indicator-session (0.1.6-0ubuntu2) karmic; urgency=low + + * debian/patches/switch_user_lp-444494.patch + - String change, "New Session" to "Switch User" (LP: #444494) + + -- Ken VanDine <ken.vandine@canonical.com> Tue, 06 Oct 2009 10:44:57 -0400 + +indicator-session (0.1.6-0ubuntu1) karmic; urgency=low + + * Upstream release 0.1.6 (LP: #440216) + * Making startup of services asynchronous (LP: #436181) + * Disabling "Lock Screen" item when action is blocked by + GDM autologin (LP: #436724) + * Disabling "Lock Screen" in guest session (LP: #439068) + + -- Ted Gould <ted@ubuntu.com> Thu, 01 Oct 2009 23:33:25 +0200 + +indicator-session (0.1.5-0ubuntu2) karmic; urgency=low + + * src/indicator-session.c: + - Changing the start up of the services to be asynchronous, thank Ted Gould + (lp: #436181) + + -- Sebastien Bacher <seb128@ubuntu.com> Tue, 29 Sep 2009 01:25:38 +0200 + +indicator-session (0.1.5-0ubuntu1) karmic; urgency=low + + * Upstream release 0.1.5 (LP: #436223) + * PolicyKit-1 support (LP: #418643) + * GDM User list support (LP: #422052) + * MissionControl5 support (LP: #427643) + * Better locking of the screensaver (LP: #428115) + * debian/control: Adding in a libempathy-dev build dependency + as it's now required by upstream. + * Removing patches 01_polkit-1.patch and 99_autoreconf.patch + as they were merged upstream. + + -- Ted Gould <ted@ubuntu.com> Thu, 24 Sep 2009 17:07:51 -0500 + +indicator-session (0.1.4-0ubuntu2) karmic; urgency=low + + * Add 01_polkit-1.patch: Port to polkit-1. (LP: #412601) + * Add 99_autoreconf.patch: Autoconf changes for above patch. + * debian/control: libpolkit-gnome-dev → libpolkit-gobject-1-dev + + -- Martin Pitt <martin.pitt@ubuntu.com> Tue, 22 Sep 2009 09:17:43 +0200 + +indicator-session (0.1.4-0ubuntu1) karmic; urgency=low + + * Upstream release (LP: #432120) + * Fixes to issues brought up by the design team. + + -- Ted Gould <ted@ubuntu.com> Thu, 17 Sep 2009 11:08:07 -0500 + +indicator-session (0.1.3-0ubuntu1) karmic; urgency=low + + * Upstream release 0.1.3 + * GConf Key change listening + * Pidgin and Empathy (2.26) startup detection + * Label fixes + * Icon fixes for logout windows (LP: #426355) + + -- Ted Gould <ted@ubuntu.com> Thu, 10 Sep 2009 20:38:44 -0500 + +indicator-session (0.1.2-0ubuntu1) karmic; urgency=low + + * debian/control: + - build-depends on libgconf2-dev + + [ Ted Gould ] + * Upstream version 0.1.2 + * Adds translation setup. (fixes LP: #425598) + * Packaging fix to use upstream tarball. (fixes LP: #418769) + * Shows elipsis when dialogs are enabled (fixes LP: #421693) + * Adds GConf key for configure whether dialogs on shutdown and + logout are shown. (fixes LP: #422025) + + -- Sebastien Bacher <seb128@ubuntu.com> Tue, 08 Sep 2009 18:15:03 +0200 + +indicator-session (0.1.2-0ubuntu1~ppa1) karmic; urgency=low + + * Upstream version 0.1.2 fixes LP: #425598, LP: #418769, LP: #421693 + and LP: #422025. + + -- Ted Gould <ted@ubuntu.com> Tue, 08 Sep 2009 10:51:59 -0500 + +indicator-session (0.1.1-0ubuntu2~ppa2) karmic; urgency=low + + * Merging in c_korn's branch. + + -- Ted Gould <ted@ubuntu.com> Tue, 08 Sep 2009 10:18:56 -0500 + +indicator-session (0.1.1-0ubuntu2~ppa1) karmic; urgency=low + + * Removing printing DBus error message as it sometimes isn't + valid. (LP: #420238) + + -- Ted Gould <ted@ubuntu.com> Fri, 04 Sep 2009 13:44:45 -0500 + +indicator-session (0.1.1-0ubuntu1) karmic; urgency=low + + * set bzr-builddeb merge mode to true for easy tarball build + + [ Ted Gould ] + * Upstream update 0.1.1 for dbusmenu 0.1.2 (LP: #423975) + * debian/control: Increasing dbusmenu dep to 0.1.2 + + -- Sebastien Bacher <seb128@ubuntu.com> Fri, 04 Sep 2009 11:46:25 +0200 + +indicator-session (0.1-0ubuntu1) karmic; urgency=low + + [ Ted Gould ] + * Upstream version 0.1 (LP: #420108) + * debian/control: Looking for libdbusmenu* >= 0.1.0 + * debian/control: Shortening the short description and lengthening + the long one. Fixes a bug (LP: #412024) + * debian/watch: + - fixed url + + [ Martin Pitt ] + * Re-add dropped debian/compat. + + Re-add fixes which got lost in branch renaming: + * debian/control: Fix Vcs-* links. + * debian/rules: debian/rules: Update *.a/*.la cleanup for -sus → -session + renaming. + + -- Ted Gould <ted@ubuntu.com> Thu, 27 Aug 2009 21:30:27 +0200 + +indicator-session (0.1~bzr17-0ubuntu1) karmic; urgency=low + + * New snapshot (LP: #417035) + * Package rename from 'indicator-sus' to 'indicator-session' + * Merging in the branch that adds in the status icons to + the panel. + * debian/control: + - Switching to indicator-session and conflicting + - Changed Vcs-Bzr to point to ~ubuntu-desktop + - Changed the project homepage + and replacing indicator-sus + * debian/watch: Switching to indicator-session* + + -- Ken VanDine <ken.vandine@canonical.com> Fri, 21 Aug 2009 12:28:13 -0400 + +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/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..57aba13 --- /dev/null +++ b/debian/control @@ -0,0 +1,36 @@ +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), + libgconf2-dev, + libdbus-glib-1-dev, + gnome-doc-utils, + scrollkeeper, + libindicator-dev, + libdbusmenu-glib-dev (>= 0.1.2), + libdbusmenu-gtk-dev (>= 0.1.2), + libpolkit-gobject-1-dev, + intltool, + libempathy-dev (>= 2.27.0) +Standards-Version: 3.8.2 +Homepage: https://launchpad.net/indicator-session +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/ubuntu +Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-session/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 showing session management, status and user switching. + . + This indicator is designed to be placed on the right side of a panel and + give the user easy control for changing their instant message status. Switching + to another user. Starting a guest session. Or controlling the status of + their own session. + . + It requires some way to be hosted into a panel. For the GNOME Panel the + appropriate package is indicator-applet-session. 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/patches/01_locking_on_autologin.patch b/debian/patches/01_locking_on_autologin.patch new file mode 100644 index 0000000..88b255f --- /dev/null +++ b/debian/patches/01_locking_on_autologin.patch @@ -0,0 +1,15 @@ +diff -Nur -x '*.orig' -x '*~' indicator-session-0.1.7/src/lock-helper.c indicator-session-0.1.7.new/src/lock-helper.c +--- indicator-session-0.1.7/src/lock-helper.c 2009-10-14 19:15:55.000000000 +0200 ++++ indicator-session-0.1.7.new/src/lock-helper.c 2009-10-14 19:16:16.000000000 +0200 +@@ -130,9 +130,11 @@ + gboolean + will_lock_screen (void) + { ++/* + if (gdm_auto_login) { + return FALSE; + } ++*/ + if (is_guest) { + return FALSE; + } diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..b632517 --- /dev/null +++ b/debian/rules @@ -0,0 +1,16 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +DEB_DH_MAKESHLIBS_ARGS = -Xusr/lib/indicators + +binary-install/indicator-session:: + # 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..0205543 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://launchpad.net/indicator-session/+download .*/indicator-session-([0-9.]+)\.tar\.gz diff --git a/src/lock-helper.c b/src/lock-helper.c index 0bdec6c..02d0f96 100644 --- a/src/lock-helper.c +++ b/src/lock-helper.c @@ -130,9 +130,11 @@ lock_screen_gdm_cb_set (gdm_autologin_cb_t cb) gboolean will_lock_screen (void) { +/* if (gdm_auto_login) { return FALSE; } +*/ if (is_guest) { return FALSE; } |