diff -u xscreensaver-5.26/debian/changelog xscreensaver-5.26/debian/changelog --- xscreensaver-5.26/debian/changelog +++ xscreensaver-5.26/debian/changelog @@ -1,3 +1,32 @@ +xscreensaver (5.26-1ubuntu1) trusty; urgency=low + + * Merge from Debian unstable. (LP: #1283459) Remaining changes: + - debian/control: + + Change Vcs-* links to the ~ubuntu-desktop team bzr repository. + + Update Replaces: with Ubuntu versions. + + Update package descriptions to list Ubuntu screensaver. + - 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/patch/90_ubuntu-branding.patch: + + Use Ubuntu branding. + + Use this only-ubuntu patch to avoid patching a Debian patch, as + previusly did. + - debian/patches/60_sequential_glslideshow.patch: + + Allow going through images sequentially rather than just at random in + the GLSlideshow hack. + + Add DEP-3 header. + + Refreshed. + + -- Mattia Rizzolo Tue, 25 Mar 2014 19:28:39 +0100 + xscreensaver (5.26-1) unstable; urgency=low * New upstream release 5.26, changes since 5.23: @@ -91,6 +120,31 @@ -- Tormod Volden Tue, 01 Oct 2013 22:00:48 +0200 +xscreensaver (5.15-3ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining 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. + + -- Adam Conrad Wed, 17 Jul 2013 13:47:29 +0100 + xscreensaver (5.15-3) unstable; urgency=low [ Jose Luis Rivas ] @@ -104,6 +158,39 @@ -- Tormod Volden Sat, 30 Jun 2012 17:24:51 +0200 +xscreensaver (5.15-2ubuntu2) saucy; urgency=low + + * No-change rebuild in universe to get translations back (LP: #1177324) + + -- Adam Conrad Tue, 07 May 2013 06:14:10 -0600 + +xscreensaver (5.15-2ubuntu1) precise; urgency=low + + * 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. + + -- Mathieu Trudel-Lapierre Wed, 21 Dec 2011 11:27:37 -0500 + xscreensaver (5.15-2) unstable; urgency=low * Build-dep on libjpeg-dev instead of libjpeg62-dev (Closes: #647110) @@ -123,6 +210,38 @@ -- Tormod Volden Thu, 06 Oct 2011 23:12:30 +0200 +xscreensaver (5.14-1ubuntu1) oneiric; urgency=low + + * Merge with Debian unstable, remaining Ubuntu changes (LP: #795251): + - 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/patches/61_fix_tube_memleak.patch: dropped, applied upstream. + * debian/xscreensaver.desktop: drop file left over from previous merge. + * debian/control: drop Build-Depends on ubuntu-artwork. This was only pulled + in to create /usr/share/backgrounds to use as a location for screensavers + that look for images. + * debian/changelog: reinstate old changelog entries that were dropped in + previous commits. + + -- Mathieu Trudel-Lapierre Thu, 09 Jun 2011 22:10:56 -0400 + xscreensaver (5.14-1) unstable; urgency=low [ Tormod Volden ] @@ -136,6 +255,30 @@ -- Jose Luis Rivas Sun, 22 May 2011 23:12:59 -0430 +xscreensaver (5.13-1ubuntu1) oneiric; urgency=low + + * Merge with Debian unstable, remaining Ubuntu changes: + * debian/control: + - Build-Depend on ubuntu-artwork + - Add Vcs-Bzr link + - Move xli | xloadimage xscreensaver recommends to suggests + - 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 + + -- Jeremy Bicha Wed, 18 May 2011 15:39:48 +0200 + xscreensaver (5.13-1) unstable; urgency=low * New upstream version 5.13 @@ -156,6 +299,80 @@ -- Tormod Volden Fri, 22 Apr 2011 23:07:13 +0200 +xscreensaver (5.12-0ubuntu4) natty; urgency=low + + [ Robert Ancell ] + * Clean debian/patches + * debian/control: + - Use standards version 3.9.1 + + [ Christopher James Halse Rogers ] + * debian/patches/61_fix_tube_memleak.patch: + - Fix a large per-frame memleak in (at least) gltext. + + -- Robert Ancell Wed, 09 Mar 2011 11:53:37 +1100 + +xscreensaver (5.12-0ubuntu3) natty; urgency=low + + * Restore changes from 5.11-1ubuntu2 that disappeared with 5.12-0ubuntu1: + - debian/patches/50_driver_screensaver-properties-desktop.patch: dropped; + it's not really a vectorized svg and it breaks xfce4-settings-manager; + startup notification doesn't work as the dialog never removes itself. + lp: #603222 + - debian/patches/series: refreshed. + + -- Lionel Le Folgoc Fri, 21 Jan 2011 19:24:50 +0100 + +xscreensaver (5.12-0ubuntu2) natty; urgency=low + + * debian/patches/60_sequential_glslideshow.patch, + debian/patches/series: fix LP: #671514, enable xscreensaver-getimage-file + to run sequentially + + -- Dustin Kirkland Thu, 25 Nov 2010 16:39:27 -0600 + +xscreensaver (5.12-0ubuntu1) natty; urgency=low + + * New upstream release + + -- Robert Ancell Wed, 17 Nov 2010 15:40:52 +1100 + +xscreensaver (5.11-1ubuntu2) maverick; urgency=low + + * debian/patches/50_driver_screensaver-properties-desktop.patch: dropped; + it's not really a vectorized svg and it breaks xfce4-settings-manager; + startup notification doesn't work as the dialog never removes itself. + lp: #603222 + * debian/patches/series: refreshed. + + -- Lionel Le Folgoc Sun, 12 Sep 2010 11:42:52 +0200 + +xscreensaver (5.11-1ubuntu1) maverick; urgency=low + + * Merge with Debian unstable, remaining Ubuntu changes: + * debian/control: + - Build-Depend on ubuntu-artwork + - Add Vcs-Bzr link + - Move xli | xloadimage xscreensaver recommends to suggests + - 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 to 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 + - Updated new login command (newLoginCommand) to work with new GDM by + truncating deprecated arguments to gdmflexiserver. + + -- Robert Ancell Tue, 15 Jun 2010 10:42:54 +1000 + xscreensaver (5.11-1) unstable; urgency=low * New upstream version @@ -200,6 +417,43 @@ -- Jose Luis Rivas Sun, 08 Nov 2009 09:27:00 -0430 +xscreensaver (5.10-3ubuntu4) lucid; urgency=low + + * Import parts of debian's current .preinst file to get rid of the + previously removed autostart desktop file. + + -- Harald Sitter Thu, 15 Apr 2010 00:46:29 +0200 + +xscreensaver (5.10-3ubuntu3) lucid; urgency=low + + * Removing autostart from xdg, is now on /usr/share so user can copy it if + wants autostart (LP: #554069) + + -- Alessandro Ghersi Sat, 10 Apr 2010 22:28:57 +0200 + +xscreensaver (5.10-3ubuntu2) lucid; urgency=low + + * 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) + + -- Steve Langasek Tue, 06 Apr 2010 08:10:22 +0000 + +xscreensaver (5.10-3ubuntu1) lucid; urgency=low + + * 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 + + -- Robert Ancell Mon, 30 Nov 2009 13:33:13 +1100 + xscreensaver (5.10-3) unstable; urgency=low * Move sonar to xscreensaver-gl, it got GL-ified (Closes: #550002) @@ -304,6 +558,72 @@ -- Michael Gilbert Mon, 17 Aug 2009 00:43:39 -0400 +xscreensaver (5.08-0ubuntu4) karmic; urgency=low + + * Install fewer screensavers by default. (LP: #385850) + - Move all screensavers except fiberlamp, fuzzyflakes, + antspotlight, glblur, glcells, glmatrix, glschool, + glslideshow, gltext, and hypertoru to the extra + packages. + * Add files split-hacks.sh and split-hacks.config in /debian + inorder to simplfy moving screensavers between packages. Patch + from Debian (Thanks to Tormod Volden): + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=539937 + * debian/control: + - Make xscreensaver-data and xscreensaver-data-extra replace each other + as files have moved between the two packages. The same is done for + xscreensaver-gl and xscreensaver-gl-extra + + -- Andrew Starr-Bochicchio Wed, 09 Sep 2009 10:59:31 +0200 + +xscreensaver (5.08-0ubuntu3) karmic; urgency=low + + * Added an apport package hook (LP: #398007) + + -- Brian Murray Mon, 13 Jul 2009 10:22:54 -0700 + +xscreensaver (5.08-0ubuntu2) karmic; urgency=low + + * Included patch for Phosphor segfault (LP: #357556) + + -- Timothy Pearson Mon, 29 June 2009 12:07:00 -0600 + +xscreensaver (5.08-0ubuntu1) karmic; urgency=low + + * New upstream release (LP: #392374) + - New hack, `photopile'. + - Rewrote `sonar' and `jigsaw' as OpenGL programs. + - Minor tweaks to `maze', `m6502', `hypnowheel', and `timetunnel'. + - Savers that load images now obey EXIF rotation tags. + - Arrgh, more RANDR noise! Fixes this time for rotated screens, and for + systems where RANDR lies and says the screen size is 0x0. + - When the password dialog has timed out or been cancelled, don't pop it + right back up a second time. + - Password timeouts/cancels don't count as "failed logins". + - Retired some of the older, less interesting savers: + say goodbye to `bubbles', `critical', `flag', `forest', + `glforestfire', `lmorph', `laser', `lightning', `lisa', + `lissie', `rotor', `sphere', `spiral', `t3d', `vines', + `whirlygig', and `worm'. + - Merged `munch' and `mismunch'. + - Updated `webcollage' to use twitpics.com as well. + * debian/patches/20_hacks_Makefile.patch: + - Refreshed + * debian/patches/24_hacks_xsublim_enable.patch: + - Refreshed + * debian/patches/25_xsublim_missing_man_page.patch + - Put back removed man page + * debian/patches/53_XScreenSaver.ad.in.patch: + - Refreshed + * debian/screensavers-desktop-files/*: + debian/xscreensaver.files: + debian/xscreensaver-data-extra.files: + debian/xscreensaver-gl-extra.files: + - Updated for new/removed/changed screensavers + * debian/control: Added Bzr link + + -- Robert Ancell Mon, 29 Jun 2009 09:30:05 +0200 + xscreensaver (5.07-1) unstable; urgency=low [ Tormod Volden ] @@ -323,6 +643,46 @@ -- Jose Luis Rivas Fri, 31 Oct 2008 18:54:17 -0430 +xscreensaver (5.07-0ubuntu3) intrepid; urgency=low + + * Drop xli | xloadimage recommends to universe. Both are in universe, and + xli is orphaned in Debian. + + -- Martin Pitt Thu, 23 Oct 2008 12:17:08 +0200 + +xscreensaver (5.07-0ubuntu2) intrepid; urgency=low + + * 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). + + -- Steve Langasek Wed, 08 Oct 2008 23:07:41 +0000 + +xscreensaver (5.07-0ubuntu1) intrepid; urgency=low + + * 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 + + -- Ted Gould Thu, 28 Aug 2008 16:15:25 -0500 + xscreensaver (5.06-1) unstable; urgency=low [ Jose Luis Rivas ] @@ -348,6 +708,21 @@ -- Jose Luis Rivas Tue, 22 Jul 2008 23:33:51 -0430 +xscreensaver (5.05-3ubuntu1) intrepid; urgency=low + + * Merge in changes from Debian packaging (in Changelog below) + * debian/control: Reset build depends to be easier to merge with + Debian in the future. + * debian/xscreensaver-gl.files: Reorder files to make merges with + Debian easier in the future. + * Removing patch 70_demo_gtk_stfu_removal.patch as the work it was doing + is now being done by the patch 10_jwz-xscreensaver-randr-patch-3.patch + * Removing patch 90_ubuntu-xscreensaver-desktop.patch as the work it was + doing is now being done by the patch + 10_jwz-xscreensaver-randr-patch-3.patch + + -- Ted Gould Thu, 28 Aug 2008 10:50:54 -0500 + xscreensaver (5.05-3) unstable; urgency=low [ Tormod Volden ] @@ -390,6 +765,29 @@ -- Jose Luis Rivas Fri, 11 Apr 2008 11:56:14 -0430 +xscreensaver (5.05-1ubuntu2) intrepid; urgency=low + + * 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). + + -- Colin Watson Fri, 04 Jul 2008 17:18:38 +0100 + +xscreensaver (5.05-1ubuntu1) intrepid; urgency=low + + * Added 70_demo_gtk_stfu_removal.patch to remove some more cases where + the STFU macro is used such that when the #defines it's used on change + the compile breaks. Bad coding style. + * Removing 82_ubuntu-texturl-fridge.patch in favor of updating the + 53_XScreenSaver.ad.in.patch to include the Ubuntu branding instead + of the Debian branding. This should make merges easier as long as + we use something smart like Bazaar. Also the Debian version has lots + of good changes like making it work with /etc/alternates which we + didn't have. + * Removing 54_driver_demogtk.patch as it was merged upstream. + + -- Ted Gould Tue, 17 Jun 2008 09:41:41 -0700 + xscreensaver (5.05-1) unstable; urgency=low * New upstream release. @@ -427,6 +825,31 @@ -- Jose Luis Rivas Tue, 11 Mar 2008 22:45:00 -0430 +xscreensaver (5.04-4ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #201626) + - debian/control: add Build-Depends on ubuntu-artwork + - debian/rules: use /usr/share/backgrounds + - 82_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss + - 91_ubuntu-no-pam-conf: don't ship pam.conf + - 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop + file for what it is to not confuse it with gnome-screensaver + - debian/rules: don't hide the xscreensaver desktop icon if the + user insists on installing xscreensaver (LP: #86416) + - 54_drivers_demogtk.patch: Patching a compile failure with + GTK+ in Hardy + - 28_rotate.patch: Add in the gdk pixbuf function to rotate JPEGs and + TIFFs so that they're the right direction + - debian/control: Increasing the GTK+ version to 2.12 for the patch + 28_rotate.patch + - glslideshow.desktop: Changing so that it shows only one image, one + time and no extra black on the edges. + * Fixed upstream: + - install xscreensaver-properties.desktop to right place (LP: #201481) + - remove planetary-gears screensaver (LP: #196360) + + -- Tormod Volden Thu, 06 Mar 2008 11:01:03 +0100 + xscreensaver (5.04-4) unstable; urgency=low * debian/control: Add replaces/conflicts to fix upgrades (Closes: #468899) @@ -461,6 +884,43 @@ -- Jose Luis Rivas Fri, 29 Feb 2008 18:53:35 -0430 +xscreensaver (5.04-2ubuntu2) hardy; urgency=low + + * 54_drivers_demogtk.patch: Patching a compile failure with + GTK+ in Hardy + * 28_rotate.patch: Add in the gdk pixbuf function to rotate JPEGs and + TIFFs so that they're the right direction + * debian/control: Increasing the GTK+ version to 2.12 for the patch + 28_rotate.patch + * glslideshow.desktop: Changing so that it shows only one image, one + time and no extra black on the edges. + + -- Ted Gould Wed, 23 Jan 2008 19:00:20 +0000 + +xscreensaver (5.04-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #177126) + - Split xscreensaver into xscreensaver, xscreensaver-data + (hacks we ship), xscreensaver-data-extra (hacks in universe). + Split out GL hacks for universe to xscreensaver-gl-extra + - create and install .desktop files for gnome-screensaver + - debian/control: add Build-Depends on ubuntu-artwork + - debian/rules: use /usr/share/backgrounds + - 60_ubuntu-add-ant-hack.patch: bring back ant hack + - 62_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss + - 65_ubuntu-no-pam-conf: don't ship pam.conf + * 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop + file for what it is to not confuse it with gnome-screensaver + * debian/control: warn about gnome-screensaver conflict in + xscreensaver package description (LP: #74727) + * debian/rules: don't hide the xscreensaver desktop icon if the + user insists on installing xscreensaver (LP: #86416) + * 60_ubuntu-add-ant-hack.patch refreshed to include "ant" in + application defaults (LP: #160669) + * Fixed upstream: glhanoi assertion failure (LP: #71795) + + -- Tormod Volden Tue, 18 Dec 2007 21:40:55 +0100 + xscreensaver (5.04-2) unstable; urgency=low [ Tormod Volden ] @@ -495,6 +955,23 @@ -- Jose Luis Rivas Sun, 09 Dec 2007 20:37:38 -0430 +xscreensaver (5.04-1ubuntu2) hardy; urgency=low + + * Fix build failure with new glib2.0. + + -- Matthias Klose Fri, 01 Feb 2008 00:25:15 +0100 + +xscreensaver (5.04-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - split xscreensaver into xscreensaver, xscreensaver-data (hacks we ship), + xscreensaver-data-extra (hacks in universe). split out gl hacks for + universe to xscreensaver-gl-extra + - use fridge for rss screensavers + - create and install .desktop files for gnome-screensaver + + -- Oliver Grawert Thu, 06 Dec 2007 09:53:12 +0000 + xscreensaver (5.04-1) unstable; urgency=low * New upstream release @@ -595,6 +1072,29 @@ -- Jose Luis Rivas Fri, 13 Jul 2007 17:15:43 -0400 +xscreensaver (4.24-5ubuntu3) gutsy; urgency=low + + * SECURITY UPDATE: password bypass when using network authentication. + * driver/lock.c: upstream fixes applied inline. + * References + CVE-2007-1859 + + -- Kees Cook Mon, 11 Jun 2007 12:58:25 -0700 + +xscreensaver (4.24-5ubuntu2) feisty; urgency=low + + * debian/control: + -add libjpeg-progs, netpbm to xscreensaver-data-extras + Depends. WebCollage needs them (LP: #61775) + + -- Timo Aaltonen Sat, 3 Feb 2007 00:33:40 +0200 + +xscreensaver (4.24-5ubuntu1) feisty; urgency=low + + * Merge from debian unstable. + + -- Oliver Grawert Mon, 30 Oct 2006 13:55:08 +0000 + xscreensaver (4.24-5) unstable; urgency=low * remove /usr/doc/xscreensaver link to finish /usr/doc -> @@ -602,6 +1102,19 @@ -- Ralf Hildebrandt Sat, 29 Jul 2006 23:00:43 +0100 +xscreensaver (4.24-4ubuntu2) edgy; urgency=low + + * fix location of the gnome-screensaver .desktop files, + they need to be in /usr/share/applications/screensavers now + + -- Oliver Grawert Fri, 21 Jul 2006 16:33:39 +0200 + +xscreensaver (4.24-4ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Oliver Grawert Fri, 30 Jun 2006 16:27:21 +0100 + xscreensaver (4.24-4) unstable; urgency=low * we may be building in an environment (e.g. Debian buildd chroot) @@ -638,6 +1151,78 @@ -- Ralf Hildebrandt Sun, 26 Mar 2006 11:00:43 +0100 +xscreensaver (4.23-4ubuntu8) dapper; urgency=low + + * disable offending glsnake screensavers (closes malone #36743) + * remove the .desktop alternative again, after discussing the issue with + seb128 i agree its not a bug (rejected malone 32385 alongside) + * make the fridge the default url for rss feeds (closes malone #34829) + * fix xscreensaver-data.postrm to point to the right config if xscreensaver-gl + is still installed (closes malone #33748) + * added dictionaries-common to xscreensaver-data-extra dependencys (closes + malone #6498) + + -- Oliver Grawert Thu, 18 May 2006 12:09:48 +0200 + +xscreensaver (4.23-4ubuntu7) dapper; urgency=low + + * make preferences .desktop file an alternative, so it wont be shown if + gnome-screensaver is installed and selected as alternative + + -- Oliver Grawert Thu, 16 Mar 2006 14:21:14 +0100 + +xscreensaver (4.23-4ubuntu6) dapper; urgency=low + + * add gnome-screensaver planetary_gears.desktop helper file to + xscreensaver-gl closes malone 33754 + + -- Oliver Grawert Sun, 5 Mar 2006 03:13:36 +0100 + +xscreensaver (4.23-4ubuntu5) dapper; urgency=low + + * debian/rules: Add gettext domain to .desktop files to get language pack + support for them. + + -- Martin Pitt Fri, 24 Feb 2006 10:17:03 +0100 + +xscreensaver (4.23-4ubuntu4) dapper; urgency=low + + * make xscreensaver use /usr/share/backgrounds as default + (compile time option) location for image processing screensavers + and enable random images in the default config (adds build dep to + ubuntu-artwork that creates this dir. to be moved to a combination + of a screensaver specific subdir and an ubuntu-artwork-screensaver + package for default images) + * move the default config to the -data .deb so it applies for hacks without + having xscreensaver installed adjust postinst and postrm files accordingly + * split out packages xscreensaver-data-extra and xscreensaver-gl-extra so + xscreensaver-data and xscreensaver-gl only contain the hacks we want to + ship which gains us 5 megabytes on the CD (install the -extra files to get + the full set of hacks as before) + * make planet.ubuntu.com the default rss source for rss reading screensavers + * make sure the ant screensaver is built and installed + + -- Oliver Grawert Mon, 20 Feb 2006 18:41:15 +0100 + +xscreensaver (4.23-4ubuntu3) dapper; urgency=low + + * add missing gnome-screensaver .desktop helper files to + xscreensaver-data and xscreensaver-gl + + -- Oliver Grawert Sun, 19 Feb 2006 03:05:32 +0100 + +xscreensaver (4.23-4ubuntu2) dapper; urgency=low + + * fixed build dependencys + + -- Oliver Grawert Mon, 6 Feb 2006 14:05:03 +0100 + +xscreensaver (4.23-4ubuntu1) dapper; urgency=low + + * merge with debian + + -- Oliver Grawert Tue, 17 Jan 2006 02:20:00 +0100 + xscreensaver (4.23-4) unstable; urgency=high * replace xlibs-dev build-depend with the individual libraries that @@ -665,6 +1250,37 @@ -- Josselin Mouette Fri, 9 Dec 2005 00:53:01 +0100 +xscreensaver (4.23-2ubuntu4) dapper; urgency=low + + * Bump the versioned xscreensaver-data -> xscreensaver Replaces to + catch the latest file overwrite and allow upgrades to go smoothly. + + -- Adam Conrad Thu, 8 Dec 2005 16:00:22 +1100 + +xscreensaver (4.23-2ubuntu3) dapper; urgency=low + + * and actually upload the right source package ... + + -- Oliver Grawert Wed, 7 Dec 2005 22:49:24 +0100 + +xscreensaver (4.23-2ubuntu2) dapper; urgency=low + + * remove the config/README file from the xscreensaver package + and move it to xscreensaver-data where it belongs + + -- Oliver Grawert Wed, 7 Dec 2005 19:58:48 +0100 + +xscreensaver (4.23-2ubuntu1) dapper; urgency=low + + * resyncronize with debian (drop most ubuntu changes, we'll + only support the hacks we ship for gnome-screensaver) + * split out the xscreensaver-data package again + * fix build dependencys to match ubuntu + * add a set of .desktop files for selected hacks for usage + of the xscreensaver-data package with gnome-screensaver + + -- Oliver Grawert Wed, 16 Nov 2005 00:23:02 +0100 + xscreensaver (4.23-2) unstable; urgency=low * Apply NMU patch (why was there an NMU? Hello? Talk to me before doing an NMU!) (Closes: #334193) @@ -693,7 +1309,7 @@ thanks to Arnaud Giersch -- Ralf Hildebrandt Thu, 22 Sep 2005 23:23:43 +0200 - + xscreensaver (4.21-6) unstable; urgency=low * patch against stop_the_insanity() (closes: #323841) @@ -1475,7 +2091,6 @@ -- Larry Daffner Mon, 9 Feb 1998 20:54:21 -0600 - xscreensaver (2.15-2) unstable; urgency=low * Fixed typo in control file (fixes Bug#17516) @@ -1549,2 +2163,0 @@ - - diff -u xscreensaver-5.26/debian/control xscreensaver-5.26/debian/control --- xscreensaver-5.26/debian/control +++ xscreensaver-5.26/debian/control @@ -1,12 +1,13 @@ Source: xscreensaver Section: x11 Priority: optional -Maintainer: Tormod Volden +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Tormod Volden Build-Depends: bc, debhelper (>= 7.0), fortune-mod, libgtk2.0-dev, libpam0g-dev (>= 0.72), libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | xlibmesa-glu-dev | libglu-dev, xutils-dev, libxml2-dev, libglade2-dev, libjpeg-dev, libgle-dev, intltool, autotools-dev, libx11-dev, libxext-dev, libxinerama-dev, libxmu-dev, libxpm-dev, libxrandr-dev, libxss-dev, libxt-dev, libxtst-dev, libxxf86vm-dev, x11proto-core-dev, xbitmaps, quilt, dpkg-dev (>= 1.16.1) Standards-Version: 3.9.5 Homepage: http://www.jwz.org/xscreensaver/ -Vcs-Git: git://anonscm.debian.org/collab-maint/xscreensaver.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/xscreensaver.git;a=summary +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/xscreensaver/ubuntu +Vcs-Browser: https://code.launchpad.net/~ubuntu-desktop/xscreensaver/ubuntu Package: xscreensaver Architecture: any @@ -31,7 +32,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libwww-perl Suggests: xscreensaver -Replaces: xscreensaver (<< 5.04-3), gnome-screensaver (<< 2.15.4-0ubuntu1) +Replaces: xscreensaver (<< 5.04-3), gnome-screensaver (<< 2.15.4-0ubuntu1), + xscreensaver-data-extra (<< 5.08-0ubuntu4) Breaks: xscreensaver (<< 5.04-3), gnome-screensaver (<< 2.26), kscreensaver-xsaver (<= 4:4.2.4-1) Description: Screen saver modules for screensaver frontends XScreenSaver is a modular screen saver and locker for X11, @@ -53,7 +55,8 @@ Architecture: any Depends: ${shlibs:Depends}, xscreensaver-data (>= 5.04-3), dictionaries-common, libjpeg-progs, netpbm, ${misc:Depends} Enhances: xscreensaver, gnome-screensaver -Replaces: xscreensaver (<< 5.04-3) +Replaces: xscreensaver (<< 5.04-3), + xscreensaver-data (<< 5.08-0ubuntu4) Breaks: xscreensaver (<< 5.04-3), gnome-screensaver (<< 2.26), kscreensaver-xsaver (<= 4:4.2.4-1) Description: Extra screen saver modules for screensaver frontends XScreenSaver is a modular screen saver and locker for X11, @@ -64,20 +67,21 @@ xscreensaver and gnome-screensaver. . This is the set of non-GL screensavers not shipped by default: - anemone, anemotaxis, apollonian, apple2, attraction, barcode, blaster, - blitspin, bouboule, boxfit, braid, bumps, ccurve, celtic, cloudlife, - compass, coral, crystal, cynosure, decayscreen, deluxe, demon, - discrete, drift, epicycle, eruption, euler2d, fadeplot, fireworkx, - flame, flow, fluidballs, fontglide, goop, grav, greynetic, halftone, - halo, helix, hopalong, ifs, imsmap, interaggregate, interference, - intermomentary, julia, kaleidescope, kumppa, lcdscrub, ljlatest, loop, - maze, memscroller, moire2, moire, mountain, munch, nerverot, noseguy, - pacman, pedal, penetrate, petri, phosphor, piecewise, polyominoes, - pong, pyro, qix, rd-bomb, rocks, rorschach, rotzoomer, sierpinski, - slip, speedmine, spotlight, squiral, starfish, strange, substrate, - thornbird, triangle, truchet, twang, vermiculate, vidwhacker, wander, - whirlwindwarp, wormhole, xanalogtv, xflame, xjack, xmatrix, xrayswarm, - xspirograph, zoom. + deco, distort, galaxy, metaballs, penrose, ripples, shadebobs, slidescreen, + sonar, swirl, ant, anemone, anemotaxis, apollonian, apple2, attraction, + barcode, blaster, blitspin, bouboule, boxfit, braid, bsod, bubbles, bumps, + ccurve, celtic, cloudlife, compass, coral, critical, crystal, cynosure, + decayscreen, deluxe, demon, discrete, drift, epicycle, eruption, euler2d, + fadeplot, fireworkx, flag, flame, flow, fluidballs, fontglide, forest, goop, + grav, greynetic, halftone, halo, helix, hopalong, hyperball, + hypercube, ifs, imsmap, interaggregate, interference, intermomentary, jigsqw, + juggle, julia, memscroller, mismunch, moire, moire2, mountain, munch, + nerverot, noseguy, pacman, pedal, penetrate, petry, phosphor, piecewise, + polyominoes, pong, pyro, qiz, rd-bomb, rocks, rorschach, rotor, rotzoomer, + sierpinski, slip, speedmine, sphere, spiral, spotlight, squiral, starfish, + strange, substrate, t3d, thornbird, triangle, truchet, twang, vermiculate, + vidwhacker, vines, wander, whirlwindwarp, whirlygig, worm, + wormhole, xanalogtv, xflame, xjack, xmatrix, xrayswarm, xspirograph, zoom. . More display modes can be found in the xscreensaver-data, xscreensaver-gl and xscreensaver-gl-extra packages. @@ -86,7 +90,8 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: xscreensaver -Replaces: xscreensaver-data (<< 5.10-3) +Replaces: xscreensaver-data (<< 5.10-3), + xscreensaver-gl-extra (<< 5.08-0ubuntu4) Breaks: xscreensaver (<< 5.04-3), gnome-screensaver (<< 2.26), kscreensaver-xsaver (<= 4:4.2.4-1) Description: GL(Mesa) screen saver modules for screensaver frontends XScreenSaver is a modular screen saver and locker for X11, @@ -97,14 +102,9 @@ used by both xscreensaver and gnome-screensaver. . This is the set of GL screensavers shipped by default: - antinspect, antspotlight, atunnel, blinkbox, bubble3d, circuit, - cubestorm, endgame, engine, flipflop, flipscreen3d, flyingtoasters, - gears, gflux, glblur, glcells, gleidescope, glknots, glmatrix, - glschool, glslideshow, glsnake, gltext, hypertorus, jigglypuff, - kaleidocycle, lavalite, lockward, mirrorblob, moebius, moebiusgears, - molecule, morph3d, pipes, polyhedra, polytopes, pulsar, quasicrystal, - queens, sierpinski3d, sonar, spheremonics, stonerview, superquadrics, - topblock, voronoi. + antspotlight, glblur, glcells, glmatrix, glschool, + glslideshow, gltext, and hypertorus. + More GL screensavers can be found in the xscreensaver-gl-extra package. . More display modes can be found in the xscreensaver-data, xscreensaver-data-extra and xscreensaver-gl-extra packages. @@ -113,7 +113,7 @@ Architecture: any Depends: ${shlibs:Depends}, xscreensaver-gl (>= 5.04-3), ${misc:Depends} Enhances: xscreensaver, gnome-screensaver -Replaces: xscreensaver-gl (<< 5.04-3) +Replaces: xscreensaver-gl (<< 5.08-0ubuntu4) Breaks: xscreensaver (<< 5.04-3), gnome-screensaver (<< 2.26), kscreensaver-xsaver (<= 4:4.2.4-1) Description: Extra GL(Mesa) screen saver modules for screensaver frontends XScreenSaver is a modular screen saver and locker for X11, @@ -125,13 +125,16 @@ . This is the set of GL screensavers not shipped by default with xscreensaver-gl: - antmaze, atlantis, blocktube, boing, bouncingcow, boxed, cage, - carousel, companioncube, crackberg, cube21, cubenetic, cubicgrid, - dangerball, extrusion, fliptext, flurry, geodesic, glhanoi, glplanet, - hilbert, hypnowheel, jigsaw, juggler3d, klein, lament, menger, noof, - photopile, pinion, providence, rubik, rubikblocks, sballs, skytentacles, - sproingies, stairs, starwars, surfaces, tangram, timetunnel, tronbit, - unknownpleasures. + antinspect, gleidescope, glknots, atunnel, blinkbox, bubble3d, circuit, + cubestorm, geodesic, glsnake, jigglypuff, lavalite, lockward, mirrorblog, + moebius, boebiusgears, molecule, morph3d, pipes, polyhedra, polytopes, pulsar, + quasicrystal, queens, sierpinski3d, spheremonics, stonerview, superquadrics, + topblock, voronoi endgame, engine, flipflop, flipscreen3d, flurry, + flyingtoasters, gears, gflux, antmaze, atlantis, blocktube, boing, bouncingcow, + boxed, cage, carousel, crackberg, cube21, cubenetic, dangerball, extrusion, + fliptext, glforestfire, glhanoi, glplanet, juggler3d, klein, lament, menger, + noof, pinion, providence, rubik, sballs, sproingies, staris, starwars, tangram, + timetunnel, companioncube, hilbert, tronbit. . More display modes can be found in the xscreensaver-data, xscreensaver-data-extra and xscreensaver-gl packages. diff -u xscreensaver-5.26/debian/patches/series xscreensaver-5.26/debian/patches/series --- xscreensaver-5.26/debian/patches/series +++ xscreensaver-5.26/debian/patches/series @@ -23,0 +24,2 @@ +60_sequential_glslideshow.patch +90_ubuntu-branding.patch diff -u xscreensaver-5.26/debian/rules xscreensaver-5.26/debian/rules --- xscreensaver-5.26/debian/rules +++ xscreensaver-5.26/debian/rules @@ -47,6 +47,7 @@ # Configure for xscreensaver ./configure --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) \ --prefix=/usr \ + --with-image-directory=/usr/share/backgrounds \ --without-gl --with-pam --with-gtk --without-kerberos \ --with-hackdir=/usr/lib/xscreensaver \ --with-configdir=/usr/share/xscreensaver/config \ @@ -56,6 +57,7 @@ # Configure for xscreensaver-gl ./configure --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) \ --prefix=/usr \ + --with-image-directory=/usr/share/backgrounds \ --with-gl --with-pam --with-gtk --without-kerberos \ --with-hackdir=/usr/lib/xscreensaver \ --with-configdir=/usr/share/xscreensaver/config \ @@ -94,6 +96,14 @@ dh_installdirs -a dh_installdocs -a dh_installchangelogs -a + + # Add translation domain to .desktop files + DOMAIN=$$(grep --max-count 1 '^GETTEXT_PACKAGE[[:space:]]*=' $(CURDIR)/po/Makefile | sed 's/^.*=[[:space:]]\([^[:space:]]\)/\1/'); \ + for d in $$(find debian/tmp -type f -name "*.desktop" ); do \ + echo "Adding translation domain $$DOMAIN to $$d..."; \ + echo "X-Ubuntu-Gettext-Domain=$$DOMAIN" >> $$d; \ + done + # Install .desktop files used by gnome-screensaver etc mkdir -p debian/tmp/usr/share/applications/screensavers cp debian/screensavers-desktop-files/*.desktop \ diff -u xscreensaver-5.26/debian/split-hacks.config xscreensaver-5.26/debian/split-hacks.config --- xscreensaver-5.26/debian/split-hacks.config +++ xscreensaver-5.26/debian/split-hacks.config @@ -2,20 +2,20 @@ # Format: # hack binary-package optional-comment -abstractile xscreensaver-data +abstractile xscreensaver-data-extra anemone xscreensaver-data-extra anemotaxis xscreensaver-data-extra -antinspect xscreensaver-gl +antinspect xscreensaver-gl-extra antmaze xscreensaver-gl-extra antspotlight xscreensaver-gl apollonian xscreensaver-data-extra apple2 xscreensaver-data-extra atlantis xscreensaver-gl-extra attraction xscreensaver-data-extra -atunnel xscreensaver-gl +atunnel xscreensaver-gl-extra barcode xscreensaver-data-extra blaster xscreensaver-data-extra -blinkbox xscreensaver-gl +blinkbox xscreensaver-gl-extra blitspin xscreensaver-data-extra blocktube xscreensaver-gl-extra boing xscreensaver-gl-extra @@ -25,13 +25,13 @@ boxfit xscreensaver-data-extra braid xscreensaver-data-extra bsod xscreensaver-screensaver-bsod -bubble3d xscreensaver-gl +bubble3d xscreensaver-gl-extra bumps xscreensaver-data-extra cage xscreensaver-gl-extra carousel xscreensaver-gl-extra ccurve xscreensaver-data-extra celtic xscreensaver-data-extra -circuit xscreensaver-gl +circuit xscreensaver-gl-extra cloudlife xscreensaver-data-extra companioncube xscreensaver-gl-extra compass xscreensaver-data-extra @@ -40,20 +40,20 @@ crystal xscreensaver-data-extra cube21 xscreensaver-gl-extra cubenetic xscreensaver-gl-extra -cubestorm xscreensaver-gl +cubestorm xscreensaver-gl-extra cubicgrid xscreensaver-gl-extra -cwaves xscreensaver-data +cwaves xscreensaver-data-extra cynosure xscreensaver-data-extra dangerball xscreensaver-gl-extra decayscreen xscreensaver-data-extra -deco xscreensaver-data +deco xscreensaver-data-extra deluxe xscreensaver-data-extra demon xscreensaver-data-extra discrete xscreensaver-data-extra -distort xscreensaver-data +distort xscreensaver-data-extra drift xscreensaver-data-extra -endgame xscreensaver-gl -engine xscreensaver-gl +endgame xscreensaver-gl-extra +engine xscreensaver-gl-extra epicycle xscreensaver-data-extra eruption xscreensaver-data-extra euler2d xscreensaver-data-extra @@ -62,29 +62,29 @@ fiberlamp xscreensaver-data fireworkx xscreensaver-data-extra flame xscreensaver-data-extra -flipflop xscreensaver-gl -flipscreen3d xscreensaver-gl +flipflop xscreensaver-gl-extra +flipscreen3d xscreensaver-gl-extra fliptext xscreensaver-gl-extra flow xscreensaver-data-extra fluidballs xscreensaver-data-extra flurry xscreensaver-gl-extra -flyingtoasters xscreensaver-gl +flyingtoasters xscreensaver-gl-extra fontglide xscreensaver-data-extra fuzzyflakes xscreensaver-data -galaxy xscreensaver-data -gears xscreensaver-gl -geodesic xscreensaver-gl High CPU on Radeon -gflux xscreensaver-gl +galaxy xscreensaver-data-extra +gears xscreensaver-gl-extra +gflux xscreensaver-gl-extra +geodesic xscreensaver-gl-extra High CPU on Radeon glblur xscreensaver-gl glcells xscreensaver-gl -gleidescope xscreensaver-gl +gleidescope xscreensaver-gl-extra glhanoi xscreensaver-gl-extra -glknots xscreensaver-gl +glknots xscreensaver-gl-extra glmatrix xscreensaver-gl glplanet xscreensaver-gl-extra glschool xscreensaver-gl glslideshow xscreensaver-gl -glsnake xscreensaver-gl +glsnake xscreensaver-gl-extra gltext xscreensaver-gl goop xscreensaver-data-extra grav xscreensaver-data-extra @@ -102,7 +102,7 @@ interaggregate xscreensaver-data-extra interference xscreensaver-data-extra intermomentary xscreensaver-data-extra -jigglypuff xscreensaver-gl +jigglypuff xscreensaver-gl-extra jigsaw xscreensaver-gl-extra juggler3d xscreensaver-gl-extra julia xscreensaver-data-extra @@ -111,23 +111,23 @@ klein xscreensaver-gl-extra kumppa xscreensaver-data-extra lament xscreensaver-gl-extra -lavalite xscreensaver-gl +lavalite xscreensaver-gl-extra lcdscrub xscreensaver-data-extra ljlatest xscreensaver-data-extra -lockward xscreensaver-gl +lockward xscreensaver-gl-extra loop xscreensaver-data-extra -m6502 xscreensaver-data +m6502 xscreensaver-data-extra maze xscreensaver-data-extra memscroller xscreensaver-data-extra menger xscreensaver-gl-extra -metaballs xscreensaver-data -mirrorblob xscreensaver-gl -moebiusgears xscreensaver-gl -moebius xscreensaver-gl +metaballs xscreensaver-data-extra +mirrorblob xscreensaver-gl-extra +moebiusgears xscreensaver-gl-extra +moebius xscreensaver-gl-extra moire2 xscreensaver-data-extra moire xscreensaver-data-extra -molecule xscreensaver-gl -morph3d xscreensaver-gl +molecule xscreensaver-gl-extra +morph3d xscreensaver-gl-extra mountain xscreensaver-data-extra munch xscreensaver-data-extra nerverot xscreensaver-data-extra @@ -136,57 +136,57 @@ pacman xscreensaver-data-extra pedal xscreensaver-data-extra penetrate xscreensaver-data-extra -penrose xscreensaver-data +penrose xscreensaver-data-extra petri xscreensaver-data-extra phosphor xscreensaver-data-extra photopile xscreensaver-gl-extra piecewise xscreensaver-data-extra pinion xscreensaver-gl-extra -pipes xscreensaver-gl -polyhedra xscreensaver-gl +pipes xscreensaver-gl-extra +polyhedra xscreensaver-gl-extra polyominoes xscreensaver-data-extra -polytopes xscreensaver-gl +polytopes xscreensaver-gl-extra pong xscreensaver-data-extra -popsquares xscreensaver-data Do not ship .desktop file b/c conflict with gnome-screensaver +popsquares xscreensaver-data-extra Do not ship .desktop file b/c conflict with gnome-screensaver providence xscreensaver-gl-extra -pulsar xscreensaver-gl +pulsar xscreensaver-gl-extra pyro xscreensaver-data-extra qix xscreensaver-data-extra -quasicrystal xscreensaver-gl -queens xscreensaver-gl +queens xscreensaver-gl-extra +quasicrystal xscreensaver-gl-extra rd-bomb xscreensaver-data-extra -ripples xscreensaver-data +ripples xscreensaver-data-extra rocks xscreensaver-data-extra rorschach xscreensaver-data-extra rotzoomer xscreensaver-data-extra rubik xscreensaver-gl-extra rubikblocks xscreensaver-gl-extra sballs xscreensaver-gl-extra -shadebobs xscreensaver-data -sierpinski3d xscreensaver-gl +shadebobs xscreensaver-data-extra +sierpinski3d xscreensaver-gl-extra sierpinski xscreensaver-data-extra skytentacles xscreensaver-gl-extra -slidescreen xscreensaver-data +slidescreen xscreensaver-data-extra slip xscreensaver-data-extra -sonar xscreensaver-gl +sonar xscreensaver-data-extra speedmine xscreensaver-data-extra -spheremonics xscreensaver-gl +spheremonics xscreensaver-gl-extra spotlight xscreensaver-data-extra sproingies xscreensaver-gl-extra squiral xscreensaver-data-extra stairs xscreensaver-gl-extra starfish xscreensaver-data-extra starwars xscreensaver-gl-extra -stonerview xscreensaver-gl +stonerview xscreensaver-gl-extra strange xscreensaver-data-extra substrate xscreensaver-data-extra surfaces xscreensaver-gl-extra -superquadrics xscreensaver-gl -swirl xscreensaver-data +superquadrics xscreensaver-gl-extra +swirl xscreensaver-data-extra tangram xscreensaver-gl-extra thornbird xscreensaver-data-extra timetunnel xscreensaver-gl-extra -topblock xscreensaver-gl +topblock xscreensaver-gl-extra triangle xscreensaver-data-extra tronbit xscreensaver-gl-extra truchet xscreensaver-data-extra @@ -194,7 +194,7 @@ unknownpleasures xscreensaver-gl-extra High CPU on Radeon vermiculate xscreensaver-data-extra vidwhacker xscreensaver-data-extra -voronoi xscreensaver-gl +voronoi xscreensaver-gl-extra wander xscreensaver-data-extra webcollage xscreensaver-screensaver-webcollage whirlwindwarp xscreensaver-data-extra @@ -202,7 +202,7 @@ xanalogtv xscreensaver-data-extra xflame xscreensaver-data-extra xjack xscreensaver-data-extra -xlyap xscreensaver-data +xlyap xscreensaver-data-extra xmatrix xscreensaver-data-extra xrayswarm xscreensaver-data-extra xspirograph xscreensaver-data-extra only in patch2: unchanged: --- xscreensaver-5.26.orig/debian/patches/60_sequential_glslideshow.patch +++ xscreensaver-5.26/debian/patches/60_sequential_glslideshow.patch @@ -0,0 +1,39 @@ +Description: Allow xscreensaver-getimage-file to work sequentially + allowing users to run a slideshow in order. + . + To use in this mode, edit ~/.xscreensaver updating: + chooseRandomImages: True + imageDirectory: /path/to/ordered/pictures + And then: + echo 0 > ~/.xscreensaver-image-index + Then run: + /usr/lib/xscreensaver/glslideshow -duration 2 -pan 2 + To disable: + rm ~/.xscreensaver-image-index +Author: Dustin Kirkland +Forwarded: no +Last-Update: 2014-02-21 + +--- a/driver/xscreensaver-getimage-file ++++ b/driver/xscreensaver-getimage-file +@@ -843,7 +843,20 @@ + my $max_tries = 50; + for (my $i = 0; $i < $max_tries; $i++) { + ++ # Default to random image + my $n = int (rand ($#all_files + 1)); ++ ++ # But check if the user wants a sequential image ++ if (open(IN, "<$ENV{HOME}/.xscreensaver-image-index")) { ++ read(IN, $n, 8); ++ close(IN); ++ $n++; ++ if (open (IN, ">$ENV{HOME}/.xscreensaver-image-index")) { ++ print(IN $n--); ++ close(IN); ++ } ++ } ++ + my $file = $all_files[$n]; + if (large_enough_p ($file)) { + if (! $url) { only in patch2: unchanged: --- xscreensaver-5.26.orig/debian/patches/90_ubuntu-branding.patch +++ xscreensaver-5.26/debian/patches/90_ubuntu-branding.patch @@ -0,0 +1,11 @@ +--- a/driver/XScreenSaver.ad.in ++++ b/driver/XScreenSaver.ad.in +@@ -62,7 +62,7 @@ + *textLiteral: XScreenSaver + *textFile: @DEFAULT_TEXT_FILE@ + *textProgram: fortune +-*textURL: http://planet.debian.org/rss20.xml ++*textURL: http://fridge.ubuntu.com/node/feed + + *overlayTextForeground: #FFFF00 + *overlayTextBackground: #000000 only in patch2: unchanged: --- xscreensaver-5.26.orig/debian/source_xscreensaver.py +++ xscreensaver-5.26/debian/source_xscreensaver.py @@ -0,0 +1,21 @@ +'''apport package hook for xscreensaver + +(c) 2009 Canonical Ltd. +Author: Brian Murray + +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 3 of the License, or (at your +option) any later version. See http://www.gnu.org/copyleft/gpl.html for +the full text of the license. +''' + +from apport.hookutils import * + +def add_info(report): + + attach_file_if_exists(report, '/var/log/Xorg.0.log', 'XorgLog') + attach_file_if_exists(report, '/var/log/Xorg.0.log.old', 'XorgLogOld') + report['DisplayDevices'] = pci_devices(PCI_DISPLAY) + report['glxinfo'] = command_output(['glxinfo']) + nonfree_kernel_modules() only in patch2: unchanged: --- xscreensaver-5.26.orig/debian/xscreensaver.dirs +++ xscreensaver-5.26/debian/xscreensaver.dirs @@ -0,0 +1 @@ +/usr/share/backgrounds