ubuntu/+source/xscreensaver:applied/ubuntu/oneiric

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

Recent commits

37e9693... by Mathieu Trudel-Lapierre on 2011-06-10

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

Imported using git-ubuntu import.

Changelog parent: f2b9210cc929e64a6654cc11929e7ac72a49d3c1
Unapplied parent: cf82235c23d8605464ae973d234508c3d929c11e

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.

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.

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

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

Imported using git-ubuntu import.

Changelog parent: 4819b584e9100312d809bdcd47fb5a9623f5724f
Unapplied parent: b443c6b633090c54a799fd17811dd57f56712234

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)

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)

4819b58... by Tormod Volden on 2011-04-22

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

Imported using git-ubuntu import.

Changelog parent: 576704b780294cf29018e1c74cda7e1afc4fd67d
Unapplied parent: 2e76f9f121503fdc61d0a2f1640d2ad8e6f23e13

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)

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)

576704b... by Tormod Volden on 2010-06-02

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

Imported using git-ubuntu import.

Changelog parent: 51a73ba762b02fa64fbaa88a9b9a2690bcce5e5f
Unapplied parent: 1d81111e9caa0bdf91449f4774d1928733fff522

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

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

51a73ba... by Jose-Luis Rivas on 2010-01-24

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

Imported using git-ubuntu import.

Changelog parent: 63172acde77cc8c33b8b30706c7b82adc0509999
Unapplied parent: b5fd3787287bfbf12d243311db4207f0cbb55c8a

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

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)