please merge xscreensaver 5.04-4 from Debian unstable main

Oliver: can you please take a look at it?

Just want to add that this new version also provides a long-awaited workaround for bug #101943, since it does not install "braid" by default, which would make nvidia cards crash.

Ted: does this look good to you?

This has quite a few changes in it. What specific change in it results in braid going away? If it turns out for whatever reason that the whole package can't be merged, it'd be nice to at least eliminate braid, so we can finally close bug 101943.

This looks good to me. I can't sponsor it though.

Also, I looked at 5.05, but there seems to be a lot of changes in that tarball including 3 new screensaver. 5.05 for Ibex.

I forgot to mention in the previous comment that the reason the changelog entry is so large is because it's bringing in all the Ubuntu changes that we've been maintaining for a while. It's a complete list. In all actuallity the difference between 5.04-4 and 5.04-4ubuntu1 is probably the smallest diff we've had with Debian for a while.

This bug was fixed in the package xscreensaver - 5.04-4ubuntu1

---------------
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)

xscreensaver (5.04-4) unstable; urgency=low

  * debian/control: Add replaces/conflicts to fix upgrades (Closes: #468899)
  * corrected previous changelog entry on xscreensaver-gl-extra

xscreensaver (5.04-3) unstable; urgency=low

  [ Tormod Volden ]
  * (From Ubuntu) Include .desktop files for hacks (Closes: #410095)
  * debian/xscreensaver-data.files: Skip .desktop file for popsquares
    for now until conflict is sorted out with gnome-screensaver that
    also ships it
  * dropped planetary_gears.desktop (gears goes planetary randomly
    and has no command option for it)
  * 60_add-ant-hack.patch: restore "ant" (disabled upstream in 4.23)
  * Add .desktop description for "ant"
  * (From Ubuntu) Split xscreensaver package into:
    - xscreensaver (core backend without hacks)
    - xscreensaver-data (standard hacks)
    - xscreensaver-data-extra (hacks not installed by default)
  * (From Ubuntu) Split xscreensaver-gl package into:
    - xscreensaver-gl (standard GL hacks)
    - xscreensaver-gl-extra (GL hacks not installed by default)
  * 70_fade_oversleep.patch: don't hang on resume (Closes: #454523)
  * 71_endgame_whiter_colour.patch: better contrast (Closes: #463345)

  [ Jose Luis Rivas ]
  * debian/xscreensaver-gl.files: Deleted interplanetary-gears.desktop since
  it's not shipped.

 -- Tormod Volden <email address hidden> Thu, 06 Mar 2008 11:01:03 +0100

> In all actuallity the difference between 5.04-4 and 5.04-4ubuntu1 is probably the smallest diff we've had with Debian for a while.

That's been my goal for a while now, and I am very happy to get this version into Hardy. Thanks for uploading!