Last commit made on 2006-05-18
Get this branch:
git clone -b ubuntu/dapper 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

d305649... by Oliver Grawert on 2006-05-18

Import patches-unapplied version 4.23-4ubuntu8 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 7e2c5a31b35d263ff06dcfb4cca67aa120dcc425

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

7e2c5a3... by Oliver Grawert on 2006-03-16

Import patches-unapplied version 4.23-4ubuntu7 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: b7ccfaaeb8575a859f33c6470da3a22931d15adb

New changelog entries:
  * make preferences .desktop file an alternative, so it wont be shown if
    gnome-screensaver is installed and selected as alternative

b7ccfaa... by Oliver Grawert on 2006-03-05

Import patches-unapplied version 4.23-4ubuntu6 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 8573ba727df3c19b96099e27364d67309677ed2b

New changelog entries:
  * add gnome-screensaver planetary_gears.desktop helper file to
    xscreensaver-gl closes malone 33754

8573ba7... by Martin Pitt on 2006-02-24

Import patches-unapplied version 4.23-4ubuntu5 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 8131fb9c663d6499c5f39b9e5e481aee877bbe1f

New changelog entries:
  * debian/rules: Add gettext domain to .desktop files to get language pack
    support for them.

8131fb9... by Oliver Grawert on 2006-02-20

Import patches-unapplied version 4.23-4ubuntu4 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 2edaa4913c945ca27d9dadeebfa916eb6d3d9d44

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

2edaa49... by Oliver Grawert on 2006-02-19

Import patches-unapplied version 4.23-4ubuntu3 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: a7279e818f6d8f8ca9694c33717a913d23ccc51c

New changelog entries:
  * add missing gnome-screensaver .desktop helper files to
    xscreensaver-data and xscreensaver-gl

a7279e8... by Oliver Grawert on 2006-02-06

Import patches-unapplied version 4.23-4ubuntu2 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 636dd83468b29c4683e3e4d898cc8d8671e5d0ea

New changelog entries:
  * fixed build dependencys

636dd83... by Oliver Grawert on 2006-01-17

Import patches-unapplied version 4.23-4ubuntu1 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 800e084231e952264915673979d9cd8347542679

New changelog entries:
  * merge with debian
  * replace xlibs-dev build-depend with the individual libraries that
    the package actually build-depends on (closes: #346855).
  * driver/timers.c: back out a change from 4.23 leading to screen
    blanking even though the keyboard is in use (closes: #336368).
  * Build-depend on autotools-dev.
  * driver/XScreenSaver.ad.in:
    + Restore RSS modifications that disappeared unexpectedly in a
      previous upload.
    + Now use planet.debian.org instead of .net.
    + Set the newLoginCommand here, not trusting the result of the
      configure test, making the configure.in patch unnecessary
      (closes: #336590).
    + Force gdmflexiserver to start a new flexible X server
      (closes: #337760).
  * utils/images/logo-50-bad.xpm: this is a stripped down (64 colors)
    version of the logo.
  * hacks/xanalogtv.c: use this version instead (closes: #304344).

800e084... by Adam Conrad on 2005-12-08

Import patches-unapplied version 4.23-2ubuntu4 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 1d255ba1fdbcaa300aee6f1eb16ef7bee54c69b5

New changelog entries:
  * Bump the versioned xscreensaver-data -> xscreensaver Replaces to
    catch the latest file overwrite and allow upgrades to go smoothly.
  * and actually upload the right source package ...
  * remove the config/README file from the xscreensaver package
    and move it to xscreensaver-data where it belongs

  * 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
  * Apply NMU patch (why was there an NMU? Hello? Talk to me before doing an NMU!) (Closes: #334193)
  * Fix typo in tangram man page (Closes: #336432)
  * Found out that the upstream already applied the "grayscale option patch" to bubbles (Closes: #331248)
  * Suggest xfishtank (Closes: #335589)
  * NMU.
  * should not kill running xscreensavers (Close: #334193)
  * new upstream (closes: #308668, #195727, #322752, #305528)

  * fixed fubared patch in lines 1596 to 1603 of file "driver/prefs.c" (closes: #323841)
    thanks to Arnaud Giersch

  * patch against stop_the_insanity() (closes: #323841)
  * patch typo in the whirlygig.6x man page (closes: #326534)
  * patch against run_hack() in driver/demo-Gtk.c (closes: #302777)
  * fix dependencies (closes: #318512)
  * closing old stuff that's already fixed (closes: #118089, #118881, #137073, #145814, #129124)
  * closing old stuff that's WONTFIX (closes: #127276)
  * relax dependency on netpbm (closes: #320446)
  * fix build dependencies for gl and glu
  * fix lintian bugs about debian-control-with-duplicate-fields conflicts: 12, 15
  * fix lintian bug (man pages for flow and intermomentary)
  * fix lintian bug syntax-error-in-debian-changelog line 313 "unrecognised line"
  * debian/control, debian/rules: remove legacy xscreensaver-gnome and
    xscreensaver-nognome packages.
  * Patch from Martin Pitt <email address hidden> to generate a POT file
    during the package build (closes: #313530):
    + debian/control: build-depend on intltool.
    + debian/rules: run intltool-update in the clean target.
    + po/POTFILES.in: remove driver/xscreensaver-demo.glade which does not
      exist any more.
  * debian/xscreensaver.links: removed, unneeded with GNOME 2.10
    (closes: #312044).
  * po/de.po: patch from Jens Seidel <email address hidden>
    (closes: #313870).

1d255ba... by Oliver Grawert on 2005-10-11

Import patches-unapplied version 4.21-4ubuntu17 to ubuntu/breezy

Imported using git-ubuntu import.