Last commit made on 2010-04-14
Get this branch:
git clone -b ubuntu/lucid https://git.launchpad.net/ubuntu/+source/xscreensaver
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

a781ff3... by Harald Sitter on 2010-04-14

Import patches-unapplied version 5.10-3ubuntu4 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 05fcdf2a23419758eddde83a42b0818cb5996edb

New changelog entries:
  * Import parts of debian's current .preinst file to get rid of the
    previously removed autostart desktop file.

05fcdf2... by Alessandro Ghersi on 2010-04-10

Import patches-unapplied version 5.10-3ubuntu3 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 083a1e1891e95f36e22b2a561bb145d0d858834e

New changelog entries:
  * Removing autostart from xdg, is now on /usr/share so user can copy it if
    wants autostart (LP: #554069)

083a1e1... by Steve Langasek on 2010-04-06

Import patches-unapplied version 5.10-3ubuntu2 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: b3c971038320404384931daa63bdb0c1f944fc03

New changelog entries:
  * Reintroduce changes lost from version 5.08-0ubuntu5:
  [ Julien Lavergne ]
  * Add debian/xscreensaver.dirs with /usr/share/backgrounds. By default,
    settings search in /usr/share/backgrounds and without it, it displays an
    error (LP: #129769)

b3c9710... by Robert Ancell on 2009-11-30

Import patches-unapplied version 5.10-3ubuntu1 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 46cb70a9bb16ee4fdbcae345580b453bd6b5afb7

New changelog entries:
  * Merge with Debian unstable, remaining changes: (LP: #489062)
    - debian/control: add Build-Depends on ubuntu-artwork
    - debian/rules: use /usr/share/backgrounds
    - debian/control: Move xli | xloadimage recommends to suggests
    - debian/split-hacks.config: Use different set of default hacks to Debian
    - debian/source_xscreensaver.py: Add apport hook
    - debian/patches/53_XScreenSaver.ad.in.patch: Use Ubuntu branding

46cb70a... by Tormod Volden on 2009-10-12

Import patches-unapplied version 5.10-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 430267365720db06f0553bc417f7b7508194a582

New changelog entries:
  * Move sonar to xscreensaver-gl, it got GL-ified (Closes: #550002)
  * Remove Xsession hook, could not be disabled (Closes: #550042)
  * Add desktop file to /etc/xdg/autostart, to disable it see
    http://standards.freedesktop.org/autostart-spec/ (Closes: #357297)
  * Move 20_hack_flurry_man_name to 11_upstream_flurry_man_name
  * debian/split-config.sh, debian/rules, etc: Auto-generate the
    package.install files to make one single dh_install{,man} call
    since this is so much more efficent.

4302673... by Jose-Luis Rivas on 2009-09-25

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

Imported using git-ubuntu import.

Changelog parent: e4f88d3e5330708d2b8243ef727cc4b570b7f862

New changelog entries:
  * Updated my email on debian/copyright.
  * Added README.hacking to debian/xscreensaver.docs (Closes: #544352).
  * Included a hook for Xsession thanks to Y Giridhar Appaji Nag
  <email address hidden> (Closes: #357297).
  * Fixed the changelog.

e4f88d3... by Jose-Luis Rivas on 2009-09-24

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

Imported using git-ubuntu import.

Changelog parent: 58b441b9bda9ba1a0e640b2a698a9ac9ffb8ab67

New changelog entries:
  [ Tormod Volden ]
  [Tormod Volden]
  * New Upstream Version
  * Drop patch applied upstream:
    - 12_upstream_fix_typo_in_de.po.patch
  * Removed hyperball and hypercube hacks, retired upstream
  * debian/rules: Drop workaround for missing autoconf 2.64 support,
    fixed upstream
  [ Jose Luis Rivas]
  * Updated Standards-Version to 3.8.3 wo/ any changes needed.
  * Created debian/README.source.
  * Added patch 20_hack_flurry_man_name for NAME section of manpage for flurry
  * Changed my email from <email address hidden> to <email address hidden> on
    Maintainer field.
  * Acknoledging nmu for 5.07.
  * New Upstream Version
    - Fixed intermittent failure in xscreensaver-command
      Thanks to contribution by James Vega (Closes: 486603)
    - Fixed another potential RANDR crash
  * Drop patches applied upstream:
    - 11_upstream_phosphor_segfault_win_size.patch
    - 63_upstream_blinkbox-man.patch
    - 64_upstream_topblock-man.patch
    - 65_upstream_eruption-man.patch
    - 66_upstream_truchet-man.patch
    - 67_upstream_metaballs-man.patch
    - 70_upstream_fix_local_screenlock_bypass.patch
  * debian/rules: Add workaround for missing autoconf 2.64 support
  * Do not ship juggle any longer (merged with juggler3d)
  * Ship new hacks: rubikblocks and surfaces
  * 80_Makefile_in-clean-fix.patch: Workaround for make distclean
    failure in some situations, probably autoconf 2.64 issue

58b441b... by Michael Gilbert on 2009-08-17

Import patches-unapplied version 5.07-1+nmu1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: dbd5476beaeb401ce77294ef6edc7d35dcd19665

New changelog entries:
  * Non-maintainer upload by the security team.
  * Fix local screen lock bypass vulnerability (closes: #539699).

dbd5476... by Jose-Luis Rivas on 2008-10-31

Import patches-unapplied version 5.07-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: c1cce5f4931be8860d68e6021ce8341e7be85687

New changelog entries:
  [ Tormod Volden ]
  * New Upstream Version
  * driver/XScreensaver.ad.in:
    + Use ISO time/date format in password dialog
    + Use url as default text method
    + remove dnalogo and flurry which are not installed
  * remove xsublim hack since upstream no more installs it
  * add desktop file comment to cubicgrid, hypnowheel and lcdscrub
  * debian/patches: renamed, commented, refreshed patches and series
  * debian/control: use Suggests xscreensaver instead of Enhances
    for -data and -gl packages
  * Fixed Exec and TryExec entries in desktop files.
  * Fixed manpages warnings and bad-formatting.
  * Fixed Vcs-Browser URI.
  [ Jose Luis Rivas ]
  * New upstream release
  * debian/patches:
   + delete patch for xinerama, is now merged upstream
   + add patch for hacks/Makefile.in
  [ Tormod Volden ]
  * debian/control: let the hacks packages "enhance" xscreensaver
    and gnome-screensaver since they can be used independently
  * use upstream xscreensaver-properties.desktop instead of our own
  * move man pages to section 6x in a consistent way
  * ship the lcdscrub man page
  * factor out common stuff from hacks desktop files into one stub
    file for easier mass modification
  * add OnlyShowIn=GNOME to desktop files (fixes lintian warnings)
  * add -randomize to truchet and xlyap desktop files
  * add desktop file for m6502, abstractile and cwaves
  * fixed up names in several desktop files
  * use yelp to display man pages in Preferences dialog if available,
    and do the right thing in a terminal window if not

c1cce5f... by Jose-Luis Rivas on 2008-07-15

Import patches-unapplied version 5.05-3 to debian/lenny

Imported using git-ubuntu import.