Merge lp:~superm1/xubuntu-default-settings/fix-gnome-screensaver into lp:~xubuntu-dev/xubuntu-default-settings/trunk

Proposed by Mario Limonciello
Status: Merged
Merged at revision: 71
Proposed branch: lp:~superm1/xubuntu-default-settings/fix-gnome-screensaver
Merge into: lp:~xubuntu-dev/xubuntu-default-settings/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~superm1/xubuntu-default-settings/fix-gnome-screensaver
Reviewer Review Type Date Requested Status
Xubuntu Developers Pending
Review via email: mp+5461@code.launchpad.net
To post a comment you must log in.

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-03-22 22:39:04 +0000
3+++ debian/changelog 2009-04-11 15:40:46 +0000
4@@ -1,3 +1,11 @@
5+xubuntu-default-settings (0.54) jaunty; urgency=low
6+
7+ * etc/xdg/xubuntu/menus/xfce-applications.menu: Don't show the
8+ Screensavers menu. It has no purpose. Instead we should be showing the
9+ screensavers preferences utility. (LP: #350962)
10+
11+ -- Mario Limonciello <superm1@ubuntu.com> Sat, 11 Apr 2009 10:39:41 -0500
12+
13 xubuntu-default-settings (0.53) jaunty; urgency=low
14
15 * etc/xdg/xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml: restore
16
17=== modified file 'etc/xdg/xubuntu/menus/xfce-applications.menu'
18--- etc/xdg/xubuntu/menus/xfce-applications.menu 2009-03-15 17:20:29 +0000
19+++ etc/xdg/xubuntu/menus/xfce-applications.menu 2009-04-11 15:40:46 +0000
20@@ -42,13 +42,6 @@
21 <Merge type="all"/>
22 </Layout>
23
24- <Menu>
25- <Name>Screensavers</Name>
26- <Directory>xfce-screensavers.directory</Directory>
27- <Include>
28- <Category>Screensaver</Category>
29- </Include>
30- </Menu>
31 </Menu>
32
33 <Menu>

Subscribers

People subscribed via source and target branches

to status/vote changes: