[gentoo-commits] gentoo-x86 commit in gnome-extra/indicator-applet: indicator-applet-0.2.0.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in gnome-extra/indicator-applet: indicator-applet-0.2.0.ebuild ChangeLog

[Gilles Dartiguelongue (eva)]

eva         09/09/27 23:20:11

  Modified:             indicator-applet-0.2.0.ebuild ChangeLog
  Log:
  Remove useless applet code causing file-collision, bug #286143.
  (Portage version: 2.2_rc42/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  gnome-extra/indicator-applet/indicator-applet-0.2.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/indicator-applet/indicator-applet-0.2.0.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/indicator-applet/indicator-applet-0.2.0.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/indicator-applet/indicator-applet-0.2.0.ebuild?r1=1.2&r2=1.3

Index: indicator-applet-0.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/indicator-applet/indicator-applet-0.2.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- indicator-applet-0.2.0.ebuild	21 Sep 2009 16:15:49 -0000	1.2
+++ indicator-applet-0.2.0.ebuild	27 Sep 2009 23:20:10 -0000	1.3
@@ -1,9 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/indicator-applet/indicator-applet-0.2.0.ebuild,v 1.2 2009/09/21 16:15:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/indicator-applet/indicator-applet-0.2.0.ebuild,v 1.3 2009/09/27 23:20:10 eva Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
 
-EAPI=2
-GCONF_DEBUG=no
 inherit gnome2
 
 DESCRIPTION="A small applet to display information from various applications consistently in the panel"
@@ -31,3 +32,12 @@
 		--disable-dependency-tracking"
 	DOCS="AUTHORS"
 }
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove useless applet, bug #286143
+	sed 's/src-session//' -i Makefile.am Makefile.in || die "sed failed"
+	sed 's/GNOME_FastUserSwitchApplet.server.in//' \
+		-i data/Makefile.am data/Makefile.in || die "sed 2 failed"
+}



1.3                  gnome-extra/indicator-applet/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/indicator-applet/ChangeLog?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/indicator-applet/ChangeLog?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/indicator-applet/ChangeLog?r1=1.2&r2=1.3

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/indicator-applet/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	21 Sep 2009 16:13:00 -0000	1.2
+++ ChangeLog	27 Sep 2009 23:20:10 -0000	1.3
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/indicator-applet
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/indicator-applet/ChangeLog,v 1.2 2009/09/21 16:13:00 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/indicator-applet/ChangeLog,v 1.3 2009/09/27 23:20:10 eva Exp $
+
+  27 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  indicator-applet-0.2.0.ebuild:
+  Remove useless applet code causing file-collision, bug #286143.
 
 *indicator-applet-0.2.0 (21 Sep 2009)