------------------------------------------------------------ revno: 344 committer: Lionel Le Folgoc <[email protected]> branch nick: xubuntu-default-settings timestamp: Mon 2012-02-06 17:47:18 +0100 message: * etc/xdg/xdg-xubuntu/menus/xfce-applications.menu: clean up to drop unneeded delta wrt to upstream, and stop using desktop-directory files from gnome-menus. * debian/control: stop recommending gnome-menus. * etc/xdg/xdg-xubuntu/xfce4/xfconf/…/xfce4-session.xml: set xscreensaver as the default screensaver. modified: debian/changelog debian/control etc/xdg/xdg-xubuntu/menus/xfce-applications.menu etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
-- lp:xubuntu-default-settings https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk Your team Xubuntu Team is subscribed to branch lp:xubuntu-default-settings. To unsubscribe from this branch go to https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/+edit-subscription
=== modified file 'debian/changelog' --- debian/changelog 2012-02-04 20:19:03 +0000 +++ debian/changelog 2012-02-06 16:47:18 +0000 @@ -1,3 +1,14 @@ +xubuntu-default-settings (12.04.4) UNRELEASED; urgency=low + + * etc/xdg/xdg-xubuntu/menus/xfce-applications.menu: clean up to drop unneeded + delta wrt to upstream, and stop using desktop-directory files from + gnome-menus. + * debian/control: stop recommending gnome-menus. + * etc/xdg/xdg-xubuntu/xfce4/xfconf/…/xfce4-session.xml: set xscreensaver as + the default screensaver. + + -- Lionel Le Folgoc <[email protected]> Mon, 06 Feb 2012 17:40:01 +0100 + xubuntu-default-settings (12.04.3) precise; urgency=low * Correctly set /Xft/* xfconf props. === modified file 'debian/control' --- debian/control 2012-01-22 23:20:47 +0000 +++ debian/control 2012-02-06 16:47:18 +0000 @@ -13,7 +13,7 @@ Depends: ${misc:Depends}, xubuntu-artwork (>= 12.04.0~), ttf-droid, lightdm (>= 0.9.3-0ubuntu2), x11-common (>= 1:7.6+7ubuntu2), lightdm-gtk-greeter (>= 1.0.0-0ubuntu2) -Recommends: xfce4-utils, gnome-menus +Recommends: xfce4-utils Provides: lightdm-gtk-greeter-config Description: default settings for the Xubuntu desktop This package contains the default settings used by Xubuntu. === modified file 'etc/xdg/xdg-xubuntu/menus/xfce-applications.menu' --- etc/xdg/xdg-xubuntu/menus/xfce-applications.menu 2011-03-14 21:25:26 +0000 +++ etc/xdg/xdg-xubuntu/menus/xfce-applications.menu 2012-02-06 16:47:18 +0000 @@ -55,7 +55,7 @@ <Menu> <Name>Accessories</Name> - <Directory>Utility.directory</Directory> + <Directory>xfce-accessories.directory</Directory> <Include> <Or> <Category>Accessibility</Category> @@ -90,12 +90,9 @@ <Menu> <Name>Education</Name> - <Directory>Education.directory</Directory> + <Directory>xfce-education.directory</Directory> <Include> - <And> - <Category>Education</Category> - <Not><Category>Science</Category></Not> - </And> + <Category>Education</Category> </Include> </Menu> @@ -116,20 +113,6 @@ </Menu> <Menu> - <Name>Internet</Name> - <Directory>Network.directory</Directory> - <Include> - <Category>Network</Category> - </Include> - <Exclude> - <Or> - <Filename>exo-mail-reader.desktop</Filename> - <Filename>exo-web-browser.desktop</Filename> - </Or> - </Exclude> - </Menu> - - <Menu> <Name>Multimedia</Name> <Directory>xfce-multimedia.directory</Directory> <Include> @@ -140,6 +123,20 @@ </Menu> <Menu> + <Name>Network</Name> + <Directory>xfce-network.directory</Directory> + <Include> + <Category>Network</Category> + </Include> + <Exclude> + <Or> + <Filename>exo-mail-reader.desktop</Filename> + <Filename>exo-web-browser.desktop</Filename> + </Or> + </Exclude> + </Menu> + + <Menu> <Name>Office</Name> <Directory>xfce-office.directory</Directory> <Include> @@ -148,17 +145,6 @@ </Menu> <Menu> - <Name>Science</Name> - <Directory>GnomeScience.directory</Directory> - <Include> - <And> - <Category>Education</Category> - <Category>Science</Category> - </And> - </Include> - </Menu> - - <Menu> <Name>System</Name> <Directory>xfce-system.directory</Directory> <Include> === modified file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml' --- etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 2012-01-05 21:12:32 +0000 +++ etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml 2012-02-06 16:47:18 +0000 @@ -36,6 +36,11 @@ <property name="compat" type="empty"> <property name="LaunchGNOME" type="bool" value="false"/> </property> + <property name="startup" type="empty"> + <property name="screensaver" type="empty"> + <property name="type" type="string" value="xscreensaver"/> + </property> + </property> <property name="splash" type="empty"> <property name="Engine" type="string" value=""/> </property>
_______________________________________________ Mailing list: https://launchpad.net/~xubuntu-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~xubuntu-dev More help : https://help.launchpad.net/ListHelp
