Last commit made on 2009-09-22
Get this branch:
git clone -b ubuntu/karmic 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

71d8bf2... by Julien Lavergne on 2009-09-13

Import patches-unapplied version 5.08-0ubuntu5 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: 6f86b8d059cfee7c84b02e0ab87208fb1c3417d8

New changelog entries:
  * 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)

6f86b8d... by Andrew Starr-Bochicchio on 2009-09-09

Import patches-unapplied version 5.08-0ubuntu4 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: aff69cbde4807794e03d384f2d442acd26961dd3

New changelog entries:
  * 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
  * 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):
  * 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

aff69cb... by Brian Murray on 2009-07-13

Import patches-unapplied version 5.08-0ubuntu3 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: 3334741b7caaaf1a83a70fc937ddb6cb5adfc3e0

New changelog entries:
  * Added an apport package hook (LP: #398007)

3334741... by Timothy Pearson <email address hidden> on 2009-07-03

Import patches-unapplied version 5.08-0ubuntu2 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: 75412512e45e0cf912d58a4b5f1eb5da7670af47

New changelog entries:
  * Included patch for Phosphor segfault (LP: #357556)

7541251... by Robert Ancell on 2009-06-29

Import patches-unapplied version 5.08-0ubuntu1 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: 5bb90124c16ebed31c6417d8252734c55256bcc9

New changelog entries:
  * 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/*:
    - Updated for new/removed/changed screensavers
  * debian/control: Added Bzr link

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.