ubuntu/+source/xscreensaver:applied/ubuntu/trusty

Last commit made on 2013-07-17
Get this branch:
git clone -b applied/ubuntu/trusty 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/trusty
Repository:
lp:ubuntu/+source/xscreensaver

Recent commits

4436aa4... by Adam Conrad on 2013-07-17

Import patches-applied version 5.15-3ubuntu1 to applied/ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: b4def90b2a6a2665993a602d6a2b2b765eb1aebd
Unapplied parent: c9d73b2660b4e202e0ef4c7fac7ab5dd9217972b

New changelog entries:
  * Merge from Debian unstable. Remaining changes:
    - 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.

c9d73b2... by Adam Conrad on 2013-07-17

Import patches-unapplied version 5.15-3ubuntu1 to ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: 95e81192023bc775355ffc6915517ea084b3b921

New changelog entries:
  * Merge from Debian unstable. Remaining changes:
    - 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.

b4def90... by Tormod Volden on 2012-06-30

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

Imported using git-ubuntu import.

Changelog parent: af45e21f9edd38bcd43c9a397da223a9d6196978
Unapplied parent: 95e81192023bc775355ffc6915517ea084b3b921

New changelog entries:
  [ Jose Luis Rivas ]
  * Removed Jose Luis Rivas as maintainer, now the sole maintainer
    is Tormod Volden.
  [ Tormod Volden ]
  * Add -s to gdmflexiserver invocation (Closes: #349000)
  * xscreensaver-data depends on libwww-perl (LP: #971140)
  * Bump Standards-Version to 3.9.3 (no changes needed)

95e8119... by Tormod Volden on 2012-06-30

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

Imported using git-ubuntu import.

Changelog parent: cc840c4fbe75e21db1b887f0e0248919d43c4c21

New changelog entries:
  [ Jose Luis Rivas ]
  * Removed Jose Luis Rivas as maintainer, now the sole maintainer
    is Tormod Volden.
  [ Tormod Volden ]
  * Add -s to gdmflexiserver invocation (Closes: #349000)
  * xscreensaver-data depends on libwww-perl (LP: #971140)
  * Bump Standards-Version to 3.9.3 (no changes needed)

af45e21... by Tormod Volden on 2011-10-30

Import patches-applied version 5.15-2 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: a4c187f7d0d4daa0da8d3686b3c93b6049eb1966
Unapplied parent: cc840c4fbe75e21db1b887f0e0248919d43c4c21

New changelog entries:
  * Build-dep on libjpeg-dev instead of libjpeg62-dev (Closes: #647110)

cc840c4... by Tormod Volden on 2011-10-30

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

Imported using git-ubuntu import.

Changelog parent: 2caa29679f5bc7461aef4d3d5b01251646ac2b21

New changelog entries:
  * Build-dep on libjpeg-dev instead of libjpeg62-dev (Closes: #647110)

a4c187f... by Tormod Volden on 2011-10-06

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

Imported using git-ubuntu import.

Changelog parent: f2b9210cc929e64a6654cc11929e7ac72a49d3c1
Unapplied parent: 2caa29679f5bc7461aef4d3d5b01251646ac2b21

New changelog entries:
  [ Tormod Volden ]
  * New upstream version 5.15
    - New hacks: hilbert, companioncube and tronbit
    - Turned on LC_CTYPE on Linux (LP: #671923)
  * debian/rules: Add build-arch and build-indep targets
  [ Jose Luis Rivas ]
  * postrm: Kill xscreensaver after removal (Closes: #558024)

2caa296... by Tormod Volden on 2011-10-06

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

Imported using git-ubuntu import.

Changelog parent: b443c6b633090c54a799fd17811dd57f56712234

New changelog entries:
  [ Tormod Volden ]
  * New upstream version 5.15
    - New hacks: hilbert, companioncube and tronbit
    - Turned on LC_CTYPE on Linux (LP: #671923)
  * debian/rules: Add build-arch and build-indep targets
  [ Jose Luis Rivas ]
  * postrm: Kill xscreensaver after removal (Closes: #558024)

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)