Last commit made on 2010-09-12
Get this branch:
git clone -b ubuntu/maverick 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

f17dc7c... by Lionel Le Folgoc on 2010-09-12

Import patches-unapplied version 5.11-1ubuntu2 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: ac2c9a684db0d6d8c959a20bbaa2d0a4e1703921

New changelog entries:
  * debian/patches/50_driver_screensaver-properties-desktop.patch: dropped;
    it's not really a vectorized svg and it breaks xfce4-settings-manager;
    startup notification doesn't work as the dialog never removes itself.
    lp: #603222
  * debian/patches/series: refreshed.

ac2c9a6... by Robert Ancell on 2010-06-15

Import patches-unapplied version 5.11-1ubuntu1 to ubuntu/maverick

Imported using git-ubuntu import.

Changelog parent: 1d81111e9caa0bdf91449f4774d1928733fff522

New changelog entries:
  * Merge with Debian unstable, remaining Ubuntu changes:
  * debian/control:
    - Build-Depend on ubuntu-artwork
    - Add Vcs-Bzr link
    - Move xli | xloadimage xscreensaver recommends to suggests
    - Add/Update replaces with Ubuntu versions
    - Update package descriptions to list Ubuntu screensavers
  * debian/rules:
    - Use /usr/share/backgrounds as image directory
    - Add translation domain to .desktop files
  * debian/source_xscreensaver.py:
    - Add apport hook
  * debian/split-hacks.config:
    - Use different set of default hacks to Debian
  * debian/xscreensaver.dirs
    - Install /usr/share/backgrounds. By default, settings search in
      /usr/share/backgrounds and without it, it displays an error
  * debian/patches/53_XScreenSaver.ad.in.patch:
    - Use Ubuntu branding
    - Updated new login command (newLoginCommand) to work with new GDM by
      truncating deprecated arguments to gdmflexiserver.

1d81111... by Tormod Volden on 2010-06-02

Import patches-unapplied version 5.11-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: b5fd3787287bfbf12d243311db4207f0cbb55c8a

New changelog entries:
  * New upstream version
    - New versions of photopile, strange
    - Fixed flicker in pipes, cubestorm, noof
  * Drop obsolete 11_upstream_flurry_man_name.patch
  * debian/screensavers-desktop.stub: Add missing semicolon
    to Categories list (LP: #554856)
  * Bump Standards-Version to 3.8.4 (no changes needed)
  * debian/rules: Simplify cleaning
  * debian/rules: Remove obsolete --with-gnome flag
  * README.Debian: More tips for autostart configuration

b5fd378... by Jose-Luis Rivas on 2010-01-24

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

Imported using git-ubuntu import.

Changelog parent: aebeab560a0bc74879792f8eb06c63bb827b1e4f

New changelog entries:
  * Removed libxxf86misc{*} from Build-Depends (Closes: #559693)

aebeab5... by Jose-Luis Rivas on 2010-01-11

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

Imported using git-ubuntu import.

Changelog parent: e6ba2fab1ee6a6d9b10e6d896c0585e6dc0efa7a

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

e6ba2fa... by Jose-Luis Rivas on 2009-12-11

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

Imported using git-ubuntu import.

Changelog parent: 91e37ad936f9a84a389fae0aaa5f0fbd846580a5

New changelog entries:
  [ Joachim Breitner ]
  * Added unicode to app-defaults list (Closes: #560184) (Thanks Joachim
    Breitner <email address hidden> for updating patch #53)

91e37ad... by Jose-Luis Rivas on 2009-11-08

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

Imported using git-ubuntu import.

Changelog parent: 46cb70a9bb16ee4fdbcae345580b453bd6b5afb7

New changelog entries:
  * Removing Xsession hook (Closes: #550201)
  * Split hacks bsod and webcollage on independent packages
  (Closes: #553529)

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.

4302673... by Jose-Luis Rivas on 2009-09-25

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

Imported using git-ubuntu import.

Changelog parent: e4f88d3e5330708d2b8243ef727cc4b570b7f862

New changelog entries:
  * Updated my email on debian/copyright.
  * Added README.hacking to debian/xscreensaver.docs (Closes: #544352).
  * Included a hook for Xsession thanks to Y Giridhar Appaji Nag
  <email address hidden> (Closes: #357297).
  * Fixed the changelog.

e4f88d3... by Jose-Luis Rivas on 2009-09-24

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

Imported using git-ubuntu import.

Changelog parent: 58b441b9bda9ba1a0e640b2a698a9ac9ffb8ab67

New changelog entries:
  [ Tormod Volden ]
  [Tormod Volden]
  * New Upstream Version
  * Drop patch applied upstream:
    - 12_upstream_fix_typo_in_de.po.patch
  * Removed hyperball and hypercube hacks, retired upstream
  * debian/rules: Drop workaround for missing autoconf 2.64 support,
    fixed upstream
  [ Jose Luis Rivas]
  * Updated Standards-Version to 3.8.3 wo/ any changes needed.
  * Created debian/README.source.
  * Added patch 20_hack_flurry_man_name for NAME section of manpage for flurry
  * Changed my email from <email address hidden> to <email address hidden> on
    Maintainer field.
  * Acknoledging nmu for 5.07.
  * New Upstream Version
    - Fixed intermittent failure in xscreensaver-command
      Thanks to contribution by James Vega (Closes: 486603)
    - Fixed another potential RANDR crash
  * Drop patches applied upstream:
    - 11_upstream_phosphor_segfault_win_size.patch
    - 63_upstream_blinkbox-man.patch
    - 64_upstream_topblock-man.patch
    - 65_upstream_eruption-man.patch
    - 66_upstream_truchet-man.patch
    - 67_upstream_metaballs-man.patch
    - 70_upstream_fix_local_screenlock_bypass.patch
  * debian/rules: Add workaround for missing autoconf 2.64 support
  * Do not ship juggle any longer (merged with juggler3d)
  * Ship new hacks: rubikblocks and surfaces
  * 80_Makefile_in-clean-fix.patch: Workaround for make distclean
    failure in some situations, probably autoconf 2.64 issue