* Merge with Debian testing, remaining Ubuntu changes: - debian/control: + Add Vcs-Bzr link + Add/Update replaces with Ubuntu versions + Update package descriptions to list Ubuntu screensavers - debian/rules: + Use /usr/share/backgrounds as image directory + Add translation domain to .desktop files - debian/source_xscreensaver.py: + Add apport hook - debian/split-hacks.config: + Use different set of default hacks than Debian - debian/xscreensaver.dirs + Install /usr/share/backgrounds. By default, settings search in /usr/share/backgrounds and without it, it displays an error - debian/patches/53_XScreenSaver.ad.in.patch: + Use Ubuntu branding - debian/patches/60_sequential_glslideshow.patch: + Allow going through images sequentially rather than just at random in the GLSlideshow hack. * debian/changelog: really clean up changelog, some entries were still out of place. * Build-dep on libjpeg-dev instead of libjpeg62-dev (Closes: #647110) [ Tormod Volden ] * New upstream version 5.15 - New hacks: hilbert, companioncube and tronbit - Turned on LC_CTYPE on Linux (LP: #671923) * debian/rules: Add build-arch and build-indep targets [ Jose Luis Rivas ] * postrm: Kill xscreensaver after removal (Closes: #558024) * Bump Standards-Version to 3.9.2 (no changes needed) * Non-maintainer upload by the security team. * Fix local screen lock bypass vulnerability (closes: #539699). [ 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. * Drop xli | xloadimage recommends to universe. Both are in universe, and xli is orphaned in Debian. * Restore the fix from 5.05-1ubuntu2, which was lost in the latest merge: * xscreensaver-gl and xscreensaver-gl-extras Recommend xscreensaver | gnome-screensaver rather than merely xscreensaver, so that germinate won't pull xscreensaver into the desktop (LP: #242495). * Upgrade upstream version * debian/control: Remove suggest xdaliclock as it is no longer included * Remove 10_jwz-screensaver-randr-patch-3.patch as it has been merged upstream. * Add 24_hacks_xsublim_enable.patch as it seems that xsublim was dropped from the build files. There is nothing in the Changelog about it so I believe it was accidental. * Updating the .desktop files from the XML files using gnome-screensaver's utility to do so. Lots of text updates. Also: * Added: abstractile.desktop * Added: cwaves.desktop * Added: m6502.desktop * Added: skytentacles.desktop * Removed: xteevee.desktop * xscreensaver-gl-extra.files: Added skytentacles * xscreensaver-data-extra.files: Added abstractile, cwaves and m6502 * xscreensaver-data.files: Remove partial abstractile, m6502 and cwaves [ 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 * NMU. * should not kill running xscreensavers (Close: #334193)