lp:~cyphermox/xscreensaver/update-to-5.14

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntu-desktop/xscreensaver/ubuntu at revision 29

Ubuntu Desktop: Pending requested 2011-06-09

Diff: 712 lines (+469/-50)

6 files modified

debian/changelog (+457/-13)
debian/control (+3/-3)
debian/patches/53_XScreenSaver.ad.in.patch (+9/-9)
debian/patches/61_fix_tube_memleak.patch (+0/-16)
debian/patches/series (+0/-1)
debian/xscreensaver.desktop (+0/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #795251: Update to 5.14

Undecided

Fix Released

Link a bug report

Related blueprints

32. By Mathieu Trudel-Lapierre on 2011-06-10

* debian/changelog: reinstate old changelog entries that were dropped in
  previous commits.

31. By Mathieu Trudel-Lapierre on 2011-06-10

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.

30. By Mathieu Trudel-Lapierre on 2011-06-09

  - debian/patches/60_sequential_glslideshow.patch:
    + Allow going through images sequentially rather than just at random in
      the GLSlideshow hack.
* debian/xscreensaver.desktop: drop file left over from previous merge.

29. By Mathieu Trudel-Lapierre on 2011-06-09

* Merge with Debian unstable, remaining Ubuntu changes (LP: #795251):
  - debian/control:
    + Build-Depend on ubuntu-artwork
    + 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/61_fix_tube_memleak.patch: dropped, applied upstream.

28. By Martin Pitt on 2011-05-18

releasing version 5.13-1ubuntu1

27. By Martin Pitt on 2011-05-18

merge with Debian

26. By Robert Ancell on 2011-03-09

Releasing 5.12-0ubuntu4

25. By Robert Ancell on 2011-03-09

* debian/patches/61_fix_tube_memleak.patch:
  - Fix a large per-frame memleak in (at least) gltext.

24. By Robert Ancell on 2011-01-27

* Clean debian/patches
* debian/control:
  - Use standards version 3.9.1

23. By Robert Ancell on 2011-01-27

apparently not in a freeze...