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

Viewing all changes in revision 44.

  • Committer: Mathieu Trudel-Lapierre
  • Date: 2011-12-21 16:31:14 UTC
  • mfrom: (2.1.15 sid)
  • Revision ID: mathieu@canonical.com-20111221163114-zov5m8ejyincu01t
* 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: