Merge lp:~cyphermox/xscreensaver/update-to-5.14 into lp:~ubuntu-desktop/xscreensaver/ubuntu

[Mathieu Trudel-Lapierre]

[Tormod Volden (tormodvolden)]

Hi Mathieu, I have not looked at your changes, but I just want to copy these notes that I sent to Jeremy who merged 5.13 and had planned to merge 5.14 :) Please verify that you have taken care of these.

"If you do the merge to Ubuntu again, I've noted these things:
- your changelog does not include the whole Ubuntu history
- your previous merge pulled debian 5.13-1 before it was released
 and we updated Standards-Version to 3.9.2 in it
 Just make sure it is not in the Ubuntu delta any longer
- the sequential slide-show patch is not mentioned in your changelog
- as I mentioned in your merge request, the memory leak patch is obsolete
- you have an extraneous debian/xscreensaver.desktop
New in 5.14-1:
- we've dropped the xli | xloadimage depends"

[Mathieu Trudel-Lapierre (cyphermox)]

Hi Tormod,

The changelog will contain all the history that was currently available to me, so all that was there past Jeremy's merge.

Standards-Version is at 3.9.2 now because I got this in this merge, it was set to 3.9.1 in Ubuntu's 5.13-1ubuntu1, but that's just AFAICT merging the right stuff from Debian.

The memory leak patch was dropped, it was clearly included upstream (and this would have failed even quick testing, resulting in a double-free). I also dropped xli | xloadimage from Suggests seeing as it was dropped from Recommends in Debian; rationale is that gdkpixbuf is used instead.

I'll double-check for debian/xscreensaver.desktop.. The slideshow patch is indeed missing, thanks for the catch!

[lp:~cyphermox/xscreensaver/update-to-5.14]

30. By Mathieu Trudel-Lapierre on 2011-06-09

  - debian/patches/60_sequential_glslideshow.patch:
    + Allow going through images sequentially rather than just at random in
      the GLSlideshow hack.
* debian/xscreensaver.desktop: drop file left over from previous merge.

[Tormod Volden (tormodvolden)]

Sounds good. Yes, the 5.13-1ubuntu source actually had double free, after applied patches...

You should try to recover the complete Ubuntu changelog. It might have been dropped by mistake at some point. The full changelog makes it much easier to see the background and rationale for the existing Ubuntu delta.

[Mathieu Trudel-Lapierre (cyphermox)]

I kind of see what you're getting at; the full changelog helps seeing the rationale for changes, even though the stuff we write when doing a merge is meant to summarize all the changes left as a delta against Debian.

(working on bringing the old changelog entries back)

In light of these changes, is there anything that we could push into Debian as well in order to reduce the delta? I'm thinking in particular of /usr/share/backgrounds as the image directory, and installing /usr/share/backgrounds if it doesn't already exists. Perhaps also get to a consensus about default hacks would be nice.

[lp:~cyphermox/xscreensaver/update-to-5.14]

31. By Mathieu Trudel-Lapierre on 2011-06-10

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.

32. By Mathieu Trudel-Lapierre on 2011-06-10

* debian/changelog: reinstate old changelog entries that were dropped in
  previous commits.

[Tormod Volden (tormodvolden)]

Would be nice to reduce the delta (again). As you might see in the full changelog, I have put quite some effort into reducing the delta :) I will look at the backgrounds item.

The defaults hacks is a bit more difficult to agree on between a community project and a management-driven Desktop team ;) but the whole package split up is not perfect and new ideas are welcome.

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-18 13:39:51 +0000
+++ debian/changelog	2011-06-10 02:23:23 +0000
@@ -1,3 +1,48 @@
+xscreensaver (5.14-1ubuntu1) UNRELEASED; 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 <[e-mail]>  Thu, 09 Jun 2011 22:10:56 -0400
+
+xscreensaver (5.14-1) unstable; urgency=low
+
+  [ Tormod Volden ]
+  * New upstream version 5.14
+    - Fixed crash in Blank Only Mode when DPMS disabled.
+      (Closes: #627382, #627397)
+    - Added ``Quick Power-off in Blank Only Mode'' option.
+    - BSOD GLaDOS. 
+  * Clean up duplicate build-depends (thanks Jeremy Bicha)
+  * Drop xli | xloadimage recommends (we use gdk-pixbuf)
+
+ -- Jose Luis Rivas <[e-mail]>  Sun, 22 May 2011 23:12:59 -0430
+
 xscreensaver (5.13-1ubuntu1) oneiric; urgency=low
 
   * Merge with Debian unstable, remaining Ubuntu changes:
@@ -160,6 +205,43 @@
 
  -- Jose Luis Rivas <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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)
@@ -257,13 +339,6 @@
 
  -- Jose Luis Rivas <[e-mail]>  Fri, 25 Sep 2009 07:12:21 -0430
 
-xscreensaver (5.05-3+nmu1) unstable; urgency=high
-
-  * Non-maintainer upload by the security team.
-  * Fix local screen lock bypass vulnerability (closes: #539699).
-
- -- Michael Gilbert <[e-mail]>  Mon, 17 Aug 2009 00:43:39 -0400
-
 xscreensaver (5.07-1) unstable; urgency=low
 
   [ Tormod Volden ]
@@ -283,6 +358,46 @@
 
  -- Jose Luis Rivas <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Thu, 28 Aug 2008 16:15:25 -0500
+
 xscreensaver (5.06-1) unstable; urgency=low
 
   [ Jose Luis Rivas ]
@@ -308,6 +423,94 @@
 
  -- Jose Luis Rivas <[e-mail]>  Tue, 22 Jul 2008 23:33:51 -0430
 
+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 <[e-mail]>  Wed, 09 Sep 2009 10:59:31 +0200
+
+xscreensaver (5.08-0ubuntu3) karmic; urgency=low
+
+  * Added an apport package hook (LP: #398007) 
+
+ -- Brian Murray <[e-mail]>  Mon, 13 Jul 2009 10:22:54 -0700
+
+xscreensaver (5.08-0ubuntu2) karmic; urgency=low
+
+  * Included patch for Phosphor segfault (LP: #357556)
+
+ -- Timothy Pearson <[e-mail]>  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 <[e-mail]>  Mon, 29 Jun 2009 09:30:05 +0200
+
+xscreensaver (5.05-3+nmu1) unstable; urgency=high
+
+  * Non-maintainer upload by the security team.
+  * Fix local screen lock bypass vulnerability (closes: #539699).
+
+ -- Michael Gilbert <[e-mail]>  Mon, 17 Aug 2009 00:43:39 -0400
+
+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 <[e-mail]>  Thu, 28 Aug 2008 10:50:54 -0500
+
 xscreensaver (5.05-3) unstable; urgency=low
 
   [ Tormod Volden ]
@@ -350,6 +553,29 @@
 
  -- Jose Luis Rivas <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 17 Jun 2008 09:41:41 -0700
+
 xscreensaver (5.05-1) unstable; urgency=low
 
   * New upstream release. 
@@ -387,6 +613,31 @@
 
  -- Jose Luis Rivas <[e-mail]>  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 <[e-mail]>  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)
@@ -421,6 +672,43 @@
 
  -- Jose Luis Rivas <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Tue, 18 Dec 2007 21:40:55 +0100
+
 xscreensaver (5.04-2) unstable; urgency=low
 
   [ Tormod Volden ]
@@ -455,6 +743,23 @@
 
  -- Jose Luis Rivas <[e-mail]>  Sun, 09 Dec 2007 20:37:38 -0430
 
+xscreensaver (5.04-1ubuntu2) hardy; urgency=low
+
+  * Fix build failure with new glib2.0.
+
+ -- Matthias Klose <[e-mail]>  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 <[e-mail]>  Thu, 06 Dec 2007 09:53:12 +0000
+
 xscreensaver (5.04-1) unstable; urgency=low
 
   * New upstream release
@@ -555,6 +860,29 @@
 
  -- Jose Luis Rivas <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Sat,  3 Feb 2007 00:33:40 +0200
+
+xscreensaver (4.24-5ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Oliver Grawert <[e-mail]>  Mon, 30 Oct 2006 13:55:08 +0000
+
 xscreensaver (4.24-5) unstable; urgency=low
 
   * remove /usr/doc/xscreensaver link to finish /usr/doc ->
@@ -562,6 +890,19 @@
 
  -- Ralf Hildebrandt <[e-mail]>  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 <[e-mail]>  Fri, 21 Jul 2006 16:33:39 +0200
+
+xscreensaver (4.24-4ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Oliver Grawert <[e-mail]>  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)
@@ -598,6 +939,78 @@
 
  -- Ralf Hildebrandt <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  Sun, 19 Feb 2006 03:05:32 +0100
+
+xscreensaver (4.23-4ubuntu2) dapper; urgency=low
+
+  * fixed build dependencys 
+
+ -- Oliver Grawert <[e-mail]>  Mon,  6 Feb 2006 14:05:03 +0100
+
+xscreensaver (4.23-4ubuntu1) dapper; urgency=low
+
+  * merge with debian
+
+ -- Oliver Grawert <[e-mail]>  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
@@ -625,6 +1038,37 @@
 
  -- Josselin Mouette <[e-mail]>  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 <[e-mail]>  Thu,  8 Dec 2005 16:00:22 +1100
+
+xscreensaver (4.23-2ubuntu3) dapper; urgency=low
+
+  *  and actually upload the right source package ...
+
+ -- Oliver Grawert <[e-mail]>  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 <[e-mail]>  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 <[e-mail]>  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)
@@ -634,6 +1078,12 @@
 
  -- Ralf Hildebrandt <[e-mail]>  Sun, 30 Oct 2005 14:43:43 +0100
 
+xscreensaver (4.23-1) unstable; urgency=low
+
+  * new upstream (closes: #308668, #195727, #322752, #305528)
+    
+ -- Ralf Hildebrandt <[e-mail]>  Wed, 26 Sep 2005 15:23:43 +0200
+
 xscreensaver (4.23-0.1) unstable; urgency=high
 
   * NMU.
@@ -641,12 +1091,6 @@
 
  -- Emfox Zhou <[e-mail]>  Sun, 30 Oct 2005 01:54:04 +0800
 
-xscreensaver (4.23-1) unstable; urgency=low
-
-  * new upstream (closes: #308668, #195727, #322752, #305528)
-    
- -- Ralf Hildebrandt <[e-mail]>  Wed, 26 Sep 2005 15:23:43 +0200
-
 xscreensaver (4.21-7) unstable; urgency=low
 
   * fixed fubared patch in lines 1596 to 1603 of file "driver/prefs.c" (closes: #323841)

=== modified file 'debian/control'
--- debian/control	2011-05-13 16:00:06 +0000
+++ debian/control	2011-06-10 02:23:23 +0000
@@ -4,8 +4,8 @@
 Maintainer: Ubuntu Core Developers <[e-mail]>
 XSBC-Original-Maintainer: Jose Luis Rivas <[e-mail]>
 Uploaders: Tormod Volden <[e-mail]>
-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, libjpeg62-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, ubuntu-artwork
-Standards-Version: 3.9.1
+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, libjpeg62-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
+Standards-Version: 3.9.2
 Homepage: http://www.jwz.org/xscreensaver/
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/xscreensaver/ubuntu
 
@@ -14,7 +14,7 @@
 Depends: ${shlibs:Depends}, xscreensaver-data, ${misc:Depends}
 Conflicts: funny-manpages (<< 1.3-1), suidmanager (<< 0.50), xscreensaver-gnome (<< 4.09-2), xscreensaver-nognome (<< 4.09-2), gnome-control-center (<< 1:2)
 Recommends: libjpeg-progs, perl5, miscfiles | wordlist
-Suggests: xli | xloadimage, xfishtank, xdaliclock, xscreensaver-gl, fortune, www-browser, qcam | streamer, gdm3 | kdm-gdmcompat
+Suggests: xfishtank, xdaliclock, xscreensaver-gl, fortune, www-browser, qcam | streamer, gdm3 | kdm-gdmcompat
 Description: Automatic screensaver for X
  XScreenSaver is a modular screen saver and locker for X11,
  containing more than 200 screen savers.

=== modified file 'debian/patches/53_XScreenSaver.ad.in.patch'
--- debian/patches/53_XScreenSaver.ad.in.patch	2011-05-13 16:00:06 +0000
+++ debian/patches/53_XScreenSaver.ad.in.patch	2011-06-10 02:23:23 +0000
@@ -1,8 +1,8 @@
 Index: xscreensaver/driver/XScreenSaver.ad.in
 ===================================================================
---- xscreensaver.orig/driver/XScreenSaver.ad.in	2011-04-21 23:44:55.000000000 +0200
-+++ xscreensaver/driver/XScreenSaver.ad.in	2011-04-22 13:10:29.000000000 +0200
-@@ -56,11 +56,11 @@
+--- xscreensaver.orig/driver/XScreenSaver.ad.in	2011-05-22 18:43:28.000000000 +0200
++++ xscreensaver/driver/XScreenSaver.ad.in	2011-05-22 18:43:51.000000000 +0200
+@@ -57,11 +57,11 @@
  *captureStderr: 	True
  *ignoreUninstalledPrograms: False
  
@@ -16,7 +16,7 @@
  !*textURL:		http://twitter.com/statuses/public_timeline.atom
  
  *overlayTextForeground:	#FFFF00
-@@ -95,9 +95,13 @@
+@@ -96,9 +96,13 @@
  !
  !   Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
  !
@@ -33,7 +33,7 @@
  !
  !   Gnome 2.2:
  !
-@@ -112,14 +116,18 @@
+@@ -113,14 +117,18 @@
  !
  !   non-Gnome systems:
  !
@@ -56,7 +56,7 @@
  ! To show the time only:
  ! *dateFormat:		%I:%M %p
  ! For 24 hour time:
-@@ -130,7 +138,9 @@
+@@ -131,7 +139,9 @@
  ! (That button does not appear on the dialog if this program does not exist.)
  ! For Gnome: probably "gdmflexiserver -ls".  KDE, probably "kdmctl reserve".
  !
@@ -67,7 +67,7 @@
  
  
  ! Turning on "installColormap" on 8-bit systems interacts erratically with
-@@ -247,7 +257,6 @@
+@@ -248,7 +258,6 @@
  				xspirograph -root			    \n\
  @GL_KLUDGE@ GL: 				circuit -root				    \n\
  @GL_KLUDGE@ GL: 				dangerball -root			    \n\
@@ -75,7 +75,7 @@
  @GL_KLUDGE@ GL: 				engine -root				    \n\
  @GL_KLUDGE@ GL: 				flipscreen3d -root			    \n\
  @GL_KLUDGE@ GL: 				gltext -root				    \n\
-@@ -348,7 +357,8 @@
+@@ -349,7 +358,8 @@
  -				lcdscrub -root				    \n\
  @GL_KLUDGE@ GL: 				photopile -root				    \n\
  @GL_KLUDGE@ GL: 				skytentacles -root			    \n\
@@ -85,7 +85,7 @@
  
  
  
-@@ -398,10 +408,11 @@
+@@ -399,10 +409,11 @@
  *Dialog.shadowThickness:	2
  
  *passwd.heading.label:		XScreenSaver %s

=== removed file 'debian/patches/61_fix_tube_memleak.patch'
--- debian/patches/61_fix_tube_memleak.patch	2011-03-07 07:50:21 +0000
+++ debian/patches/61_fix_tube_memleak.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-Description: Fix obnoxious per-frame memleak in (at least) gltext
-Author: Christopher James Halse Rogers <[e-mail]>
-Forwarded: Yes
-
-Index: xscreensaver-5.12/hacks/glx/tube.c
-===================================================================
---- xscreensaver-5.12.orig/hacks/glx/tube.c	2011-03-07 18:31:54.322875242 +1100
-+++ xscreensaver-5.12/hacks/glx/tube.c	2011-03-07 18:38:59.758156110 +1100
-@@ -181,6 +181,7 @@
-         glDrawArrays ((wire_p ? GL_LINE_LOOP : GL_TRIANGLE_FAN), 0, out);
-       }
- 
-+  free(array);
-   return polys;
- }
- 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-03-07 07:50:21 +0000
+++ debian/patches/series	2011-06-10 02:23:23 +0000
@@ -14,4 +14,3 @@
 
 80_Makefile_in-clean-fix.patch
 60_sequential_glslideshow.patch
-61_fix_tube_memleak.patch

=== removed file 'debian/xscreensaver.desktop'
--- debian/xscreensaver.desktop	2009-06-26 02:35:30 +0000
+++ debian/xscreensaver.desktop	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=XScreenSaver Setup
-Exec=xscreensaver-demo
-Icon=xscreensaver
-Terminal=false
-StartupNotify=true
-Type=Application
-Categories=System;