ubuntu/+source/xscreensaver:applied/ubuntu/lucid-devel

Last commit made on 2010-04-14
Get this branch:
git clone -b applied/ubuntu/lucid-devel 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

Name:
applied/ubuntu/lucid-devel
Repository:
lp:ubuntu/+source/xscreensaver

Recent commits

98ad314... by Harald Sitter on 2010-04-14

Import patches-applied version 5.10-3ubuntu4 to applied/ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 604074eb606c41add0ab1294e47080db2aabd6d4
Unapplied parent: a781ff362bd6147ad608126d9d76bc4e35c06833

New changelog entries:
  * Import parts of debian's current .preinst file to get rid of the
    previously removed autostart desktop file.

a781ff3... by Harald Sitter on 2010-04-14

Import patches-unapplied version 5.10-3ubuntu4 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 05fcdf2a23419758eddde83a42b0818cb5996edb

New changelog entries:
  * Import parts of debian's current .preinst file to get rid of the
    previously removed autostart desktop file.

604074e... by Alessandro Ghersi on 2010-04-10

Import patches-applied version 5.10-3ubuntu3 to applied/ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 39892e68af851f2a11151b8ea8bc4db70f6fdc79
Unapplied parent: 05fcdf2a23419758eddde83a42b0818cb5996edb

New changelog entries:
  * Removing autostart from xdg, is now on /usr/share so user can copy it if
    wants autostart (LP: #554069)

05fcdf2... by Alessandro Ghersi on 2010-04-10

Import patches-unapplied version 5.10-3ubuntu3 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 083a1e1891e95f36e22b2a561bb145d0d858834e

New changelog entries:
  * Removing autostart from xdg, is now on /usr/share so user can copy it if
    wants autostart (LP: #554069)

39892e6... by Steve Langasek on 2010-04-06

Import patches-applied version 5.10-3ubuntu2 to applied/ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 538f1d51493f5111c45f61c4ee0989519f10e60f
Unapplied parent: 083a1e1891e95f36e22b2a561bb145d0d858834e

New changelog entries:
  * Reintroduce changes lost from version 5.08-0ubuntu5:
  [ Julien Lavergne ]
  * 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)

083a1e1... by Steve Langasek on 2010-04-06

Import patches-unapplied version 5.10-3ubuntu2 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: b3c971038320404384931daa63bdb0c1f944fc03

New changelog entries:
  * Reintroduce changes lost from version 5.08-0ubuntu5:
  [ Julien Lavergne ]
  * 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)

538f1d5... by Robert Ancell on 2009-11-30

Import patches-applied version 5.10-3ubuntu1 to applied/ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: be4bd7b41e692460b3ad96bc5136b14ac074f87b
Unapplied parent: b3c971038320404384931daa63bdb0c1f944fc03

New changelog entries:
  * Merge with Debian unstable, remaining changes: (LP: #489062)
    - debian/control: add Build-Depends on ubuntu-artwork
    - debian/rules: use /usr/share/backgrounds
    - debian/control: Move xli | xloadimage recommends to suggests
    - debian/split-hacks.config: Use different set of default hacks to Debian
    - debian/source_xscreensaver.py: Add apport hook
    - debian/patches/53_XScreenSaver.ad.in.patch: Use Ubuntu branding

b3c9710... by Robert Ancell on 2009-11-30

Import patches-unapplied version 5.10-3ubuntu1 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 46cb70a9bb16ee4fdbcae345580b453bd6b5afb7

New changelog entries:
  * Merge with Debian unstable, remaining changes: (LP: #489062)
    - debian/control: add Build-Depends on ubuntu-artwork
    - debian/rules: use /usr/share/backgrounds
    - debian/control: Move xli | xloadimage recommends to suggests
    - debian/split-hacks.config: Use different set of default hacks to Debian
    - debian/source_xscreensaver.py: Add apport hook
    - debian/patches/53_XScreenSaver.ad.in.patch: Use Ubuntu branding

be4bd7b... by Tormod Volden on 2009-10-12

Import patches-applied version 5.10-3 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 7b148e16938527bf450b75dbff44d6af8cfa9268
Unapplied parent: 46cb70a9bb16ee4fdbcae345580b453bd6b5afb7

New changelog entries:
  * Move sonar to xscreensaver-gl, it got GL-ified (Closes: #550002)
  * Remove Xsession hook, could not be disabled (Closes: #550042)
  * Add desktop file to /etc/xdg/autostart, to disable it see
    http://standards.freedesktop.org/autostart-spec/ (Closes: #357297)
  * Move 20_hack_flurry_man_name to 11_upstream_flurry_man_name
  * debian/split-config.sh, debian/rules, etc: Auto-generate the
    package.install files to make one single dh_install{,man} call
    since this is so much more efficent.

46cb70a... by Tormod Volden on 2009-10-12

Import patches-unapplied version 5.10-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 430267365720db06f0553bc417f7b7508194a582

New changelog entries:
  * Move sonar to xscreensaver-gl, it got GL-ified (Closes: #550002)
  * Remove Xsession hook, could not be disabled (Closes: #550042)
  * Add desktop file to /etc/xdg/autostart, to disable it see
    http://standards.freedesktop.org/autostart-spec/ (Closes: #357297)
  * Move 20_hack_flurry_man_name to 11_upstream_flurry_man_name
  * debian/split-config.sh, debian/rules, etc: Auto-generate the
    package.install files to make one single dh_install{,man} call
    since this is so much more efficent.