Last commit made on 2011-03-08
Get this branch:
git clone -b ubuntu/maverick-proposed https://git.launchpad.net/ubuntu/+source/gnome-screensaver
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

91b9bff... by Marc Deslauriers on 2011-03-04

Import patches-unapplied version 2.30.0-1ubuntu1.1 to ubuntu/maverick-proposed

Imported using git-ubuntu import.

Changelog parent: 89639ee8ff76df4dbad1f87b8122c4ede7a3bada

New changelog entries:
  * Reliability fixes:
    - debian/org.gnome.Screensaver.service: don't start as a daemon if
      started by dbus.
    - debian/17_dont_start_twice.patch: make sure we cannot start twice by
      bailing out if we cannot become the primary owner of the bus name.
      (LP: #556255)
    - debian/18_dont_use_sessionmanager_name_owners.patch: improve
      reliability if gnome-session is started after the screensaver or if
      gnome-session is restarted.

89639ee... by Robert Ancell on 2010-06-07

Import patches-unapplied version 2.30.0-1ubuntu1 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: 2ea3cde674eca9ae1b90c28f42895a7aec81aec2

New changelog entries:
  * Merge from Debian unstable, remaining Ubuntu changes:
  * debian/control:
    - Don't build-depend on intltool
    - Bump build-dependency on libdbus-glib-1-dev
    - Add build-depend on libxtst-dev
    - Add Vcs-Bzr tag
    - Don't depend on gnome-session; it doesn't appear to actually be
      required, xubuntu is doing fine without it
    - Let xfce4-power-manager be an alternative to gnome-power-manager
    - Move rss-glx from recommends to suggests
    - Recommend xscreensaver-data and screensaver-gl
    - Suggest xscreensaver-data-extra and screensaver-gl-extra
  * debian/rules:
    - Don't use debian/po-up, translation updates will be provided via
    - don't ship the popsquares screensaver, this is already in
  * debian/gconf-defaults:
    - Dropped
  * debian/gnome-screensaver-command.1:
  * debian/gnome-screensaver-preferences.1:
  * debian/gnome-screensaver.1:
  * debian/gnome-screensaver.manpages:
    - Add man pages
  * debian/gnome-screensaver.docs:
    - Don't install docs
  * debian/gnome-screensaver.install
    - Install apport hook
    - Install D-Bus service
    - Don't install Debian specific screensaver
  * debian/org.gnome.ScreenSaver.service:
    - Provide a D-Bus service file so gnome-screensaver gets respawned if it
      dies. This ensures screen locking will work more reliably.
  * debian/source_gnome-screensaver.py
    - Apport hook
  * debian/patches/02_keep_unlock_raised.patch:
    - ?
  * debian/patches/03_fix_ltsp-fading.patch:
    - Don't fade on LTSP
  * debian/patches/04_force_blank_only_on_ltsp.patch:
    - Disable graphics intensive modes for LTSP
  * debian/patches/05_locking_for_compiz.patch:
    - Stop Compiz keyboard shortcuts working when screen is locked
  * debian/patches/10_legacy_scrsvr_inhibit.patch:
    - Re-write to not use XTest to simulate fake key-presses in order
      to reset the IDLETIME counter, as this appears to be problematic.
      Use XResetScreenSaver() to do this instead. Thanks to Reinhard
      Tartler for the hint
  * debian/patches/11_autostart_delay.patch:
    - Delay autostarting the screensaver for 5 seconds after the start
      of the session
  * debian/patches/12_use_dbus_service.patch:
    - gnome-screensaver-command should use D-Bus to start gnome-screensaver
      if it is not running.
  * debian/patches/13_nvidia_gamma_fade_fallback.patch:
    - Fall back to XF86VM gamma fade if XRANDR gamma fade is not supported
  * debian/patches/14_no_fade_on_user_switch.patch:
    - Disable fade on locking to work around LP: #546578 and prevent
      the screen remaining blank after user switching. The screensaver
      will still fade-in on idle though
  * debian/patches/15_dont_crash_on_no_fade.patch:
    - Don't crash on systems that don't support XF86VM or XRANDR gamma fade,
      by testing if fade is supported on a particular screen before
      calling the fade_setup and fade_finish virtual functions
  * debian/patches/16_dont_crash_in_kvm.patch:
    - Don't crash when the XF86VM extension doesn't allow the gamma
      to be set
  * debian/watch:
    - Watch for unstable versions to get unstable version

2ea3cde... by Sebastian Dröge on 2010-05-04

Import patches-unapplied version 2.30.0-1 to debian/squeeze

Imported using git-ubuntu import.

Changelog parent: 6aa54ac4724b84ee80bcb594f8332dd532320e08

New changelog entries:
  * New upstream stable release:
    + debian/control.in:
      - Update build dependencies.

6aa54ac... by Emilio Pozuelo Monfort <email address hidden> on 2010-02-15

Import patches-unapplied version 2.28.3-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 172120671882e1916368239c5034d009845a7f9c

New changelog entries:
  * New upstream bugfix release.
    - CVE-2010-0422, handle monitor hotplugging more securely.
    - Urgency high for this and the previous security updates.

1721206... by Emilio Pozuelo Monfort <email address hidden> on 2010-02-10

Import patches-unapplied version 2.28.2-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 013eac86311f62205f059dfdb712c7cdbb3ed3c1

New changelog entries:
  * New upstream bugfix release.
    - CVE-2010-0414, handle monitor removal more securely. Closes: #569084.
    - debian/patches/01_session_inhibitors.patch:
      + Removed, fixed upstream.
  * Standards-Version is 3.8.4, no changes needed.

013eac8... by Josselin Mouette <email address hidden> on 2010-01-04

Import patches-unapplied version 2.28.0-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: fc21ef09e68506b8034dccf6aa0de27d8a1a6fac

New changelog entries:
  * Move the autostart file to /usr/share/gnome/autostart.
  * Remove the old one in the postinst.
  * Removed libxxf86misc-dev build-dependency. This extension has been
    removed in Xorg 7.4. Closes: #559689.
  * Add quilt support.
  * 01_session_inhibitors.patch: stolen from upstream git. Fix a leak of
    session inhibitors. Closes: #560049.

fc21ef0... by Emilio Pozuelo Monfort <email address hidden> on 2009-09-24

Import patches-unapplied version 2.28.0-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c435036913ef2cef7978aa8d8baa2964c0cc1107

New changelog entries:
  * New upstream release.
    - Remove libglade2-dev build dependency, no longer needed.
  * Standards-Version is 3.8.3, no changes needed.

c435036... by Josselin Mouette <email address hidden> on 2009-07-11

Import patches-unapplied version 2.26.1-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: af7a74e3ee1e7f8b536f5e978f3c38e60a3b3d90

New changelog entries:
  * Depend on gnome-session 2.26, it is useless without it.
    Closes: #536381.

af7a74e... by Josselin Mouette <email address hidden> on 2009-06-26

Import patches-unapplied version 2.26.1-1 to debian/squeeze

Imported using git-ubuntu import.

Changelog parent: d4ee592ad8988a3b2440a4ca7c022ba4a8fd794c

New changelog entries:
  [ Emilio Pozuelo Monfort ]
  * New upstream release.
  * debian/watch: don't uupdate.
  * debian/copyright: updated.
  * debian/patches/01_manpages_whatis.patch: removed, fixed upstream.
  * debian/rules: remove simple-patchsys.mk
  * Use unstable for Vcs-*
  * Standards-Version is 3.8.2, no changes needed.
  * debian/rules: install gconf-defaults file with default priority.
  * debian/debian-floaters.desktop:
    - Remove deprecated Encoding key.
    - Add trailing semicolon to Categories.
    - Add full path to the Exec command, as floaters is not in PATH.
    - Add OnlyShowIn: GNOME.
  * Add magic to make debian-floaters.desktop translatable. Thanks
    Josselin Mouette for the explanations.
    - Spanish translation by Francisco Javier Cuadrado.
    - Swedish translation by Martin Bagge.
    - German translation by Helge Kreutzmann. Closes: #533646.
    - Portuguese translation by Américo Monteiro.
  [ Josselin Mouette ]
  * Add French translation for the desktop file.
  * Enable building of docbook documentation.
  * rules, gnome-screensaver.docs: install it in a non-Redhatish place.
  * A bit of cleanup in build-dependencies.

d4ee592... by Josselin Mouette <email address hidden> on 2009-04-07

Import patches-unapplied version 2.24.1-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: e706a45df44ad8c824edaea7fb90cd27999d6784

New changelog entries:
  * Upload to unstable.
  * Standards version is 3.8.1.