Merge lp:~gilir/xscreensaver/fix-129769 into lp:~ubuntu-desktop/xscreensaver/ubuntu

[Julien Lavergne]

[Julien Lavergne (gilir)]

Fix for bug 129769

[Tormod Volden (tormodvolden)]

This has been merged in 5.11-1ubuntu1

=== modified file 'debian/changelog'
--- debian/changelog	2009-11-30 05:23:01 +0000
+++ debian/changelog	2010-01-25 22:09:15 +0000
@@ -1,3 +1,11 @@
+xscreensaver (5.10-3ubuntu2) UNRELEASED; urgency=low
+
+  * Add debian/xscreensaver.dirs with /usr/share/backgrounds. By default,
+    settings search in /usr/share/backgrounds and without it, it displays an
+    error (LP: #129769)
+
+ -- Julien Lavergne <[e-mail]>  Mon, 25 Jan 2010 22:53:25 +0100
+
 xscreensaver (5.10-3ubuntu1) lucid; urgency=low
 
   * Merge with Debian unstable, remaining changes: (LP: #489062)
 
=== added file 'debian/xscreensaver.dirs'
--- debian/xscreensaver.dirs	1970-01-01 00:00:00 +0000
+++ debian/xscreensaver.dirs	2010-01-25 22:09:15 +0000
@@ -0,0 +1,1 @@
+/usr/share/backgrounds