--- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/changelog +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/changelog @@ -0,0 +1,143 @@ +unity-settings-daemon (14.04.0+14.04.20140606-0ubuntu1) trusty; urgency=medium + + [ Alberto Milone ] + * gsd-xrandr-manager.c: + - Add support for mapping the main touchscreen onto the laptop + display (LP: #1287341). + This makes sure that the input device knows exactly the area + that represents the display when the screen configuration + changes. Note: this doesn't cover the tablet use case. + - Add support for matching displays with touch input devices + according to the reported size. This is particularly + useful on systems that don't use embedded display connectors + i.e. all-in-one systems such as the Dell Optiplex 9030 AIO. + - This work is a partial backport of the upstream work on + touchscreens. When we finally sync with the upstream code + we can drop this. + + -- Ubuntu daily release Fri, 06 Jun 2014 14:39:15 +0000 + +unity-settings-daemon (14.04.0+14.04.20140414-0ubuntu1) trusty; urgency=low + + [ Dmitry Shachnev ] + * Backport g-s-d patch to fix consecutive xkb grp: options not being + stripped, thanks Роман Донченко. + + -- Ubuntu daily release Mon, 14 Apr 2014 10:13:11 +0000 + +unity-settings-daemon (14.04.0+14.04.20140407-0ubuntu1) trusty; urgency=low + + [ William Hua ] + * Revert regression caused by commit 4033. (LP: #1302353) + + -- Ubuntu daily release Mon, 07 Apr 2014 14:55:36 +0000 + +unity-settings-daemon (14.04.0+14.04.20140404-0ubuntu1) trusty; urgency=low + + [ William Hua ] + * Add a private DBus method that allows us to change the current input + source without saving it in GSettings. This is needed for indicator- + keyboard to temporarily switch input sources on the lock screen + without affecting the user's session input source. + + -- Ubuntu daily release Fri, 04 Apr 2014 16:20:28 +0000 + +unity-settings-daemon (14.04.0+14.04.20140402-0ubuntu1) trusty; urgency=low + + [ Jackson Doak ] + * define XF86AudioMicMute as a mic mute key + + [ William Hua ] + * Treat IBus engines with 'default' layouts as 'us'. (LP: #1298740) + + -- Ubuntu daily release Wed, 02 Apr 2014 11:06:42 +0000 + +unity-settings-daemon (14.04.0+14.04.20140310-0ubuntu2) trusty; urgency=medium + + * unity-settings-demon.user-session.upstart: Use XDG_CURRENT_DESKTOP + as the instance specifier for gnome-session upstart jobs, since + other sessions apart from ubuntu will need to use u-s-d (LP: #1224217) + + -- Tim Lunn Wed, 12 Mar 2014 16:45:51 +1100 + +unity-settings-daemon (14.04.0+14.04.20140310-0ubuntu1) trusty; urgency=low + + [ David Henningsson ] + * Fix what-did-you-plug-in dialog showing up behind other windows. + Simplify launching of "unity-control-center sound". (LP: #1287584) + + -- Ubuntu daily release Mon, 10 Mar 2014 17:25:56 +0000 + +unity-settings-daemon (14.04.0+14.04.20140228-0ubuntu1) trusty; urgency=low + + [ Sebastien Bacher ] + * Backport some small upstream bugfixes + * Enforce schemas from the same serie, some ppa are shipping newer + versions of gnome-settings-daemon which drop keys and that's leading + to reports against unity-settings-daemon. That way users are warned + and get to choose what option they want. + + [ Luke Yelavich ] + * Look for gtk-modules related files in the correct location. + + -- Ubuntu daily release Fri, 28 Feb 2014 17:08:18 +0000 + +unity-settings-daemon (14.04.0+14.04.20140225-0ubuntu1) trusty; urgency=low + + [ Lars Uebernickel ] + * media-keys: add support for allow-amplified-volume When that key is + set, the maximum volume is PA_VOLUME_UI_MAX instead of + PA_VOLUME_NORM. This makes it consistent with the sound indicator + and system settings. + + -- Ubuntu daily release Tue, 25 Feb 2014 09:33:38 +0000 + +unity-settings-daemon (14.04.0+14.04.20140221.1-0ubuntu1) trusty; urgency=low + + [ Iain Lane ] + * Instead of autodetecting the scaling factor, default to 1 if the key + is set to '0'. unity-control-center should be calculating the value + and setting this key accordingly, otherwise the Unity and gtk values + can get out of sync. + + -- Ubuntu daily release Fri, 21 Feb 2014 18:45:23 +0000 + +unity-settings-daemon (14.04.0+14.04.20140221-0ubuntu1) trusty; urgency=low + + [ Iain Lane ] + * Always use gnome-screenshot directly, not the gnome-shell screenshot + interface. We aren't using the legacy keygrabber under Unity, but + neither can we use gnome-shell's interface since Unity doesn't + implement it. (LP: #1282649) + + -- Ubuntu daily release Fri, 21 Feb 2014 13:48:58 +0000 + +unity-settings-daemon (14.04.0+14.04.20140219-0ubuntu1) trusty; urgency=low + + [ David Henningsson ] + * Handle unknown audio jack devices. + + [ William Hua ] + * Revert the legacy key grabber. (LP: #1226962) + + [ Sebastien Bacher ] + * backport upstream change to support hi-dpi screens/scaling. You can + change the scaling value by writting the + "org.gnome.desktop.interface scaling-factor" gsettings key + + -- Ubuntu daily release Wed, 19 Feb 2014 10:44:06 +0000 + +unity-settings-daemon (14.04.0-0ubuntu2) trusty; urgency=medium + + * Change power notifications from popups (expire never), to notify-osd + bubbles (default timeout). + * Start on gnome-session (ubuntu instance) only (for now). + + -- Dimitri John Ledkov Mon, 17 Feb 2014 11:35:35 +0000 + +unity-settings-daemon (14.04.0-0ubuntu1) trusty; urgency=low + + * Fork gnome-settings-daemon so we can maintain it for Unity 7 until it is + replaced by the Unity 8 equivalent. + + -- Robert Ancell Fri, 07 Feb 2014 11:44:36 +0000 --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/compat +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/compat @@ -0,0 +1 @@ +9 --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/control +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/control @@ -0,0 +1,97 @@ +Source: unity-settings-daemon +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +Build-Depends: cdbs, + debhelper (>= 9), + gnome-pkg-tools, + gtk-doc-tools, + dh-autoreconf, + autotools-dev, + intltool (>= 0.37.1), + libdbus-glib-1-dev (>= 0.74), + libglib2.0-dev (>= 2.35.3), + libgtk-3-dev (>= 3.7.8), + libnotify-dev (>= 0.7.0), + libxt-dev, + libxi-dev, + libfontconfig1-dev, + libxext-dev, + libx11-dev, + libxtst-dev, + gsettings-desktop-schemas-dev (>= 3.7.2.1), + libgnome-desktop-3-dev (>= 3.7.90), + libpulse-dev (>= 1:2.0), + libasound2-dev, + librsvg2-dev (>= 2.36.2), + libcanberra-gtk3-dev, + libcups2-dev, + libpolkit-gobject-1-dev, + libaccountsservice-dev (>= 0.6.34), + libappindicator3-dev (>= 0.4.90), + hwdata, + libupower-glib-dev (>= 0.9.11), + libcolord-dev (>= 0.1.12), + liblcms2-dev, + libnss3-dev, + libgudev-1.0-dev, + libwacom-dev (>= 0.7), + xserver-xorg-input-wacom, + libgnomekbd-dev (>= 3.5.1), + libxklavier-dev, + libsystemd-login-dev (>= 183), + libibus-1.0-dev (>= 1.5.0) +Standards-Version: 3.9.3 + +Package: unity-settings-daemon +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + accountsservice (>= 0.6.34), + gsettings-desktop-schemas (>= 3.7.2.1), + nautilus-data (>= 2.91.3-1), + gnome-settings-daemon-schemas (>= 3.8), + gnome-settings-daemon-schemas (<< 3.10), + gsettings-ubuntu-schemas (>= 0.0.1+14.04.20140224), +Recommends: ibus (>= 1.5.0), + pulseaudio, + systemd-services +Pre-Depends: ${misc:Pre-Depends} +Breaks: rhythmbox (<< 0.11.5), + banshee (<< 0.13.2+dfsg-7), + totem (<< 2.22.0), + gnome-control-center (<< 1:3.6.3-0ubuntu35), + gnome-session (<< 3.9.90-0ubuntu6), + gnome-screensaver (<< 2.28.0), + gnome-color-manager (<< 3.0), + unity (<< 7.1.2+14.04.20140214.1-0ubuntu1), + unity-greeter (<< 0.2.1-0ubuntu1), + indicator-datetime (<< 12.10.3daily13.03.26) +Suggests: x11-xserver-utils, + gnome-screensaver, + metacity | x-window-manager +Description: daemon handling the Unity session settings + This package contains the daemon which is responsible for setting the + various parameters of a Unity session and the applications that run + under it. It handles the following kinds of settings: + . + * Keyboard: layout, accessibility options, shortcuts, media keys + * Clipboard management + * Theming: background, icons, GTK+ applications + * Cleanup of unused files + * Mouse: cursors, speed, accessibility options + * Startup of other daemons: screensaver, sound daemon + * Typing break + . + It also sets various application settings through X resources and + freedesktop.org XSETTINGS. + +Package: unity-settings-daemon-dev +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libdbus-glib-1-dev (>= 0.74), + libglib2.0-dev (>= 2.35.3) +Description: Headers for building applications communicating with unity-settings-daemon + This package contains header files required to build applications that + communicate with the Unity settings daemon over D-Bus. --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/copyright +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/copyright @@ -0,0 +1,72 @@ +This package was debianized by Sebastien Bacher on +Wed, 16 Jan 2008 11:12:19 +0100. + +It was downloaded from http://ftp.acc.umu.se/pub/GNOME/sources/gnome-settings-daemon + +Upstream Authors: + + Jonathan Blandford + William Jon McCann + +Copyright: + + Copyright © 2001 Ximian, Inc. + Copyright (C) 2007 William Jon McCann + Copyright (C) 2000 Helix Code, Inc + Copyright © 2007 Matthias Clasen + Copyright (C) 2007 Rodrigo Moya + Copyright (C) 2007 Anders Carlsson + Copyright © 2004 Red Hat, Inc. + Copyright 2002 Sun Microsystems, Inc. + Copyright © 2005,2006 Novell, Inc. + Copyright © 2007 The GNOME Foundation + Copyright (C) 2002-2005 - Paolo Maggi + Copyright (C) 2002 Red Hat, Inc. + Copyright 1998, 2001 Tim Janik + Copyright � 2001 Udaltsoft + Copyright (C) 2001, 2002, 2003 Bastien Nocera + Copyright (C) 2003 Ross Burton + Copyright © 2001 Jonathan Blandford + +License: + + This package is free software; you can redistribute it and/or modify + 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 complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +eggaccelerators.h, eggaccelerators.c + +License: + + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser 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 complete text of the GNU Lesser General +Public License can be found in `/usr/share/common-licenses/LGPL'. + +The Debian packaging is (C) 2008, Sebastien Bacher and +is licensed under the GPL, see above. --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/gnome-update-wallpaper-cache.c +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/gnome-update-wallpaper-cache.c @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2010 Canonical, Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program 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 version 3.0 for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Authored by Didier Roche + * + * Bug: https://bugs.launchpad.net/bugs/530024 + */ + +#include +#include +#define GNOME_DESKTOP_USE_UNSTABLE_API +#include + +static GOptionEntry entries[] = +{ + { NULL } +}; + +main (int argc, char *argv[]) +{ + GOptionContext *context = NULL; + GError *error = NULL; + + GdkScreen *screen; + GdkRectangle rect; + GnomeBG *bg; + GSettings *settings; + GdkPixbuf *pixbuf; + + gdk_init (&argc, &argv); + + context = g_option_context_new ("- refresh wallpaper cache"); + g_option_context_add_main_entries (context, entries, NULL); + if (!g_option_context_parse (context, &argc, &argv, &error)) { + g_printerr ("option parsing failed: %s\n", error->message); + g_option_context_free(context); + g_error_free (error); + return (1); + } + if (context) + g_option_context_free (context); + + /* cache only the first monitor */ + screen = gdk_screen_get_default (); + gdk_screen_get_monitor_geometry (screen, 0, &rect); + + bg = gnome_bg_new (); + settings = g_settings_new ("org.gnome.desktop.background"); + gnome_bg_load_from_preferences (bg, settings); + + pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, rect.width, rect.height); + gnome_bg_draw (bg, pixbuf, screen, FALSE); + + g_object_unref (settings); + + return (0); +} --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/rules +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/rules @@ -0,0 +1,29 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/class/gnome.mk + +LDFLAGS += -Wl,-O1 -Wl,-z,defs -Wl,--warn-unresolved-symbols -Wl,--as-needed + +DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act +DEB_CONFIGURE_SCRIPT := ./autogen.sh +DEB_CONFIGURE_EXTRA_FLAGS = --enable-systemd --disable-packagekit --enable-ibus + +build/unity-settings-daemon:: + gcc -o gnome-settings-daemon/gnome-update-wallpaper-cache debian/gnome-update-wallpaper-cache.c `pkg-config --cflags --libs glib-2.0 gdk-3.0 gdk-x11-3.0 gio-2.0 gnome-desktop-3.0` + +install/unity-settings-daemon:: + /usr/bin/install -c gnome-settings-daemon/gnome-update-wallpaper-cache 'debian/tmp/usr/lib/unity-settings-daemon' + install -m 644 -D debian/unity-settings-daemon.user-session.upstart debian/unity-settings-daemon/usr/share/upstart/sessions/unity-settings-daemon.conf + install -m 644 -D debian/unity-settings-daemon.user-session.desktop debian/unity-settings-daemon/usr/share/upstart/xdg/autostart/unity-settings-daemon.desktop + +binary-install/unity-settings-daemon:: + find debian -name '*.a' -delete + find debian -name '*.la' -delete + +common-binary-post-install-arch:: list-missing + +clean:: + rm -f gnome-settings-daemon/gnome-update-wallpaper-cache + --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/source/format +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/source/format @@ -0,0 +1 @@ +1.0 --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/source_unity-settings-daemon.py +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/source_unity-settings-daemon.py @@ -0,0 +1,16 @@ +import os, apport.packaging, re +from apport.hookutils import * + +def add_info(report): + # the issue is not in the unity-settings-daemon code so reassign + if "Stacktrace" in report and "/usr/libg/nome-settings-daemon-3.0" in report["Stacktrace"]: + for words in report["Stacktrace"].split(): + if words.startswith("/usr/lib/unity-settings-daemon-3.0"): + if apport.packaging.get_file_package(words) != 'unity-settings-daemon': + report.add_package_info(apport.packaging.get_file_package(words)) + return + # update the title to reflect the component and tab + component = re.compile("lib(\w*).so").search(words).groups(1)[0] + report['Title'] = '[%s]: %s' % (component, report.get('Title', report.standard_title())) + report['Tags'] = '%s %s' % (report.get('Tags', ""), component) + break # Stop on the first .so that's the interesting one --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/unity-settings-daemon-dev.install +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/unity-settings-daemon-dev.install @@ -0,0 +1,2 @@ +usr/include +usr/lib/pkgconfig --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/unity-settings-daemon.gsettings-override +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/unity-settings-daemon.gsettings-override @@ -0,0 +1,3 @@ +[org.gnome.desktop.wm.keybindings] +switch-input-source=['space'] +switch-input-source-backward=['space'] --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/unity-settings-daemon.install +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/unity-settings-daemon.install @@ -0,0 +1,8 @@ +etc +usr/lib/unity-settings-daemon* +usr/share/icons +usr/share/locale +usr/share/unity-settings-daemon +usr/share/polkit-1 +debian/source_unity-settings-daemon.py /usr/share/apport/package-hooks + --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/unity-settings-daemon.links +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/unity-settings-daemon.links @@ -0,0 +1 @@ +usr/lib/unity-settings-daemon/unity-settings-daemon usr/bin/unity-settings-daemon --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/unity-settings-daemon.maintscript +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/unity-settings-daemon.maintscript @@ -0,0 +1,7 @@ +rm_conffile /etc/gnome/config/Editres.ad 3.6.3-0ubuntu3~ +rm_conffile /etc/gnome/config/Emacs.ad 3.6.3-0ubuntu3~ +rm_conffile /etc/gnome/config/General.ad 3.6.3-0ubuntu3~ +rm_conffile /etc/gnome/config/Motif.ad 3.6.3-0ubuntu3~ +rm_conffile /etc/gnome/config/Tk.ad 3.6.3-0ubuntu3~ +rm_conffile /etc/gnome/config/Xaw.ad 3.6.3-0ubuntu3~ +rm_conffile /etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf 3.6.4-0ubuntu7~ --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/unity-settings-daemon.postinst +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/unity-settings-daemon.postinst @@ -0,0 +1,21 @@ +#! /bin/sh +set -e + +#DEBHELPER# + +# Remove obsolete conffiles + +case "$1" in +configure) + if dpkg --compare-versions "$2" lt-nl "2.24.1"; then + rm -rf /etc/gnome/config/xrdb + fi + if dpkg --compare-versions "$2" lt-nl "2.26.1"; then + rm -f /etc/xdg/autostart/gnome-settings-daemon.desktop + fi + if dpkg --compare-versions "$2" lt-nl "3.6.3-0ubuntu3"; then + if [ -d /etc/gnome/config ]; then + rmdir --ignore-fail-on-non-empty /etc/gnome/config + fi + fi +esac --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/unity-settings-daemon.user-session.desktop +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/unity-settings-daemon.user-session.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Type=Application +Name=Unity Settings Daemon +Exec=/usr/lib/unity-settings-daemon/unity-settings-daemon +Hidden=true --- unity-settings-daemon-14.04.0+14.04.20140606.orig/debian/unity-settings-daemon.user-session.upstart +++ unity-settings-daemon-14.04.0+14.04.20140606/debian/unity-settings-daemon.user-session.upstart @@ -0,0 +1,8 @@ +description "The Unity Settings Daemon" +author "Dimitri John Ledkov " + +start on started dbus and starting gnome-session INSTANCE!=GNOME +stop on stopping gnome-session + +respawn +exec /usr/lib/unity-settings-daemon/unity-settings-daemon