xubuntu-dev team mailing list archive
-
xubuntu-dev team
-
Mailing list archive
-
Message #02723
[Merge] lp:~ochosi/xubuntu-default-settings/trusty-updates into lp:xubuntu-default-settings
Simon Steinbeiß has proposed merging lp:~ochosi/xubuntu-default-settings/trusty-updates into lp:xubuntu-default-settings.
Requested reviews:
Xubuntu Developers (xubuntu-dev)
For more details, see:
https://code.launchpad.net/~ochosi/xubuntu-default-settings/trusty-updates/+merge/207376
This merge-requests comprises a few others proposed for trusty and hence supersedes them.
1. Update the default configuration for lightdm-gtk-greeter (https://code.launchpad.net/~ochosi/xubuntu-default-settings/greeter-conf/+merge/205763)
2. Implement the new default panel layout (https://code.launchpad.net/~ochosi/xubuntu-default-settings/panel_terminal_powerman/+merge/207074)
3. Don't run light-locker in the live-session (https://code.launchpad.net/~smd-seandavis/xubuntu-default-settings/light-locker-live/+merge/207087)
4. Various fixes to the package (https://code.launchpad.net/~smd-seandavis/xubuntu-default-settings/b2_fixes/+merge/187127)
5. Add keyboard-shortcuts for certain hardware-keys (https://code.launchpad.net/~smd-seandavis/xubuntu-default-settings/keyboard-shortcuts/+merge/182352)
6. Add a keyboard-shortcut for xkill (https://code.launchpad.net/~unit193/xubuntu-default-settings/killitwithfire/+merge/202977)
--
https://code.launchpad.net/~ochosi/xubuntu-default-settings/trusty-updates/+merge/207376
Your team Xubuntu Developers is requested to review the proposed merge of lp:~ochosi/xubuntu-default-settings/trusty-updates into lp:xubuntu-default-settings.
=== modified file 'debian/changelog'
--- debian/changelog 2014-01-15 12:50:12 +0000
+++ debian/changelog 2014-02-20 09:41:47 +0000
@@ -1,3 +1,15 @@
+xubuntu-default-settings (14.04.1) UNRELEASED; urgency=medium
+
+ * defaults.list - Use parole for mpegurl mimetype (lp: #1221426)
+ * xubuntu-default-settings.gsettings-override - Remove unsupported key (lp: #1227637)
+ * debian/control - Update standards version to 3.9.4
+ * debian/copyright - Update to latest format specification
+ * debian/xubuntu-live-settings.install
+ * debian/light-locker.desktop
+ - Prevent autostart of light-locker in live session (see LP: #1281323)
+
+ -- Sean Davis <smd.seandavis@xxxxxxxxx> Tue, 18 Feb 2014 22:42:17 -0500
+
xubuntu-default-settings (14.04.0) trusty; urgency=low
* Automated translations updates
=== modified file 'debian/control'
--- debian/control 2013-07-04 18:05:00 +0000
+++ debian/control 2014-02-20 09:41:47 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Xubuntu Developers <xubuntu-devel@xxxxxxxxxxxxxxxx>
Build-Depends: debhelper (>= 8.1.3~), intltool
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Homepage: https://launchpad.net/xubuntu-default-settings
Vcs-Bzr: lp:xubuntu-default-settings
Vcs-Browser: http://bazaar.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/files
=== modified file 'debian/copyright'
--- debian/copyright 2013-03-03 22:53:18 +0000
+++ debian/copyright 2014-02-20 09:41:47 +0000
@@ -1,10 +1,11 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: Xubuntu Default Settings
-Maintainer: Xubuntu Team <xubuntu-devel@xxxxxxxxxxxxxxxx>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Xubuntu Default Settings
+Upstream-Contact: Xubuntu Team <xubuntu-devel@xxxxxxxxxxxxxxxx>
Files: *
-Copyright: 2007-2009, Cody A.W. Somerville <cody-somerville@xxxxxxxxxx>
+Copyright: 2013, Sean Davis <smd-seandavis@xxxxxxxxxx>
2007-2011, Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
+ 2007-2009, Cody A.W. Somerville <cody-somerville@xxxxxxxxxx>
2006-2008, Gauvain Pocentek <gauvainpocentek@xxxxxxxxxx>
2005-2008, Jani Monoses <jani@xxxxxxxxxx>
License: GPL-2+
@@ -12,15 +13,15 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+ .
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+ .
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
+ .
On Debian systems the full text of the GNU General Public License version 2
can be found in the `/usr/share/common-licenses/GPL-2' file.
=== added file 'debian/light-locker.desktop'
--- debian/light-locker.desktop 1970-01-01 00:00:00 +0000
+++ debian/light-locker.desktop 2014-02-20 09:41:47 +0000
@@ -0,0 +1,2 @@
+[Desktop Entry]
+Hidden=True
\ No newline at end of file
=== modified file 'debian/xubuntu-default-settings.gsettings-override'
--- debian/xubuntu-default-settings.gsettings-override 2013-07-05 17:47:06 +0000
+++ debian/xubuntu-default-settings.gsettings-override 2014-02-20 09:41:47 +0000
@@ -2,9 +2,6 @@
interested-media-players=[ 'gmusicbrowser' ]
show-notify-osd-on-scroll=false
-[com.ubuntu.update-notifier]
-auto-launch=false
-
[org.gnome.desktop.interface]
gtk-theme='Greybird'
icon-theme='elementary-xfce-darker'
=== modified file 'debian/xubuntu-live-settings.install'
--- debian/xubuntu-live-settings.install 2011-11-19 19:05:13 +0000
+++ debian/xubuntu-live-settings.install 2014-02-20 09:41:47 +0000
@@ -1,1 +1,2 @@
casper/* usr/share/initramfs-tools/scripts/casper-bottom/
+debian/light-locker.desktop etc/xdg/xdg-xubuntu/autostart/
\ No newline at end of file
=== modified file 'etc/xdg/xdg-xubuntu/lightdm/lightdm-gtk-greeter.conf'
--- etc/xdg/xdg-xubuntu/lightdm/lightdm-gtk-greeter.conf 2013-09-20 19:36:02 +0000
+++ etc/xdg/xdg-xubuntu/lightdm/lightdm-gtk-greeter.conf 2014-02-20 09:41:47 +0000
@@ -5,25 +5,26 @@
# font-name = Font to use
# xft-antialias = Whether to antialias Xft fonts (true or false)
# xft-dpi = Resolution for Xft in dots per inch (e.g. 96)
-# xft-hintstyle = What degree of hinting to use (none, slight, medium, or full)
+# xft-hintstyle = What degree of hinting to use (none, slight, medium, or hintfull)
# xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr)
-# show-language-selector (true or false)
-# show-indicators = semi-colon ";" separated list of allowed indicator modules (e.g. libsoundmenu.so)
+# show-indicators = semi-colon ";" separated list of allowed indicator modules. Built-in indicators include "~a11y", "~language", "~session", "~power". Unity indicators can be represented by short name (e.g. "sound", "power"), service file name, or absolute path
# show-clock (true or false)
# clock-format = strftime-format string, e.g. %H:%M
# keyboard = command to launch on-screen keyboard
-#
+# position = main window position: x y
+# default-user-image = Image used as default user icon, path or #icon-name
+# screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen
+#
[greeter]
background=/lib/plymouth/themes/xubuntu-logo/wallpaper.png
theme-name=Greybird
-icon-theme-name=elementary-xfce
+icon-theme-name=elementary-xfce-dark
font-name=Droid Sans 10
xft-antialias=true
xft-dpi=96
xft-hintstyle=slight
xft-rgba=rgb
-show-language-selector=true
-show-indicators=
+show-indicators=power;~session;~language;~a11y;~power;
show-clock=true
-clock-format=%a, %d %b %Y %H:%M
+clock-format=%d %b, %H:%M
keyboard=onboard
=== modified file 'etc/xdg/xdg-xubuntu/xfce4/panel/default.xml'
--- etc/xdg/xdg-xubuntu/xfce4/panel/default.xml 2012-09-17 19:16:12 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/panel/default.xml 2014-02-20 09:41:47 +0000
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<channel name="xfce4-panel" version="1.0">
- <property name="panels" type="uint" value="2">
+ <property name="panels" type="uint" value="1">
<property name="panel-0" type="empty">
<property name="position" type="string" value="p=6;x=0;y=0"/>
<property name="length" type="uint" value="100"/>
@@ -14,13 +14,9 @@
<value type="int" value="5"/>
<value type="int" value="6"/>
<value type="int" value="7"/>
- <value type="int" value="8"/>
- <value type="int" value="26"/>
- <value type="int" value="27"/>
- <value type="int" value="9"/>
</property>
<property name="background-style" type="uint" value="0"/>
- <property name="background-alpha" type="uint" value="100"/>
+ <property name="background-alpha" type="uint" value="80"/>
<property name="size" type="uint" value="24"/>
<property name="autohide" type="bool" value="false"/>
<property name="length-adjust" type="bool" value="true"/>
@@ -29,42 +25,9 @@
<property name="leave-opacity" type="uint" value="100"/>
<property name="mode" type="uint" value="0"/>
</property>
- <property name="panel-1" type="empty">
- <property name="position" type="string" value="p=8;x=960;y=1176"/>
- <property name="size" type="uint" value="46"/>
- <property name="position-locked" type="bool" value="true"/>
- <property name="plugin-ids" type="array">
- <value type="int" value="10"/>
- <value type="int" value="11"/>
- <value type="int" value="12"/>
- <value type="int" value="13"/>
- <value type="int" value="14"/>
- <value type="int" value="15"/>
- <value type="int" value="16"/>
- <value type="int" value="17"/>
- <value type="int" value="18"/>
- <value type="int" value="19"/>
- <value type="int" value="20"/>
- <value type="int" value="24"/>
- <value type="int" value="22"/>
- <value type="int" value="23"/>
- <value type="int" value="25"/>
- </property>
- <property name="autohide" type="bool" value="true"/>
- <property name="length" type="uint" value="100"/>
- <property name="length-adjust" type="bool" value="true"/>
- <property name="leave-opacity" type="uint" value="100"/>
- <property name="background-alpha" type="uint" value="15"/>
- <property name="enter-opacity" type="uint" value="100"/>
- <property name="mode" type="uint" value="0"/>
- </property>
</property>
<property name="plugins" type="empty">
- <property name="plugin-1" type="string" value="applicationsmenu">
- <property name="show-tooltips" type="bool" value="true"/>
- <property name="button-icon" type="string" value="xubuntu-logo-menu"/>
- <property name="show-button-title" type="bool" value="false"/>
- </property>
+ <property name="plugin-1" type="string" value="whiskermenu"/>
<property name="plugin-2" type="string" value="tasklist">
<property name="flat-buttons" type="bool" value="true"/>
</property>
@@ -80,92 +43,14 @@
<property name="plugin-5" type="string" value="indicator">
<property name="blacklist" type="array">
<value type="string" value="libappmenu.so"/>
- <value type="string" value="libdatetime.so"/>
- <value type="string" value="libme.so"/>
- <value type="string" value="libsession.so"/>
</property>
</property>
<property name="plugin-6" type="string" value="separator">
<property name="style" type="uint" value="0"/>
+ <property name="expand" type="bool" value="false"/>
</property>
<property name="plugin-7" type="string" value="clock">
- <property name="digital-format" type="string" value="%a, %d %b %Y %H:%M"/>
- </property>
- <property name="plugin-8" type="string" value="separator">
- <property name="style" type="uint" value="0"/>
- </property>
- <property name="plugin-26" type="string" value="pager">
- <property name="rows" type="uint" value="1"/>
- <property name="show-names" type="bool" value="false"/>
- <property name="workspace-scrolling" type="bool" value="false"/>
- <property name="miniature-view" type="bool" value="true"/>
- </property>
- <property name="plugin-27" type="string" value="separator">
- <property name="style" type="uint" value="0"/>
- </property>
- <property name="plugin-9" type="string" value="actions"/>
- <property name="plugin-10" type="string" value="separator">
- <property name="expand" type="bool" value="true"/>
- <property name="style" type="uint" value="0"/>
- </property>
- <property name="plugin-11" type="string" value="showdesktop"/>
- <property name="plugin-12" type="string" value="separator">
- <property name="style" type="uint" value="1"/>
- </property>
- <property name="plugin-13" type="string" value="launcher">
- <property name="items" type="array">
- <value type="string" value="exo-web-browser.desktop"/>
- </property>
- </property>
- <property name="plugin-14" type="string" value="launcher">
- <property name="items" type="array">
- <value type="string" value="exo-mail-reader.desktop"/>
- </property>
- </property>
- <property name="plugin-15" type="string" value="launcher">
- <property name="items" type="array">
- <value type="string" value="exo-terminal-emulator.desktop"/>
- </property>
- </property>
- <property name="plugin-16" type="string" value="launcher">
- <property name="items" type="array">
- <value type="string" value="xfce-settings-manager.desktop"/>
- </property>
- </property>
- <property name="plugin-17" type="string" value="launcher">
- <property name="items" type="array">
- <value type="string" value="xfce4-appfinder.desktop"/>
- </property>
- </property>
- <property name="plugin-18" type="string" value="launcher">
- <property name="items" type="array">
- <value type="string" value="ubuntu-software-center.desktop"/>
- </property>
- </property>
- <property name="plugin-19" type="string" value="launcher">
- <property name="items" type="array">
- <value type="string" value="abiword.desktop"/>
- </property>
- </property>
- <property name="plugin-20" type="string" value="launcher">
- <property name="items" type="array">
- <value type="string" value="gmusicbrowser.desktop"/>
- </property>
- </property>
- <property name="plugin-24" type="string" value="launcher">
- <property name="items" type="array">
- <value type="string" value="catfish.desktop"/>
- </property>
- </property>
- <property name="plugin-22" type="string" value="separator">
- <property name="style" type="uint" value="1"/>
- </property>
- <property name="plugin-23" type="string" value="directorymenu">
- <property name="base-directory" type="empty"/>
- </property>
- <property name="plugin-25" type="string" value="separator">
- <property name="expand" type="bool" value="true"/>
- <property name="style" type="uint" value="0"/>
+ <property name="digital-format" type="string" value="%d %b, %H:%M"/>
</property>
</property>
<property name="configver" type="int" value="2"/>
=== added file 'etc/xdg/xdg-xubuntu/xfce4/panel/whiskermenu-1.rc'
--- etc/xdg/xdg-xubuntu/xfce4/panel/whiskermenu-1.rc 1970-01-01 00:00:00 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/panel/whiskermenu-1.rc 2014-02-20 09:41:47 +0000
@@ -0,0 +1,5 @@
+button-title=Applications Menu
+button-icon=xubuntu-logo-menu
+show-button-title=false
+show-button-icon=true
+load-hierarchy=true
\ No newline at end of file
=== modified file 'etc/xdg/xdg-xubuntu/xfce4/terminal/terminalrc'
--- etc/xdg/xdg-xubuntu/xfce4/terminal/terminalrc 2012-08-28 23:46:46 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/terminal/terminalrc 2014-02-20 09:41:47 +0000
@@ -1,5 +1,5 @@
[Configuration]
-FontName=Liberation Mono 10
+FontName=DejaVu Sans Mono 9
ColorForeground=#b3b3b3b3b3b3
ColorBackground=#133319992666
ColorCursor=#0f0f49499999
=== modified file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml'
--- etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2013-07-14 19:50:11 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml 2014-02-20 09:41:47 +0000
@@ -5,19 +5,27 @@
<property name="default" type="empty">
<property name="<Alt>F2" type="string" value="xfrun4"/>
<property name="<Primary><Alt>Delete" type="string" value="xflock4"/>
+ <property name="<Primary><Alt>Escape" type="string" value="xkill"/>
<property name="XF86Display" type="string" value="xfce4-display-settings --minimal"/>
<property name="<Super>p" type="string" value="xfce4-display-settings --minimal"/>
<property name="<Primary>Escape" type="string" value="xfce4-popup-applicationsmenu"/>
<property name="Print" type="string" value="xfce4-screenshooter -f"/>
<property name="<Alt>Print" type="string" value="xfce4-screenshooter -w"/>
+ <property name="XF86WWW" type="string" value="exo-open --launch WebBrowser"/>
+ <property name="XF86HomePage" type="string" value="exo-open --launch WebBrowser"/>
<property name="<Super>w" type="string" value="exo-open --launch WebBrowser"/>
+ <property name="XF86Mail" type="string" value="exo-open --launch MailReader"/>
<property name="<Super>m" type="string" value="exo-open --launch MailReader"/>
+ <property name="XF86Explorer" type="string" value="exo-open --launch FileManager"/>
<property name="<Super>f" type="string" value="exo-open --launch FileManager"/>
<property name="<Primary><Alt>t" type="string" value="exo-open --launch TerminalEmulator"/>
<property name="<Super>t" type="string" value="exo-open --launch TerminalEmulator"/>
<property name="<Super>r" type="string" value="xfce4-appfinder"/>
<property name="<Super>e" type="string" value="mousepad"/>
+ <property name="XF86Calculator" type="string" value="gnome-calculator"/>
+ <property name="XF86Music" type="string" value="gmusicbrowser"/>
<property name="<Super>1" type="string" value="gmusicbrowser"/>
+ <property name="XF86Messenger" type="string" value="pidgin"/>
<property name="<Super>2" type="string" value="pidgin"/>
<property name="<Super>3" type="string" value="abiword"/>
<property name="<Super>4" type="string" value="gnumeric"/>
=== added file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml'
--- etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml 1970-01-01 00:00:00 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml 2014-02-20 09:41:47 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-power-manager" version="1.0">
+ <property name="xfce4-power-manager" type="empty">
+ <property name="show-tray-icon" type="uint" value="3"/>
+ </property>
+</channel>
=== modified file 'usr/share/xubuntu/applications/defaults.list'
--- usr/share/xubuntu/applications/defaults.list 2013-03-16 23:01:39 +0000
+++ usr/share/xubuntu/applications/defaults.list 2014-02-20 09:41:47 +0000
@@ -96,7 +96,7 @@
application/x-zoo=file-roller.desktop
application/zip=file-roller.desktop
audio/mpeg=gmusicbrowser.desktop
-audio/mpegurl=gmusicbrowser.desktop
+audio/mpegurl=parole.desktop
audio/vnd.rn-realaudio=parole.desktop
audio/x-flac=gmusicbrowser.desktop
audio/x-m4a=gmusicbrowser.desktop
Follow ups
