--- gnome-screensaver-2.24.0.orig/debian/gconf-defaults +++ gnome-screensaver-2.24.0/debian/gconf-defaults @@ -0,0 +1,2 @@ +/apps/gnome-screensaver/user_switch_enabled true +/apps/gnome-screensaver/lock_enabled false --- gnome-screensaver-2.24.0.orig/debian/watch +++ gnome-screensaver-2.24.0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver/([\d\.]+)[02468]/ gnome-screensaver-(.*)\.tar\.gz debian uupdate --- gnome-screensaver-2.24.0.orig/debian/copyright +++ gnome-screensaver-2.24.0/debian/copyright @@ -0,0 +1,91 @@ +This package was debianized by Guilherme de S. Pastore on +Sat, 9 Jul 2005 18:16:18 -0300. + +It was downloaded from http://ftp.gnome.org/pub/GNOME/sources/gnome-screensaver + +Upstream Author: William Jon McCann + +xscreensaver + Copyright (C) 1991-2004 Jamie Zawinski + + Permission to use, copy, modify, distribute, and sell this software and its + documentation for any purpose is hereby granted without fee, provided that + the above copyright notice appear in all copies and that both that + copyright notice and this permission notice appear in supporting + documentation. No representations are made about the suitability of this + software for any purpose. It is provided "as is" without express or + implied warranty. + + +GNOME Screensaver + Copyright (C) 2004-2005 William Jon McCann + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + +File transfer dialog + Copyright (C) 2002 Ximian, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + +Fast User Switch Applet + Copyright (C) 2004-2005 James M. Cape + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + +GDM Communication + Copyright (C) 2001 Queen of England + Copyright (C) 2002-2003 George Lebl + Copyright (C) 2005 James M. Cape + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + +Floater saver + Copyright (C) 2005 Ray Strode , + Matthias Clasen , + Søren Sandmann + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + +GNOME Screensaver Theme Window + Copyright (C) 2005 Ray Strode + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + +The translations into Dutch, Finnish, French, Japanese, Lithuanian, Brazilian +Portuguese, Slovak, Swedish, Thai, Ukrainian and traditional Chinese are +copyrighted by the Free Software Foundation, Inc. + +The Vietnamese translation is copyrighted by the GNOME i18n Project for +Vietnamese. + +The Hungarian translation is copyrighted by Canonical Ltd. and Rosetta +Contributors 2005. + +They are all licensed under the GNU General Public License as published by the +Free Software Foundation, either version 2 or any later version. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +On Debian Systems, the full text of the license can be found on +/usr/share/common-licenses/GPL --- gnome-screensaver-2.24.0.orig/debian/gnome-screensaver.pam +++ gnome-screensaver-2.24.0/debian/gnome-screensaver.pam @@ -0,0 +1,2 @@ +@include common-auth +auth optional pam_gnome_keyring.so --- gnome-screensaver-2.24.0.orig/debian/control.in +++ gnome-screensaver-2.24.0/debian/control.in @@ -0,0 +1,53 @@ +Source: gnome-screensaver +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Guilherme de S. Pastore +Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~ted-gould/gnome-screensaver/ubuntu-packaging +Vcs-Browser: http://bazaar.launchpad.net/~ted-gould/gnome-screensaver/ubuntu-packaging +Build-Depends: cdbs, + debhelper (>= 5.0.13), + libdbus-glib-1-dev (>= 0.60), + libxml2-dev (>= 2.6.0), + libgconf2-dev (>= 2.6.1), + libglib2.0-dev (>= 2.15.0), + libgtk2.0-dev (>= 2.13.7), + libgnomeui-dev (>= 2.6), + libglade2-dev (>= 2.5.0), + libpam0g-dev, + libgnome-menu-dev (>= 2.11.1), + libxau-dev, + libxmu-dev, + libxss-dev, + libxxf86vm-dev, + libxml-parser-perl, + libexif-dev, + libxxf86misc-dev, + gnome-pkg-tools (>= 0.10), + libgl1-mesa-dev | libgl1-mesa-swx11-dev, + libgnomekbdui-dev (>= 0.1), + libnotify-dev, + libgnome-desktop-dev (>= 2.23.2) +Standards-Version: 3.7.3 +Homepage: http://live.gnome.org/GnomeScreensaver + +Package: gnome-screensaver +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + dbus, + gnome-icon-theme (>= 2.15.90) +Recommends: gnome-power-manager, + xscreensaver-data, + xscreensaver-gl, + rss-glx, + libpam-gnome-keyring +Description: GNOME screen saver and locker + gnome-screensaver is a screen saver and locker that aims to have simple, + sane and secure defaults, and be well integrated with the GNOME desktop. + . + It is designed to support, among other things: + . + * the ability to lock down configuration settings + * translation into other languages + * user switching --- gnome-screensaver-2.24.0.orig/debian/gnome-screensaver.1 +++ gnome-screensaver-2.24.0/debian/gnome-screensaver.1 @@ -0,0 +1,45 @@ +.\" Copyright (C) 2007 Sven Arvidsson +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This 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, write to the Free Software Foundation, Inc., +.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +.TH gnome-screensaver 1 "2007\-09\-27" "GNOME" +.SH NAME +GNOME Screensaver \- screen saver and locker +.SH SYNOPSIS +.B gnome-screensaver +.RI [ OPTIONS... ] +.SH DESCRIPTION +GNOME Screensaver is the default screen saver and locker in a GNOME +desktop. It is designed with simplicity and security in mind. +.SH OPTIONS +.TP +.B \-\-no\-daemon +Don't become a daemon +.TP +.B \-\-debug +Enable debugging code +.P +This program also accepts the standard GTK options. +.SH AUTHORS +.B gnome-screensaver +is written by William Jon McCann . +.P +This manual page was written by Sven Arvidsson , +for the Debian project (but may be used by others). +.SH SEE ALSO +.BR "gtk-options" (7), +.P +The online documentation available through the program's +.I Help +menu. --- gnome-screensaver-2.24.0.orig/debian/gnome-screensaver-preferences.1 +++ gnome-screensaver-2.24.0/debian/gnome-screensaver-preferences.1 @@ -0,0 +1,38 @@ +.\" Copyright (C) 2007 Sven Arvidsson +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This 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, write to the Free Software Foundation, Inc., +.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +.TH gnome-screensaver-preferences 1 "2007\-09\-27" "GNOME" +.SH NAME +GNOME Screensaver Preferences \- configure GNOME Screensaver +.SH SYNOPSIS +.B gnome-screensaver-preferences +.RI [ OPTIONS... ] +.SH DESCRIPTION +Manages preferences for the GNOME screen saver. +.SH OPTIONS +This program only accepts the standard GTK options. +.SH AUTHORS +.B gnome-screensaver-preferences +is written by William Jon McCann . +.P +This manual page was written by Sven Arvidsson , +for the Debian project (but may be used by others). +.SH SEE ALSO +.BR "gnome-screensaver" (1), +.BR "gtk-options" (7) +.P +The online documentation available through the program's +.I Help +menu. --- gnome-screensaver-2.24.0.orig/debian/compat +++ gnome-screensaver-2.24.0/debian/compat @@ -0,0 +1 @@ +5 --- gnome-screensaver-2.24.0.orig/debian/control +++ gnome-screensaver-2.24.0/debian/control @@ -0,0 +1,53 @@ +Source: gnome-screensaver +Section: gnome +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Guilherme de S. Pastore +Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~ted-gould/gnome-screensaver/ubuntu-packaging +Vcs-Browser: http://bazaar.launchpad.net/~ted-gould/gnome-screensaver/ubuntu-packaging +Build-Depends: cdbs, + debhelper (>= 5.0.13), + libdbus-glib-1-dev (>= 0.60), + libxml2-dev (>= 2.6.0), + libgconf2-dev (>= 2.6.1), + libglib2.0-dev (>= 2.15.0), + libgtk2.0-dev (>= 2.13.7), + libgnomeui-dev (>= 2.6), + libglade2-dev (>= 2.5.0), + libpam0g-dev, + libgnome-menu-dev (>= 2.11.1), + libxau-dev, + libxmu-dev, + libxss-dev, + libxxf86vm-dev, + libxml-parser-perl, + libexif-dev, + libxxf86misc-dev, + gnome-pkg-tools (>= 0.10), + libgl1-mesa-dev | libgl1-mesa-swx11-dev, + libgnomekbdui-dev (>= 0.1), + libnotify-dev, + libgnome-desktop-dev (>= 2.23.2) +Standards-Version: 3.7.3 +Homepage: http://live.gnome.org/GnomeScreensaver + +Package: gnome-screensaver +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + dbus, + gnome-icon-theme (>= 2.15.90) +Recommends: gnome-power-manager, + xscreensaver-data, + xscreensaver-gl, + rss-glx, + libpam-gnome-keyring +Description: GNOME screen saver and locker + gnome-screensaver is a screen saver and locker that aims to have simple, + sane and secure defaults, and be well integrated with the GNOME desktop. + . + It is designed to support, among other things: + . + * the ability to lock down configuration settings + * translation into other languages + * user switching --- gnome-screensaver-2.24.0.orig/debian/rules +++ gnome-screensaver-2.24.0/debian/rules @@ -0,0 +1,21 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --with-xscreensaverdir=/usr/share/xscreensaver/config \ + --with-xscreensaverhackdir=/usr/lib/xscreensaver \ + --enable-locking \ + --with-libgl + +install/gnome-screensaver:: + rm debian/gnome-screensaver/usr/lib/gnome-screensaver/gnome-screensaver/popsquares + rm debian/gnome-screensaver/usr/share/applications/screensavers/popsquares.desktop + +binary-fixup/gnome-screensaver:: + dh_gconf --priority=15 --- gnome-screensaver-2.24.0.orig/debian/gnome-screensaver.manpages +++ gnome-screensaver-2.24.0/debian/gnome-screensaver.manpages @@ -0,0 +1,3 @@ +debian/gnome-screensaver.1 +debian/gnome-screensaver-command.1 +debian/gnome-screensaver-preferences.1 --- gnome-screensaver-2.24.0.orig/debian/gnome-screensaver-command.1 +++ gnome-screensaver-2.24.0/debian/gnome-screensaver-command.1 @@ -0,0 +1,74 @@ +.\" Copyright (C) 2007 Sven Arvidsson +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This 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, write to the Free Software Foundation, Inc., +.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +.TH gnome-screensaver-command 1 "2007\-09\-27" "GNOME" +.SH NAME +gnome-screensaver-command \- controls GNOME screensaver +.SH SYNOPSIS +.B gnome-screensaver-command +.RI [ OPTION... ] +.SH DESCRIPTION +gnome-screensaver-command is a tool for controlling an already +running instance of gnome-screensaver. +.SH OPTIONS +.TP +.B \-\-exit +Causes the screensaver to exit gracefully +.TP +.B \-q, \-\-query +Query the state of the screensaver +.TP +.B \-t, \-\-time +Query the length of time the screensaver has been active +.TP +.B \-l, \-\-lock +Tells the running screensaver process to lock the screen immediately +.TP +.B \-c, \-\-cycle +If the screensaver is active then switch to another graphics demo +.TP +.B \-a, \-\-activate +Turn the screensaver on (blank the screen) +.TP +.B \-d, \-\-deactivate +If the screensaver is active then deactivate it (un-blank the screen) +.TP +.B \-p, \-\-poke +Poke the running screensaver to simulate user activity +.TP +.B \-i, \-\-inhibit +Inhibit the screensaver from activating. Command blocks while inhibit +is active. +.TP +.B \-n, \-\-application-name +The calling application that is inhibiting the screensaver +.TP +.B \-r, \-\-reason +The reason for inhibiting the screensaver +.TP +.B \-V, \-\-version +Version of this application +.SH AUTHORS +.B gnome-screensaver-command +is written by William Jon McCann . +.P +This manual page was written by Sven Arvidsson , +for the Debian project (but may be used by others). +.SH SEE ALSO +.BR "gnome-screensaver" (1) +.P +The online documentation available through the program's +.I Help +menu. --- gnome-screensaver-2.24.0.orig/debian/README.Debian +++ gnome-screensaver-2.24.0/debian/README.Debian @@ -0,0 +1,13 @@ +gnome-keyring warnings +---------------------- + +If you didn't install the libpam-gnome-keyring dependency, you should probably +comment the pam_gnome_keyring.so line in /etc/pam.d/gnome-screensaver or you +might see warnings similar to: + + gnome-screensaver-dialog: PAM unable to dlopen(/lib/security/pam_gnome_keyring.so) + gnome-screensaver-dialog: PAM [error: /lib/security/pam_gnome_keyring.so: cannot open shared object file: No such file or directory] + gnome-screensaver-dialog: PAM adding faulty module: lib/security/pam_gnome_keyring.so + +These can also be ignored. + --- gnome-screensaver-2.24.0.orig/debian/changelog +++ gnome-screensaver-2.24.0/debian/changelog @@ -0,0 +1,442 @@ +gnome-screensaver (2.24.0-0ubuntu6.1~tormod) jaunty; urgency=low + + * debian/patches/10_allow_full_path.patch: Allow full path in + desktop files. + + -- Tormod Volden Sat, 13 Jun 2009 18:13:42 +0200 + +gnome-screensaver (2.24.0-0ubuntu6) jaunty; urgency=low + + * debian/patches/09_include_in_xfce.patch: Don't hide the screensaver + preferences from XFCE based sessions. (LP: #350962) + + -- Mario Limonciello Sat, 11 Apr 2009 09:51:29 -0500 + +gnome-screensaver (2.24.0-0ubuntu5) jaunty; urgency=low + + * Prevent screen-saver activation when X screens other than 0 are + not idle. Packaged from Aaron Plattner's original (LP: #87317) + + -- TJ Fri, 27 Feb 2009 10:23:26 +0000 + +gnome-screensaver (2.24.0-0ubuntu4) jaunty; urgency=low + + * debian/patches/07_fix_blank_screen_preview.patch: The blank screen screen + saver is not consistent in preview and actual mode, clear the preview + window before showing it. Patch by Neil J. Patel was included upstream. + (LP: #199112) + + -- Michael Terry Fri, 16 Jan 2009 14:31:13 -0500 + +gnome-screensaver (2.24.0-0ubuntu3) jaunty; urgency=low + + * rebuild for libgnome-desktop soname change + + -- Michael Vogt Wed, 17 Dec 2008 21:36:52 +0100 + +gnome-screensaver (2.24.0-0ubuntu2) intrepid; urgency=low + + * debian/patches:06_dont-leak-root-windows.patch: + - Don't create the GNOME background pixmap with root=TRUE, since that + results in a permanent client connection and unfreeable foreign image; + the leak of these causes you to quickly run out of X clients, especially + on multiple monitors. LP: #263211. + + -- Scott James Remnant Fri, 10 Oct 2008 18:33:23 +0100 + +gnome-screensaver (2.24.0-0ubuntu1) intrepid; urgency=low + + * Upstream release. Version bump and translations. + + -- Ted Gould Wed, 24 Sep 2008 12:40:02 -0500 + +gnome-screensaver (2.23.90-0ubuntu1) intrepid; urgency=low + + * Upstream release + * Improves XRandR support to notice monitor config changes + * Honors lockdown keys better + * Better checking for caps lock key + * debian/rules: Removing setting the GDM configuration file as the + value is no longer used by GNOME Screensaver. + + -- Ted Gould Wed, 17 Sep 2008 12:59:06 -0500 + +gnome-screensaver (2.23.3-0ubuntu1) intrepid; urgency=low + + * Upstream update + * debian/control: Increasing GTK+ required version to match upstream + configure script changes. + + -- Ted Gould Thu, 21 Aug 2008 09:34:40 -0500 + +gnome-screensaver (2.23.2-0ubuntu1) intrepid; urgency=low + + * Upstream update + * control.in: Adding in a dependency on libgnome-desktop-dev + + -- Ted Gould Mon, 16 Jun 2008 17:49:29 -0700 + +gnome-screensaver (2.22.2-1ubuntu1) intrepid; urgency=low + + * Merging in minor packaging changes from 2.22.2-1 + + -- Ted Gould Thu, 08 May 2008 09:19:56 -0700 + +gnome-screensaver (2.22.2-1) unstable; urgency=high + + * New upstream bugfix release: + + SECURITY: CVE-2008-1683 unlocks session if + it fails to get user attributes via getpwnam() (Closes: #475154). + + -- Sebastian Dröge Wed, 16 Apr 2008 10:50:22 +0200 + +gnome-screensaver (2.22.2-0ubuntu1) hardy; urgency=low + + * Upstream release. + * Adds a limit to the number of characters that can be entered into the + notes dialog. LP: #196844 + + -- Ted Gould Tue, 08 Apr 2008 09:10:54 -0700 + +gnome-screensaver (2.22.1-1) unstable; urgency=low + + * New upstream bugfix release. + * debian/control.in: + + Move homepage to Homepage field. + + -- Sebastian Dröge Wed, 02 Apr 2008 18:54:19 +0200 + +gnome-screensaver (2.22.1-0ubuntu1) hardy; urgency=medium + + * New upstream release. Fixes: CVE-2008-0887 + * debian/control: Adding in VCS fields for packaging + + -- Ted Gould Wed, 02 Apr 2008 17:10:55 -0700 + +gnome-screensaver (2.22.0-1) unstable; urgency=medium + + [ Josselin Mouette ] + * 02_clear_clipboard.patch: clear the clipboard when locking the + screen. Closes: #455484. + + [ Loic Minier ] + * Add a README.Debian to document that one should disable the gnome-keyring + PAM module if the recommended libpam-gnome-keyring isn't installed; + closes: #457549. + + [ Sebastian Dröge ] + * New upstream stable release: + + Drop gnome-vfs build dependency and build depend on glib >= 2.15.0. + + 02_clear_clipboard.patch: Dropped, merged upstream. + + -- Sebastian Dröge Fri, 14 Mar 2008 10:15:47 +0100 + +gnome-screensaver (2.22.0-0ubuntu1) hardy; urgency=low + + * Upstream release. Only whitespace and translation changes. + + -- Ted Gould Tue, 11 Mar 2008 10:31:33 -0700 + +gnome-screensaver (2.21.6-0ubuntu3) hardy; urgency=low + + * rebuild due to the libxklavier soname change + + -- Sebastien Bacher Wed, 27 Feb 2008 15:51:38 +0100 + +gnome-screensaver (2.21.6-0ubuntu2) hardy; urgency=low + + * Updating control.in to have up-to-date dependencies: + no gnomevfs + glib >= 2.15.0 + + -- Ted Gould Thu, 14 Feb 2008 14:57:25 -0800 + +gnome-screensaver (2.21.6-0ubuntu1) hardy; urgency=low + + * Upstream version update. + + -- Ted Gould Mon, 04 Feb 2008 10:26:29 -0800 + +gnome-screensaver (2.20.0-2ubuntu1) hardy; urgency=low + + * Updating to match updates from Debian 2.20.0-2 + Adding man pages: gnome-screensaver.1, gnome-screensaver-control.1 + and gnome-screensaver-preferences.1 + Adding a control file to install them: gnome-screensaver.manpages + * debian/control.in + Adding libpam-gnome-keyring to recommends + Increasing standards version to 3.7.3 + * debian/gnome-screensaver.pam + Add gnome keyring to PAM settings + + -- Ted Gould Tue, 11 Dec 2007 15:18:37 -0800 + +gnome-screensaver (2.20.0-1.1ubuntu1) hardy; urgency=low + + * Updating to now be based on Debian package + * Added patches: + 03_fix_ltsp-fading.patch + 05_locking_for_compiz.patch <-- prev. changelog entry as patch + 02_keep_unlock_raised.patch + 04_force_blank_only_on_ltsp.patch + * Removed Debian theme screensaver + removed debian-swirl-logo.svg, debian-floaters.desktop and + gnome-screensaver.install + removed entry from gconf-default along with mode 'single' as it doesn't + make sense without specifying a screensaver + * NOTE: Compared to other Ubuntu packages this DOES NOT contain the Ubuntu + screensaver, that is moving to the art packages and can not be found + here. + * Changed gconf_defaults to have Ubuntu defaults + * debian/control + Recommending xscreensaver packages with additional hacks in them + * debian/rules + Removed duplicate --with-gdm-config + Add install action to remove popsquares as it's in xscreensaver-data + + -- Ted Gould Tue, 20 Nov 2007 22:47:47 -0800 + +gnome-screensaver (2.20.0-2) unstable; urgency=low + + [ Loic Minier ] + * Build-dep on libnotify-dev for "Leave Message" functionality to actually + work; thanks Hristo Hristov; Launchpad #140866; closes: #443766. + + [ Sven Arvidsson ] + * Add man pages (Closes: #438606) + + [ Josselin Mouette ] + * 01_compiz_lock_bypass_CVE-2007-3920.patch: place fix of the + security upload in a proper separate patch. + * gnome-screensaver.pam: add support for pam_gnome_keyring. + * Recommend libpam-gnome-keyring. + + [ Loic Minier ] + * Drop duplicate --with-gdm-config flag; thanks Ted Gould and Ubuntu; + closes: #453512. + + [ Sebastian Dröge ] + * ACK NMU (Closes: #446906) and upload to unstable. + * debian/control.in: + + Update Standards-Version to 3.7.3 (no additional changes needed). + + -- Sebastian Dröge Mon, 10 Dec 2007 07:55:36 +0100 + +gnome-screensaver (2.20.0-1.1) unstable; urgency=high + + * Non-maintainer upload by the testing-security team + * Prevent screen lock bypass via shortcuts when compiz is running + (Closes: #446906) Fixes: CVE-2007-3920 + + -- Steffen Joeris Wed, 24 Oct 2007 13:08:36 +0000 + +gnome-screensaver (2.20.0-1) unstable; urgency=low + + [ Riccardo Setti ] + * New upstream release + * Adjusted Build-Deps + + [ Josselin Mouette ] + * Remove xscreensaver-gl from Recommends as it doesn't ship any + .desktop files. + + -- Josselin Mouette Sat, 22 Sep 2007 15:07:01 +0200 + +gnome-screensaver (2.18.2-1) unstable; urgency=low + + * New upstream stable release. + * Wrap build-deps and deps. + * Cleanups. + * Bump up Debhelper compatibility level to 5. + + -- Loic Minier Tue, 29 May 2007 11:56:21 +0200 + +gnome-screensaver (2.18.1-1) unstable; urgency=low + + [ Riccardo Setti ] + * New upstream release. + + [ Sebastian Dröge ] + * Upload to unstable, drop check-dist include. + + -- Sebastian Dröge Tue, 1 May 2007 20:33:17 +0200 + +gnome-screensaver (2.18.0-1) experimental; urgency=low + + [ Riccardo Setti ] + * New upstream release + + [ Loic Minier ] + * Build-dep on libgnomekbdui-dev (>= 0.1) for kbd-layout-indicator. + * Bump up libgtk2.0-dev build-dep to >= 2.10.0 to make the package + autobuildable. + + -- Loic Minier Sun, 25 Mar 2007 19:30:28 +0200 + +gnome-screensaver (2.16.3-2) experimental; urgency=low + + * Merge 2.14.3-2 up-to 2.14.3-4; SVN r7317:8959. + - Drop patch 00_dbus_0.90, obsolete. + - Drop patch 01_norwegian_translation_fix, merged upstream. + + -- Loic Minier Sat, 17 Mar 2007 13:26:32 +0100 + +gnome-screensaver (2.16.3-1) experimental; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * New upstream stable release; bug fixes and translations. + + -- Loic Minier Sat, 17 Mar 2007 11:43:49 +0100 + +gnome-screensaver (2.16.2-1) experimental; urgency=low + + * New upstream release. + * Remove duplicate build-dependency on libpam0g-dev. + + -- Josselin Mouette Fri, 8 Dec 2006 23:13:56 +0100 + +gnome-screensaver (2.16.0-1) experimental; urgency=low + + * New upstream release. + + -- Loic Minier Sat, 30 Sep 2006 01:29:27 +0200 + +gnome-screensaver (2.15.6-1) experimental; urgency=low + + * New upstream development releases. + - Target at experimental. + - Build-depends on libgl1-mesa-dev, and libpam0g-dev + - Install Debian files via debian/gnome-screensaver.install instead of + debian/rules; install debian-floaters in + /usr/share/applications/screensavers instead of + /usr/share/gnome-screensaver/themes. + - Recommend xscreensaver-gl and rss-glx for additional screensavers. + - Depend on gnome-icon-theme >= 2.15.90, first version providing the + "preferences-desktop-screensaver" icon instead of "screensaver". + * Add CDBS' utils. + + -- Loic Minier Mon, 14 Aug 2006 00:20:19 +0200 + +gnome-screensaver (2.14.3-4) unstable; urgency=low + + [ Sven Arvidsson ] + * Fix spelling mistake in norwegian translation. (Closes: #402586) + + [ Loic Minier ] + * Add a get-orig-source target to retrieve the upstream tarball. + + -- Loic Minier Sat, 13 Jan 2007 23:30:43 +0100 + +gnome-screensaver (2.14.3-3) unstable; urgency=low + + * Add a gconf-defaults file. + + Set the default screensaver to be Debian floaters. (Closes: #367682) + + Enable user switch option. + * debian/rules: Register it with priority 15 + * debian/control: Build-depend on debhelper 5.0.13. + + -- Gustavo Franco Fri, 24 Nov 2006 16:58:03 -0200 + +gnome-screensaver (2.14.3-2) unstable; urgency=low + + * debian/patches/00_dbus_0.90.patch + - Added. Use dbus_connection_close instead of dbus_connection_disconnect, + fixes FTBS with libdbus-1 >= 0.90 (Closes: #387240) + + -- Sjoerd Simons Wed, 13 Sep 2006 10:38:38 +0200 + +gnome-screensaver (2.14.3-1) unstable; urgency=low + + [ Loic Minier ] + * Add watch file. + + [ Josselin Mouette ] + * Recommend gnome-power-manager. + + [ Loic Minier ] + * New upstream release. + + -- Loic Minier Tue, 8 Aug 2006 11:28:31 +0200 + +gnome-screensaver (2.14.2-1) unstable; urgency=low + + * New upstream release. + + -- Loic Minier Thu, 1 Jun 2006 12:02:48 +0200 + +gnome-screensaver (2.14.1-1) unstable; urgency=medium + + * New upstream release. + + * debian/control.in: + - updated my e-mail address. + - bumped Standards-Version with no changes. + - added dependency on dbus (Closes: #353517). + - added build-dependency on libxxf86misc-dev (Closes: #357885). + + -- Guilherme de S. Pastore Sat, 13 May 2006 12:25:18 -0300 + +gnome-screensaver (2.14.0-1) unstable; urgency=low + + * New upstream release + * Update description. + + -- Sjoerd Simons Fri, 17 Mar 2006 11:13:32 +0100 + +gnome-screensaver (2.13.92-1) experimental; urgency=low + + * New upstream release + * debian/patches/02_multiscreen_lifelock.patch + + Removed. Fixed upstream + * debian/patches/01_dont_modify_bg.patch + + Removed. Unsure if it actually fixed the bug or made the race condition + harder to trigger. So temporarely remove it for testing purposes + + -- Sjoerd Simons Wed, 1 Mar 2006 14:00:18 +0100 + +gnome-screensaver (0.0.24-2) unstable; urgency=low + + * debian/patches/02_multiscreen_lifelock.patch + + Added. Prevent gnome-screensaver lifelock when using multiple screen. + + -- Sjoerd Simons Fri, 17 Feb 2006 14:38:17 +0100 + +gnome-screensaver (0.0.24-1) unstable; urgency=low + + [ Guilherme de S. Pastore ] + * New upstream release + + [ Sjoerd Simons ] + * Upload to unstable + * Add --with-gdm-config=/etc/gdm/gdm.conf to DEB_CONFIGURE_EXTRA_FLAGS + * Add debian swirl floater screensaver. Thanks to Martin-Éric Racine + (Closes: #348281) + * Trim down the build-depends + * Add libexif-dev to the build-depends. Enables the slideshow screensaver to + rotate pictures when needed. + * debian/patches/01_dont_modify_bg.patch + + Added. Calling gtk_widget_modify_bg seems to trigger a segv, so don't + call it. + + -- Sjoerd Simons Mon, 6 Feb 2006 21:39:42 +0100 + +gnome-screensaver (0.0.23-2) experimental; urgency=low + + * Completed copyright and licensing notes. Thanks to Marc 'HE' + Brockschmidt . + + -- Guilherme de S. Pastore Mon, 26 Dec 2005 09:57:58 -0200 + +gnome-screensaver (0.0.23-1) experimental; urgency=low + + * New upstream release. + + -- Guilherme de S. Pastore Wed, 21 Dec 2005 21:02:45 -0200 + +gnome-screensaver (0.0.21-1) experimental; urgency=low + + * Initial release (Closes: #317448) + + -- Guilherme de S. Pastore Tue, 6 Dec 2005 20:30:00 -0200 --- gnome-screensaver-2.24.0.orig/debian/patches/10_allow_full_path.patch +++ gnome-screensaver-2.24.0/debian/patches/10_allow_full_path.patch @@ -0,0 +1,22 @@ +diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.24.0/src/gs-theme-manager.c gnome-screensaver-2.24.0.new/src/gs-theme-manager.c +--- gnome-screensaver-2.24.0/src/gs-theme-manager.c 2009-06-13 18:05:05.000000000 +0200 ++++ gnome-screensaver-2.24.0.new/src/gs-theme-manager.c 2009-06-13 18:07:35.000000000 +0200 +@@ -75,6 +75,18 @@ + { + int i; + ++ /* if a full path is given, just check the file */ ++ if (*command == '/' ) { ++ char *path; ++ ++ path = g_strdup (command); ++ if (g_file_test (path, G_FILE_TEST_IS_EXECUTABLE) ++ && ! g_file_test (path, G_FILE_TEST_IS_DIR)) ++ return path; ++ else ++ return NULL; ++ } ++ + for (i = 0; known_engine_locations [i]; i++){ + char *path; + --- gnome-screensaver-2.24.0.orig/debian/patches/09_include_in_xfce.patch +++ gnome-screensaver-2.24.0/debian/patches/09_include_in_xfce.patch @@ -0,0 +1,12 @@ +diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.24.0/data/gnome-screensaver-preferences.desktop.in gnome-screensaver-2.24.0.new/data/gnome-screensaver-preferences.desktop.in +--- gnome-screensaver-2.24.0/data/gnome-screensaver-preferences.desktop.in 2008-04-29 21:30:11.000000000 -0500 ++++ gnome-screensaver-2.24.0.new/data/gnome-screensaver-preferences.desktop.in 2009-04-11 09:51:15.000000000 -0500 +@@ -7,7 +7,7 @@ + Terminal=false + Type=Application + Categories=Settings;DesktopSettings; +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;XFCE; + StartupNotify=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-screensaver --- gnome-screensaver-2.24.0.orig/debian/patches/06_dont-leak-root-windows.patch +++ gnome-screensaver-2.24.0/debian/patches/06_dont-leak-root-windows.patch @@ -0,0 +1,13 @@ +--- a/src/gs-manager.c.orig 2008-10-10 18:28:13.000000000 +0100 ++++ b/src/gs-manager.c 2008-10-10 18:28:21.000000000 +0100 +@@ -1281,9 +1281,9 @@ + pixmap = gnome_bg_create_pixmap (manager->priv->bg, + gs_window_get_gdk_window (window), + width, + height, +- TRUE); ++ FALSE); + gs_window_set_background_pixmap (window, pixmap); + g_object_unref (pixmap); + } + --- gnome-screensaver-2.24.0.orig/debian/patches/08_watch-all-X-screens-when-detecting-idle.patch +++ gnome-screensaver-2.24.0/debian/patches/08_watch-all-X-screens-when-detecting-idle.patch @@ -0,0 +1,80 @@ +diff --git a/src/gs-watcher-x11.c b/src/gs-watcher-x11.c +index cb24690..c104d49 100644 +--- a/src/gs-watcher-x11.c ++++ b/src/gs-watcher-x11.c +@@ -278,7 +278,7 @@ notice_events_inner (Window window, + + gwindow = gdk_window_lookup (window); + if (gwindow != NULL +- && (window != GDK_ROOT_WINDOW ())) { ++ && (gdk_window_get_window_type(gwindow) != GDK_WINDOW_ROOT)) { + /* If it's one of ours, don't mess up its event mask. */ + return; + } +@@ -304,8 +304,8 @@ notice_events_inner (Window window, + /* Select for KeyPress on all windows that already have it selected */ + events = ((attrs.all_event_masks | attrs.do_not_propagate_mask) & KeyPressMask); + +- /* Keep already selected events. This is important when the +- window == GDK_ROOT_WINDOW () since the mask will contain ++ /* Keep already selected events. This is important for ++ the root windows since the mask will contain + StructureNotifyMask that is essential for RANDR support */ + events |= attrs.your_event_mask; + +@@ -322,7 +322,7 @@ notice_events_inner (Window window, + /* We want to disable all events */ + + /* Don't mess up the root window */ +- if (window == GDK_ROOT_WINDOW ()) { ++ if (window == attrs.root) { + events = attrs.your_event_mask; + } else { + events = 0; +@@ -651,11 +651,20 @@ xevent_filter (GdkXEvent *xevent, + static gboolean + start_idle_watcher (GSWatcher *watcher) + { ++ Display *dpy; ++ int i, screens; ++ + g_return_val_if_fail (watcher != NULL, FALSE); + g_return_val_if_fail (GS_IS_WATCHER (watcher), FALSE); + + gdk_window_add_filter (NULL, (GdkFilterFunc)xevent_filter, watcher); +- start_notice_events (watcher, DefaultRootWindow (GDK_DISPLAY ())); ++ ++ dpy = GDK_DISPLAY (); ++ screens = ScreenCount(dpy); ++ ++ for (i = 0; i < screens; i++) { ++ start_notice_events (watcher, RootWindow (dpy, i)); ++ } + + reset_timers (watcher); + +@@ -667,6 +676,9 @@ start_idle_watcher (GSWatcher *watcher) + static gboolean + stop_idle_watcher (GSWatcher *watcher) + { ++ Display *dpy; ++ int i, screens; ++ + g_return_val_if_fail (watcher != NULL, FALSE); + g_return_val_if_fail (GS_IS_WATCHER (watcher), FALSE); + +@@ -675,7 +687,13 @@ stop_idle_watcher (GSWatcher *watcher) + remove_idle_timer (watcher); + remove_power_timer (watcher); + +- stop_notice_events (watcher, DefaultRootWindow (GDK_DISPLAY ())); ++ dpy = GDK_DISPLAY (); ++ screens = ScreenCount(dpy); ++ ++ for (i = 0; i < screens; i++) { ++ stop_notice_events (watcher, RootWindow (dpy, i)); ++ } ++ + gdk_window_remove_filter (NULL, (GdkFilterFunc)xevent_filter, watcher); + + return FALSE; --- gnome-screensaver-2.24.0.orig/debian/patches/07_fix_blank_screen_preview.patch +++ gnome-screensaver-2.24.0/debian/patches/07_fix_blank_screen_preview.patch @@ -0,0 +1,22 @@ +# +# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-screensaver/+bug/199112 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=451498 +# Patch: http://bugzilla.gnome.org/attachment.cgi?id=121574&action=view +# Description: The preview window isn't cleared when it's shown for the blank +# screen screensaver, so it appears "grey" (actually its the bg[NORMAL] +# from the theme). It appears black the next time because it's cleared +# when its taken down. The patch clears the preview window before its +# shown. +# + +diff -Nur -x '*.orig' -x '*~' gnome-screensaver-2.22.2/src/gnome-screensaver-preferences.c gnome-screensaver-2.22.2.new/src/gnome-screensaver-preferences.c +--- gnome-screensaver-2.22.2/src/gnome-screensaver-preferences.c 2008-10-22 14:18:07.000000000 +0100 ++++ gnome-screensaver-2.22.2.new/src/gnome-screensaver-preferences.c 2008-10-22 14:23:44.000000000 +0100 +@@ -1193,6 +1193,7 @@ + gtk_widget_grab_focus (fullscreen_preview_window); + + fullscreen_preview_area = glade_xml_get_widget (xml, "fullscreen_preview_area"); ++ preview_clear (fullscreen_preview_area); + gs_job_set_widget (job, fullscreen_preview_area); + } + --- gnome-screensaver-2.24.0.orig/debian/patches/04_force_blank_only_on_ltsp.patch +++ gnome-screensaver-2.24.0/debian/patches/04_force_blank_only_on_ltsp.patch @@ -0,0 +1,15 @@ +diff -Nur gnome-screensaver-2.19.6/src/gs-manager.c gnome-screensaver-2.19.6.new/src/gs-manager.c +--- gnome-screensaver-2.19.6/src/gs-manager.c 2007-08-20 17:57:57.000000000 +0200 ++++ gnome-screensaver-2.19.6.new/src/gs-manager.c 2007-08-20 17:58:02.000000000 +0200 +@@ -137,6 +137,11 @@ + return NULL; + } + ++ if (g_getenv("LTSP_CLIENT")) { ++ gs_debug ("On LTSP Client, forcing blank only mode"); ++ return NULL; ++ } ++ + if (manager->priv->themes) { + int number = 0; + --- gnome-screensaver-2.24.0.orig/debian/patches/03_fix_ltsp-fading.patch +++ gnome-screensaver-2.24.0/debian/patches/03_fix_ltsp-fading.patch @@ -0,0 +1,14 @@ +diff -Nur gnome-screensaver-2.19.6/src/gs-fade.c gnome-screensaver-2.19.6.new/src/gs-fade.c +--- gnome-screensaver-2.19.6/src/gs-fade.c 2007-07-09 23:32:35.000000000 +0200 ++++ gnome-screensaver-2.19.6.new/src/gs-fade.c 2007-08-21 11:23:51.000000000 +0200 +@@ -233,6 +233,10 @@ + int minor; + gboolean res; + ++ if (g_getenv("LTSP_CLIENT")) { ++ return FADE_TYPE_NONE; /* We're on an LTSP Client, bad idea to fade at all */ ++ } ++ + res = XF86VidModeQueryExtension (GDK_DISPLAY (), &event, &error); + if (! res) { + return FADE_TYPE_NONE; /* display doesn't have the extension. */ --- gnome-screensaver-2.24.0.orig/debian/patches/02_keep_unlock_raised.patch +++ gnome-screensaver-2.24.0/debian/patches/02_keep_unlock_raised.patch @@ -0,0 +1,20 @@ +diff -Nur gnome-screensaver-2.18.0/src/gs-window-x11.c gnome-screensaver-2.18.0.new/src/gs-window-x11.c +--- gnome-screensaver-2.18.0/src/gs-window-x11.c 2007-02-23 05:39:09.000000000 +0100 ++++ gnome-screensaver-2.18.0.new/src/gs-window-x11.c 2007-04-02 12:46:22.000000000 +0200 +@@ -655,8 +655,15 @@ + case ConfigureNotify: + { + XConfigureEvent *xce = &ev->xconfigure; ++ gboolean our_window; ++ gboolean we_are_showing_lock_box; ++ gboolean own_raise_event; ++ ++ our_window = x11_window_is_ours (xce->window); ++ we_are_showing_lock_box = window->priv->lock_box; ++ own_raise_event = GDK_WINDOW_XID (GTK_WIDGET (window)->window) == xce->window; + +- if (! x11_window_is_ours (xce->window)) { ++ if (!our_window || (we_are_showing_lock_box && !own_raise_event)) { + gs_window_raise (window); + } else { + gs_debug ("not raising our windows"); --- gnome-screensaver-2.24.0.orig/debian/patches/05_locking_for_compiz.patch +++ gnome-screensaver-2.24.0/debian/patches/05_locking_for_compiz.patch @@ -0,0 +1,12 @@ +diff -Nur gnome-screensaver-2.20.0/src/gs-manager.c gnome-screensaver-2.20.0.new/src/gs-manager.c +--- gnome-screensaver-2.20.0/src/gs-manager.c 2007-10-18 12:55:10.000000000 -0700 ++++ gnome-screensaver-2.20.0.new/src/gs-manager.c 2007-10-18 12:56:11.000000000 -0700 +@@ -1050,7 +1050,7 @@ + } + + /* Move keyboard and mouse grabs so dialog can be used */ +- gs_grab_move_to_window (manager->priv->grab, ++ gs_grab_grab_window (manager->priv->grab, + gs_window_get_gdk_window (window), + gs_window_get_screen (window), + FALSE);