xscreensaver

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

  1. fix-129769
  2. Merge into ubuntu
Proposed by Julien Lavergne
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~gilir/xscreensaver/fix-129769
Merge into: lp:~ubuntu-desktop/xscreensaver/ubuntu
Diff against target: 21 lines (+9/-0)
2 files modified
debian/changelog (+8/-0)
debian/xscreensaver.dirs (+1/-0)
To merge this branch: bzr merge lp:~gilir/xscreensaver/fix-129769
To post a comment you must log in.
Revision history for this message
Julien Lavergne (gilir) wrote :

Fix for bug 129769

Revision history for this message
Tormod Volden (tormodvolden) wrote :

This has been merged in 5.11-1ubuntu1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-11-30 05:23:01 +0000
3+++ debian/changelog 2010-01-25 22:09:15 +0000
4@@ -1,3 +1,11 @@
5+xscreensaver (5.10-3ubuntu2) UNRELEASED; urgency=low
6+
7+ * Add debian/xscreensaver.dirs with /usr/share/backgrounds. By default,
8+ settings search in /usr/share/backgrounds and without it, it displays an
9+ error (LP: #129769)
10+
11+ -- Julien Lavergne <gilir@ubuntu.com> Mon, 25 Jan 2010 22:53:25 +0100
12+
13 xscreensaver (5.10-3ubuntu1) lucid; urgency=low
14
15 * Merge with Debian unstable, remaining changes: (LP: #489062)
16
17=== added file 'debian/xscreensaver.dirs'
18--- debian/xscreensaver.dirs 1970-01-01 00:00:00 +0000
19+++ debian/xscreensaver.dirs 2010-01-25 22:09:15 +0000
20@@ -0,0 +1,1 @@
21+/usr/share/backgrounds

Subscribers

People subscribed via source and target branches