~ubuntu-branches/ubuntu/vivid/xscreensaver/vivid

Viewing all changes in revision 36.

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-06-15 10:42:54 UTC
  • mfrom: (1.1.9 upstream) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100615104254-tio23up6qefk7rt1
Tags: 5.11-1ubuntu1
* 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: