-
Committer:
Bazaar Package Importer
-
Author(s):
Mathieu Trudel-Lapierre
-
Date:
2011-06-09 22:10:56 UTC
-
mfrom:
(1.1.12 upstream)
(2.1.13 sid)
-
Revision ID:
james.westby@ubuntu.com-20110609221056-01ikv0cvs0g1hhxd
Tags: 5.14-1ubuntu1
* 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.