Fix screen brightness settings by using Vivid version of unity-base/u…

…nity-settings-daemon

NOTES

@@ -28,11 +28,11 @@ dev-libs/libdbusmenu			# See "Using portage tree libindicate packages" item abov
 dev-libs/libindicator			# See "Using portage tree libindicate packages" above
 dev-util/gdbus-codegen			# Needs to be maintained in line with dev-libs/glib (see above)
 gnome-base/gconf			# Installs 'update-gconf-defaults' script used by compiz to install compizconfig default settings into gconf registry
-gnome-base/gnome-core-apps		# Included to pull in lower 3.8 version of empathy for Ubuntu-Online-Accounts (UOA) integration
+gnome-base/gnome-core-apps		# Included to pull in lower versions of empathy, gnome-menus and nautilus
 gnome-base/gnome-desktop		# Patched to sync user selected background to accountsservice as used by lightdm background screen
 gnome-base/gnome-menus			# Needed for some menu patches but mostly to set XDG_MENU_PREFIX when running in gnome fallback mode
 gnome-base/gnome-session		# Installs session files for launching Unity desktop
-gnome-base/gnome-settings-daemon	# [Trusty] New unity-settings-daemon relies on files created from patchset
+gnome-base/gnome-settings-daemon	# unity-settings-daemon relies on files created from patchset, compiz at runtime needs 'terminal' key in 'org.gnome.settings-daemon.plugins.media-keys' schema
 gnome-base/gsettings-desktop-schemas	# Includes Unity desktop settings patches
 gnome-base/nautilus			# Give progressbar on Dash launcher nautilus icon
 gnome-extra/nm-applet			# Shows nm-applet in indicator panel

README_utopic_known_issues.txt

@@ -16,16 +16,11 @@
   * Ubuntu's development of these packages lags greatly behind the changes Gnome upstream make and so also lags behind what
 	Gnome versions become available and are subsequently dropped in the portage tree
   * The most important packages affected are as follows:
-	gnome-base/gnome-control-center
 	gnome-base/gnome-desktop
 	gnome-base/gnome-session
 	gnome-base/gnome-settings-daemon
 	unity-base/unity-settings-daemon (Ubuntu fork of gnome-base/gnome-settings-daemon)
 	unity-base/unity-control-center (Ubuntu fork of gnome-base/gnome-control-center)
-  * The flow-on effect of this development lag and subsequent version mismatch is that some updated features in Gnome, break in Unity
-	An example of this is sys-power/upower support. Gnome >=3.12 needs upower-0.99 but unity-control-center and unity-settings-daemon are not yet compatible with upower-0.99 (LP# 1330037)
-		- This has broken laptop power settings in unity-control-center -
-	Another example is Gnome >=3.10 moving DisplayConfig settings (xrandr, color, power) from gnome-desktop into x11-wm/mutter as a dbus interface (LP# 1228765)
-		- This has broken multi-monitor display setups and laptop brightness settings, changing screen resolution lacks confirmation dialog -
+  * The flow-on effect of this development lag and subsequent version mismatch is that some updated features in Gnome can break in Unity
 
 - Xrandr does not work in Mir (unable to get a list of valid screen resolutions other than the one being used, screen rotate does nothing)

unity-base/unity-settings-daemon/Manifest

@@ -1,10 +1,5 @@
 AUX unity-settings-daemon-3.7.90-short-touchpad-timeout.patch 960 SHA256 d69495e4fca23d7faa7c9fefb0ec42d0d7d0769d3830f8cde08d5caea015138b SHA512 c431973f6d5b461a3d8bc1702522ac20d3c54252341e4ba5f712dd524a322e28d1a6a5f89920e9be9438217a6c418c5b254112be68f47d2ceb6b62790497e16f WHIRLPOOL dae508b8717d31bd6fa525d080c8f5d1e065b8d8c43102263760101cb48a7554e86887a5956efb3695023f412806fa67176f00d4de6ee614c630c56b3c46bfc6
 AUX unity-settings-daemon-optional-color-wacom.patch 2779 SHA256 8b109e579386827f2e8fd3a540a2cbd31c63009ce26a29f4e24602d343e9a414 SHA512 314eb8261b49d5176c2ff34a02e59eb36119c714e935c6b170d4565fe11ca322d441cb5f8e4886e1a05f7a853ff38ad16bb736cda64536c3d480ed74509052aa WHIRLPOOL c22287c735273f83108c5b75ea853eb3001d92595ee6d3480f9de2b3b118074adf261545b5383ca7f720a69f374df9e5172b4d0d7ffbe55c3a74581a48efa8d0
-AUX unity-settings-daemon_backlight-percent-fix.diff 944 SHA256 45fa0a5ffcd37ec69b499efdf72f8dbdd19c3792a1422bb7de4c612c3a10e980 SHA512 9c814bf75d50f7a7e697c08881ad69b2c6a13a17214bd8cb0081850e44826121360e5224648e9840f53bb44f17c49c47d1ad35f22f0600ef0676011f4412d4fa WHIRLPOOL 9291bedb5f314b5ddbcdefe3be8dffe9c55759a6fbbe1b45813280afb8f81da1b31b44c68212562c52c95f80585a421ae49424648176de47c77958f8adec4f26
-AUX upower-0.99_support.diff 2335 SHA256 190cefe444b149ed2add3f14534e72786fbe7e3268ed31ee3e7f5d8cd11c3a75 SHA512 126606ec41ed65154ab4c0bd7786833b66bac8d3e44222d14fd8d5947f42eb4b7a13835085fe2dad696e33b72ac3e8db774a9686ec488d51b9b3cace2b407eb2 WHIRLPOOL 4999752599b5007780cec4dea8a50cc2aceb7b0dd1fa31adf9f722de78b4ddf678e1ec63a88cc4e13e41e511bb94a6ba2a721dac47404f561f3b909aa3a6e2cd
-DIST unity-settings-daemon_14.04.0+14.10.20141014-0ubuntu1.diff.gz 8427 SHA256 b719b4799b8497bdde4c4c211bdee4d9ac32bad750031d79e9fe9e17a59f38fa SHA512 c49f4e564961398be9682294c0dc72c7cbf8726df87cfb6b8e94c0d7f05507458071f3fbe07f85fd8697f24bbc742eb488c1fa66888fcdd18158bb1bf2b33fbd WHIRLPOOL ac989a7b6fcf6483080000dc8f067de71f1bf02a2e87e7f3c401f055fbbcea4b4c8fbbdb5272f3af5e32984adcb305d576b66fc5de53f3ddc8f4771ee1dd31fb
-DIST unity-settings-daemon_14.04.0+14.10.20141014.orig.tar.gz 2763234 SHA256 a0742ae01de9873f9e9739a4c1eace6f6341575c07bbac42994d3419270ac419 SHA512 1ac9e3d0bad9cc923834b518aa0eeb813db62e664a25a4a4436752d67ba305a95c7787f9216169f7cfa0f43ce718969e8611da5d80752174766b10b094674f8f WHIRLPOOL 3aae7d8b4387230b3c5b753fa7c76d84a5c0020f01111b38a3426e311b19c1b221413399f4a796ae0820ee70648a8c3984050bd563f6b4f3c552b985a65d5631
-DIST unity-settings-daemon_15.04.1+15.04.20150107-0ubuntu1.diff.gz 8722 SHA256 82c690783fabf12f6afb7041483d822913f9d1ef6543de4ab351b03aa2ba5d28 SHA512 1aacfbcbdc91eaa9a1aa9e4b0ee9b035a888bb990e41fda75cbdc8d33a6d3a62e1f622c4f4685920b9c74d914b271d47cdb4c083131f0c5b9ef27b16104c4bf5 WHIRLPOOL ebf13ec8f9f226b36350065a8632726f486b67feda7d1e0881441072202e601d3c0dc5c24b7b112de6839da242974184d0d20a00d13b085ccdcd5dfd460abb5e
-DIST unity-settings-daemon_15.04.1+15.04.20150107.orig.tar.gz 2763547 SHA256 ce92eb1fd517a98d69d07e8c73bfe4d874a419d06ef621be77a07e4c33cf8ce0 SHA512 20c2555df5f5b4844562e11b85591662111eb24d232aaaccab708f8592cb91fcbbcce2080dc6edf0a1ba0ae597c25fd5b0544c3ba619c924180d1f8e294e6220 WHIRLPOOL 16ab6e8115ec0a0c40eb61abc2de7c3e847e7ba1a81a024b6f9f2720b4a0212cc92406adc94da2b2e580828b59cbf45da973e449c325dee6f6c6f49cc1918d05
-EBUILD unity-settings-daemon-14.04.0_p0_p01_p20141014.ebuild 4602 SHA256 9d285c4f3e90c112ea400cb3ddfc86a7668ed6523136921be119dd1fd0d6f81b SHA512 6b626b8c142bb89fec0b2fdb2ab74ce8457ac4e99e787457a24bc74ecec2791ee8647061528131972d4a1bc79dfe80bf6f7108d0d3b014e65e1c119532feb50d WHIRLPOOL 1c037bd8367d76c4a53bbea378f8398bbd237ca9e79273040ea0516b98eff1a4d54e487c28f6a2070c594acebdf1d34754a09959f10ba1e916429ed62cb849e3
-EBUILD unity-settings-daemon-15.04.1_p0_p01_p20150107.ebuild 4602 SHA256 856f588532c9ffa2fb8682135d0ab283544f5cd1d9d1767f81e40922fe1af397 SHA512 9871814e0e56d1ef749116a5d5a901242ca5859e146d98661bdfc66013ee5f41ecaffb7a1eb89f522c306715142026d36a95e53a2b401763fd1f4a0bd3cf4f4e WHIRLPOOL 7f6fbcda4bb4ddf9b9cff57c8fb3451e164143717d2ad271d97da91152af92ec58b8a300a88239112cd850b71335d6fc31e7a7f414b4e57809e44408d6e63187
+DIST unity-settings-daemon_15.04.1+15.04.20150205-0ubuntu1.diff.gz 8756 SHA256 90e687b02724a4077e71e9275bd2dcf4d53ecf4806ca62cc0303aec4b9797c30 SHA512 9316041d6d2ab16b443f7667ef042854c5ab407fc0c4e95c5fa0521b10a7ff2088b229b9aae391709c06917185285db1c00f391b2ab6b0aa50f772ac377370ca WHIRLPOOL 23bc6d6574711bbbce76054cdfbbe571b537e743544f0a6428427b5c76ce9dcaa854312f950e213fcf0d575cfab9ad4ffc5e885f85fc3803611ebd09ee9e87b6
+DIST unity-settings-daemon_15.04.1+15.04.20150205.orig.tar.gz 2763681 SHA256 79243d4fa20d87e6aa19140fbd7ce18fa5031922cd8835e3f8183feb30525f76 SHA512 b039ad444d94b207d62648e733e5d6d0956167f26c97b47cbfea4443af17f298b211df4182f9b93f5a1a40eebe76f76a8fbaf8b3d1b9861b2944da1c0872e422 WHIRLPOOL f80d1230bfef865060581aec92a3eec1df5c7683b96033ed309a5bbb74529e3da6b5f25b902c9469308b2ad1d87ce58acf66830dd68161d23524709fc49f8c02
+EBUILD unity-settings-daemon-15.04.1_p0_p01_p20150205.ebuild 4497 SHA256 177325902b6b874c49f48d36c5ef08e53112543601ba2ddff50eb770aea7bd34 SHA512 7afa44db330bf9ba02a2f35403248dbc35eee288ae29fe31a9147d568004a4dfa8cda10130f445dc79c2cb717fa9cf4594525d4ded62f42e43f3d2f807ff53a9 WHIRLPOOL 816e909e8f9c1755b7480152e917059da6c66c123752181914f4a864b3950c52a8a8a900e29d43e0769145579333cdcec62457adfbbd44cb8dec6f4e8b51ae9f

unity-base/unity-settings-daemon/unity-settings-daemon-14.04.0_p0_p01_p20141014.ebuild → unity-base/unity-settings-daemon/unity-settings-daemon-15.04.1_p0_p01_p20150205.ebuild

@@ -6,7 +6,7 @@ EAPI="5"
 GNOME2_LA_PUNT="yes"
 GCONF_DEBUG="no"
 
-URELEASE="utopic"
+URELEASE="vivid"
 inherit autotools base eutils flag-o-matic gnome2 virtualx ubuntu-versionator
 
 UURL="mirror://ubuntu/pool/main/u/${PN}"
@@ -89,9 +89,6 @@ src_prepare() {
 	# Ubuntu patchset #
 	epatch -p1 "${WORKDIR}/${MY_P}${UVER_PREFIX}-${UVER}.diff"  # This needs to be applied for the debian/ directory to be present #
 
-	# Backport Upower-0.99 support from Vivid Vervet #
-	epatch -p1 "${FILESDIR}/upower-0.99_support.diff"
-
 	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
 	# Apparently this change severely affects touchpad usability for some
 	# people, so revert it if USE=short-touchpad-timeout.