-
Committer:
Bazaar Package Importer
-
Author(s):
Tormod Volden
-
Date:
2008-03-06 11:01:03 UTC
-
Revision ID:
james.westby@ubuntu.com-20080306110103-3jm7pd3b316l8zqo
Tags: 5.04-4ubuntu1
* Merge from debian unstable, remaining changes: (LP: #201626)
- debian/control: add Build-Depends on ubuntu-artwork
- debian/rules: use /usr/share/backgrounds
- 82_ubuntu-texturl-fridge.patch: use Ubuntu fridge for rss
- 91_ubuntu-no-pam-conf: don't ship pam.conf
- 70_ubuntu-xscreensaver-desktop.patch: name the xscreensaver desktop
file for what it is to not confuse it with gnome-screensaver
- debian/rules: don't hide the xscreensaver desktop icon if the
user insists on installing xscreensaver (LP: #86416)
- 54_drivers_demogtk.patch: Patching a compile failure with
GTK+ in Hardy
- 28_rotate.patch: Add in the gdk pixbuf function to rotate JPEGs and
TIFFs so that they're the right direction
- debian/control: Increasing the GTK+ version to 2.12 for the patch
28_rotate.patch
- glslideshow.desktop: Changing so that it shows only one image, one
time and no extra black on the edges.
* Fixed upstream:
- install xscreensaver-properties.desktop to right place (LP: #201481)
- remove planetary-gears screensaver (LP: #196360)