Last commit made on 2011-06-10
Get this branch:
git clone -b ubuntu/oneiric-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


Recent commits

cf82235... by Mathieu Trudel-Lapierre on 2011-06-10

Import patches-unapplied version 5.14-1ubuntu1 to ubuntu/oneiric

Imported using git-ubuntu import.

Changelog parent: b443c6b633090c54a799fd17811dd57f56712234

New changelog entries:
  * Merge with Debian unstable, remaining Ubuntu changes (LP: #795251):
    - debian/control:
      + Add Vcs-Bzr link
      + 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 than 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
    - debian/patches/60_sequential_glslideshow.patch:
      + Allow going through images sequentially rather than just at random in
        the GLSlideshow hack.
  * debian/patches/61_fix_tube_memleak.patch: dropped, applied upstream.
  * debian/xscreensaver.desktop: drop file left over from previous merge.
  * debian/control: drop Build-Depends on ubuntu-artwork. This was only pulled
    in to create /usr/share/backgrounds to use as a location for screensavers
    that look for images.
  * debian/changelog: reinstate old changelog entries that were dropped in
    previous commits.

b443c6b... by Jose-Luis Rivas on 2011-05-23

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

Imported using git-ubuntu import.

Changelog parent: 2e76f9f121503fdc61d0a2f1640d2ad8e6f23e13

New changelog entries:
  [ Tormod Volden ]
  * New upstream version 5.14
    - Fixed crash in Blank Only Mode when DPMS disabled.
      (Closes: #627382, #627397)
    - Added ``Quick Power-off in Blank Only Mode'' option.
    - BSOD GLaDOS.
  * Clean up duplicate build-depends (thanks Jeremy Bicha)
  * Drop xli | xloadimage recommends (we use gdk-pixbuf)

2e76f9f... by Tormod Volden on 2011-04-22

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

Imported using git-ubuntu import.

Changelog parent: 1d81111e9caa0bdf91449f4774d1928733fff522

New changelog entries:
  * New upstream version 5.13
    - Passwords that contain UTF-8 non-Latin1 chars are now typeable
    - pt_BR translation (thanks Sérgio Cipolla!) (Closes: #586230)
    - Fix memory leak in gltext (LP: #768032)
  * Build without gdm and libgnome2-dev (Closes: #618165)
  * Add Suggests on gdm3 or kdm-gdmcompat because gdmflexiserver
    can be used for the "New Login" functionality (see bug #304406)
  * Remove obsolete gdmflexiserver options
  * xscreensaver.desktop changes:
    - Do not set StartupNotify.
    - Do not specify svg icon. Closes: #618723 (LP: #603222)
  * Fix installation path for xscreensaver-daemon.desktop
  * debian/xscreensaver.preinst: Check version before
    deleting obsolete configuration files (Closes: #588288)
  * Bump Standards-Version to 3.9.2 (no changes needed)

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.