public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in gnome-extra/cinnamon: ChangeLog cinnamon-2.6.7.ebuild
@ 2015-06-14 17:39 Alexandre Rostovtsev (tetromino)
  0 siblings, 0 replies; only message in thread
From: Alexandre Rostovtsev (tetromino) @ 2015-06-14 17:39 UTC (permalink / raw
  To: gentoo-commits

tetromino    15/06/14 17:39:40

  Modified:             ChangeLog cinnamon-2.6.7.ebuild
  Log:
  Re-add accidentally dropped upower-pm-utils compatibility, noted by sarnex.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x18E5B6F2D8D5EC8D)

Revision  Changes    Path
1.60                 gnome-extra/cinnamon/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog	14 Jun 2015 01:59:41 -0000	1.59
+++ ChangeLog	14 Jun 2015 17:39:40 -0000	1.60
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.59 2015/06/14 01:59:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.60 2015/06/14 17:39:40 tetromino Exp $
+
+  14 Jun 2015; Alexandre Rostovtsev <tetromino@gentoo.org>
+  cinnamon-2.6.7.ebuild:
+  Re-add accidentally dropped upower-pm-utils compatibility, noted by sarnex.
 
 *cinnamon-2.6.7 (14 Jun 2015)
 



1.2                  gnome-extra/cinnamon/cinnamon-2.6.7.ebuild

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

Index: cinnamon-2.6.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cinnamon-2.6.7.ebuild	14 Jun 2015 01:59:41 -0000	1.1
+++ cinnamon-2.6.7.ebuild	14 Jun 2015 17:39:40 -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/cinnamon-2.6.7.ebuild,v 1.1 2015/06/14 01:59:41 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/cinnamon-2.6.7.ebuild,v 1.2 2015/06/14 17:39:40 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -83,7 +83,7 @@
 RDEPEND="${COMMON_DEPEND}
 	>=gnome-base/dconf-0.4.1
 	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	sys-power/upower[introspection]
+	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
 
 	>=gnome-extra/cinnamon-session-2.4
 	>=gnome-extra/cinnamon-settings-daemon-2.4





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-06-14 17:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-14 17:39 [gentoo-commits] gentoo-x86 commit in gnome-extra/cinnamon: ChangeLog cinnamon-2.6.7.ebuild Alexandre Rostovtsev (tetromino)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox