[gentoo-commits] gentoo-x86 commit in gnome-extra/cinnamon-settings-daemon: ChangeLog cinnamon-settings-daemon-2.6.2.ebuild

[gentoo-commits] gentoo-x86 commit in gnome-extra/cinnamon-settings-daemon: ChangeLog cinnamon-settings-daemon-2.6.2.ebuild

[Alexandre Rostovtsev (tetromino)]

tetromino    15/06/14 04:02:35

  Modified:             ChangeLog cinnamon-settings-daemon-2.6.2.ebuild
  Log:
  Re-add accidentally dropped upower-pm-utils compatibility (bug #552050, thanks to salikov.alexey).
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

Revision  Changes    Path
1.16                 gnome-extra/cinnamon-settings-daemon/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog?r1=1.15&r2=1.16

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ChangeLog	14 Jun 2015 01:57:18 -0000	1.15
+++ ChangeLog	14 Jun 2015 04:02:35 -0000	1.16
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/cinnamon-settings-daemon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.15 2015/06/14 01:57:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/ChangeLog,v 1.16 2015/06/14 04:02:35 tetromino Exp $
+
+  14 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  cinnamon-settings-daemon-2.6.2.ebuild:
+  Re-add accidentally dropped upower-pm-utils compatibility (bug #552050,
+  thanks to salikov.alexey).
 
 *cinnamon-settings-daemon-2.6.2 (13 Jun 2015)
 



1.2                  gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild?r1=1.1&r2=1.2

Index: cinnamon-settings-daemon-2.6.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cinnamon-settings-daemon-2.6.2.ebuild	14 Jun 2015 01:57:18 -0000	1.1
+++ cinnamon-settings-daemon-2.6.2.ebuild	14 Jun 2015 04:02:35 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild,v 1.1 2015/06/14 01:57:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.6.2.ebuild,v 1.2 2015/06/14 04:02:35 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -29,7 +29,7 @@
 	>=media-sound/pulseaudio-0.9.16:0=
 	sys-apps/dbus
 	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.9.11:=
+	|| ( >=sys-power/upower-0.9.11:= sys-power/upower-pm-utils )
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.9.10:3
 	>=x11-libs/libnotify-0.7.3:0=