Viewing all changes in revision 32.
- Committer: Bazaar Package Importer
- Date: 2009-11-30 13:33:13 UTC
- mfrom: (1.1.8 upstream) (2.1.6 squeeze)
- Revision ID: james.westby@ubuntu.com-20091130133313-3b5nz2e7hvbb8h3l
* Merge with Debian unstable, remaining changes: (LP: #489062)
  - debian/control: add Build-Depends on ubuntu-artwork
  - debian/rules: use /usr/share/backgrounds
  - debian/control: Move xli | xloadimage recommends to suggests
  - debian/split-hacks.config: Use different set of default hacks to Debian
  - debian/source_xscreensaver.py: Add apport hook
  - debian/patches/53_XScreenSaver.ad.in.patch: Use Ubuntu branding
  - debian/control: add Build-Depends on ubuntu-artwork
  - debian/rules: use /usr/share/backgrounds
  - debian/control: Move xli | xloadimage recommends to suggests
  - debian/split-hacks.config: Use different set of default hacks to Debian
  - debian/source_xscreensaver.py: Add apport hook
  - debian/patches/53_XScreenSaver.ad.in.patch: Use Ubuntu branding
- files added:
- OSX/._InvertedSlider.m
- files removed:
- OSX/._PrefsReader.m
- files modified:
- OSX/._XScreenSaver.icns
expand all
collapse all
added
removed
