lp:~cyphermox/ubuntu/precise/xscreensaver/merge-5.15-2

Created by Mathieu Trudel-Lapierre on 2011-12-21 and last modified on 2011-12-21
Get this branch:
bzr branch lp:~cyphermox/ubuntu/precise/xscreensaver/merge-5.15-2
Only Mathieu Trudel-Lapierre can upload to this branch. If you are Mathieu Trudel-Lapierre please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Mathieu Trudel-Lapierre
Status:
Development

Recent revisions

44. By Mathieu Trudel-Lapierre on 2011-12-21

* Merge with Debian testing, remaining Ubuntu 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.
* debian/changelog: really clean up changelog, some entries were still out of
  place.

43. By Mathieu Trudel-Lapierre on 2011-12-21

Merging shared upstream rev into target branch.

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

* 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.

41. By Jeremy Bicha on 2011-05-18

* 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 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

40. By Lionel Le Folgoc on 2011-01-21

* Restore changes from 5.11-1ubuntu2 that disappeared with 5.12-0ubuntu1:
  - 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.

39. By Dustin Kirkland  on 2010-11-25

releasing version 5.12-0ubuntu2

38. By Robert Ancell on 2010-11-17

New upstream release

37. By Lionel Le Folgoc on 2010-09-12

* 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.

36. By Robert Ancell on 2010-06-15

* 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.

35. By Harald Sitter on 2010-04-14

Import parts of debian's current .preinst file to get rid of the
previously removed autostart desktop file.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:ubuntu/precise/xscreensaver
This branch contains Public information 
Everyone can see this information.