Last commit made on 2008-10-24
Get this branch:
git clone -b ubuntu/jaunty https://git.launchpad.net/ubuntu/+source/xscreensaver
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

5bb9012... by Martin Pitt on 2008-10-23

Import patches-unapplied version 5.07-0ubuntu3 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: 0f6c2f587edbe57ed3436aeb2d417b2b0961b4f1

New changelog entries:
  * Drop xli | xloadimage recommends to universe. Both are in universe, and
    xli is orphaned in Debian.

0f6c2f5... by Steve Langasek on 2008-10-08

Import patches-unapplied version 5.07-0ubuntu2 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: aea756041476f8365f66b092203319b1fcef9013

New changelog entries:
  * Restore the fix from 5.05-1ubuntu2, which was lost in the latest
  * 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).

aea7560... by Ted Gould on 2008-08-28

Import patches-unapplied version 5.07-0ubuntu1 to ubuntu/intrepid

Imported using git-ubuntu import.

Changelog parent: c1cce5f4931be8860d68e6021ce8341e7be85687

New changelog entries:
  * Upgrade upstream version
  * debian/control: Remove suggest xdaliclock as it is no longer
  * Remove 10_jwz-screensaver-randr-patch-3.patch as it has been merged
  * 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
  * 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

c1cce5f... by Jose-Luis Rivas on 2008-07-15

Import patches-unapplied version 5.05-3 to debian/lenny

Imported using git-ubuntu import.