please merge xscreensaver 5.04-2 from Debian unstable main

[Tormod Volden]

Binary package hint: xscreensaver

After a long due overhaul of the packaging, the Debian diff.gz is now reduced from 170k to 45k, and the Ubuntu package could need to catch up.

- In perfect timing for the seasonal family festivities, the new version has removed potentially offensive language from a couple of hacks.
- Bug #71795 seems to be fixed even though it can not be traced to anything in the changelog
- Fixes for bug #74727, bug #86416, bug #160669 in my upcoming patch

[Tormod Volden (tormodvolden)]

The Ubuntu debdiff is now reduced from 12 MB to 190 kB (by removing autogenerated files, duplicates etc). (The Ubuntu diff.gz is now 71 kB.)

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

[Daniel Holbach (dholbach)]

Oliver: can you take a look at this?

[Scott James Remnant (Canonical) (canonical-scott)]

Ted: can you take a look instead?

[Tormod Volden (tormodvolden)]

Well I had another look myself. The changelog was not merged correctly to include all the old Ubuntu history. Fixed.

[Ted Gould (ted)]

I couldn't get it to build without another patch removing a "STFU" from the source code. I also added a rotate patch that I had been working on (one line).

Test packages are available in my PPA. Debdiff attached.

[Tormod Volden (tormodvolden)]

I don't see 54_drivers_demogtk.patch (I suppose that's the STFU issue) and the debian/control change in your debdiff other than in the changelog.

[Ted Gould (ted)]

On Wed, 2008-01-30 at 20:33 +0000, Tormod Volden wrote:
> I don't see 54_drivers_demogtk.patch (I suppose that's the STFU issue)
> and the debian/control change in your debdiff other than in the
> changelog.

Sorry.

[Ted Gould (ted)]

Hmm, that didn't include the e-mail attachment. Sorry, thought it did.

[Tormod Volden (tormodvolden)]

Ted, your patches look good. I would maybe have rephrased the changelog:
so that it shows only one image, one time -> so that it shows an image only once

It would be nice if these things could finally be uploaded! Is there no one else than Oliver who can do it, since he seems to be too busy?

[Launchpad Janitor (janitor)]

This bug was fixed in the package xscreensaver - 5.04-2ubuntu2

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

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)

xscreensaver (5.04-2) unstable; urgency=low

  [Tormod Volden]
  * debian/rules:
   + Moved POT generation from clean to build.
   + Now xscreensaver.svg is copied from `debian/` at build time.
  * po/xscreensaver.pot:
   + Is now deleted since it is autogenerated.
  * debian/control:
   + Added libxss-dev, libxtst-dev, libxxf86misc-dev and x-dev as
   build depends.
   + Added quilt and removed dpatch from build-depends.
  * debian/patches/00_maindiffwithorig.patch got split up in:
    - 20_hacks_Makefile.patch: add xpm libs for "maze" hack
    - 22_hacks_barcode.patch: make family-friendly
    - 23_hacks_glx_glsnake.patch: make family-friendly
    - 30_hacks_xanalogtv.patch: use logo-50-bad.xpm
    - 31_utils_images_logo-50-bad-xpm.patch: less colours
    - 50_driver_screensaver-properties-desktop.patch: use svg icon
  [Jose Luis Rivas]
  * debian/xscreensaver.files:
   + Added m6502 (without manpage at the moment) and abstractile
   hacks.
  * debian/xscreensaver-gl.files:
   + Added moebiusgears and lockward hacks. (Closes: #454601)
  * debian/control:
   + Added Tormod Volden as Uploader.
   + Updated to 3.7.3 Standards-Version, no modification needed.
  * debian/xscreensaver.install:
   + Now xscreensaver.svg is in `debian/`.

 -- Ted Gould <email address hidden> Wed, 23 Jan 2008 19:00:20 +0000