public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in gnome-extra/cinnamon-screensaver: cinnamon-screensaver-2.2.3.ebuild ChangeLog
@ 2014-05-11  2:30 Alexandre Rostovtsev (tetromino)
  0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Rostovtsev (tetromino) @ 2014-05-11  2:30 UTC (permalink / raw
  To: gentoo-commits

tetromino    14/05/11 02:30:15

  Modified:             cinnamon-screensaver-2.2.3.ebuild ChangeLog
  Log:
  Prevent file collision with cinnamon-1.8.8.1-r2
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4F1D4860)

Revision  Changes    Path
1.2                  gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild

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

Index: cinnamon-screensaver-2.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cinnamon-screensaver-2.2.3.ebuild	10 May 2014 18:21:06 -0000	1.1
+++ cinnamon-screensaver-2.2.3.ebuild	11 May 2014 02:30:14 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild,v 1.1 2014/05/10 18:21:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild,v 1.2 2014/05/11 02:30:14 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -37,7 +37,9 @@
 	pam? ( virtual/pam )
 	systemd? ( >=sys-apps/systemd-31:0= )
 "
+# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
 RDEPEND="
+	!~gnome-extra/cinnamon-1.8.8.1
 	!systemd? ( sys-auth/consolekit )
 "
 DEPEND="${COMMON_DEPEND}



1.2                  gnome-extra/cinnamon-screensaver/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog	10 May 2014 18:21:06 -0000	1.1
+++ ChangeLog	11 May 2014 02:30:14 -0000	1.2
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/cinnamon-screensaver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.1 2014/05/10 18:21:06 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.2 2014/05/11 02:30:14 tetromino Exp $
+
+  11 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
+  cinnamon-screensaver-2.2.3.ebuild:
+  Prevent file collision with cinnamon-1.8.8.1-r2
 
 *cinnamon-screensaver-2.2.3 (10 May 2014)
 





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in gnome-extra/cinnamon-screensaver: cinnamon-screensaver-2.2.3.ebuild ChangeLog
@ 2014-07-01  8:46 Pacho Ramos (pacho)
  0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos (pacho) @ 2014-07-01  8:46 UTC (permalink / raw
  To: gentoo-commits

pacho       14/07/01 08:46:09

  Modified:             cinnamon-screensaver-2.2.3.ebuild ChangeLog
  Log:
  Add missing DEPEND on gnome-common (#515918 by Patrick Lauer)
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

Revision  Changes    Path
1.3                  gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild

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

Index: cinnamon-screensaver-2.2.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cinnamon-screensaver-2.2.3.ebuild	11 May 2014 02:30:14 -0000	1.2
+++ cinnamon-screensaver-2.2.3.ebuild	1 Jul 2014 08:46:09 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild,v 1.2 2014/05/11 02:30:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.2.3.ebuild,v 1.3 2014/07/01 08:46:09 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -44,6 +44,7 @@
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.35
+	gnome-base/gnome-common
 	sys-devel/gettext
 	virtual/pkgconfig
 	x11-proto/xextproto



1.3                  gnome-extra/cinnamon-screensaver/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	11 May 2014 02:30:14 -0000	1.2
+++ ChangeLog	1 Jul 2014 08:46:09 -0000	1.3
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/cinnamon-screensaver
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.2 2014/05/11 02:30:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon-screensaver/ChangeLog,v 1.3 2014/07/01 08:46:09 pacho Exp $
+
+  01 Jul 2014; Pacho Ramos <pacho@gentoo.org> cinnamon-screensaver-2.2.3.ebuild:
+  Add missing DEPEND on gnome-common (#515918 by Patrick Lauer)
 
   11 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   cinnamon-screensaver-2.2.3.ebuild:
@@ -11,4 +14,3 @@
   10 May 2014; Alexandre Rostovtsev <tetromino@gentoo.org>
   +cinnamon-screensaver-2.2.3.ebuild, +metadata.xml:
   New package for Cinnamon 2.x
-





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-07-01  8:46 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-11  2:30 [gentoo-commits] gentoo-x86 commit in gnome-extra/cinnamon-screensaver: cinnamon-screensaver-2.2.3.ebuild ChangeLog Alexandre Rostovtsev (tetromino)
  -- strict thread matches above, loose matches on Subject: below --
2014-07-01  8:46 Pacho Ramos (pacho)

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