[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     fa74807f873431b5c3067b1e0a4ff0660ff503c1
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 07:57:01 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 08:35:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fa74807f

gnome-base/gnome-control-center: 2.91.92-r2 → 2.91.93

---
 ...e-control-center-2.91.92-fix-desktop-file.patch |   24 --------------------
 ....ebuild => gnome-control-center-2.91.93.ebuild} |    3 --
 .../gnome-control-center-9999.ebuild               |    3 --
 3 files changed, 0 insertions(+), 30 deletions(-)

diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.91.92-fix-desktop-file.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.91.92-fix-desktop-file.patch
deleted file mode 100644
index 9a051b6..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.91.92-fix-desktop-file.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0b25f5a45e53338646c6c87cc540df3db828c0f2 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 23 Mar 2011 15:43:13 +0000
-Subject: gnome-control-center.desktop: Ensure we're in the menu
-
-If we're not categorized, the shell won't pick us up, and that's
-a problem for application tracking.  Per IRC discussion, go
-into System Settings for now.
----
-diff --git a/shell/gnome-control-center.desktop.in.in b/shell/gnome-control-center.desktop.in.in
-index b4182f6..38be8ea 100644
---- a/shell/gnome-control-center.desktop.in.in
-+++ b/shell/gnome-control-center.desktop.in.in
-@@ -5,7 +5,7 @@ Exec=gnome-control-center --overview
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;GTK;Settings;
-+Categories=GNOME;GTK;System;
- OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
---
-cgit v0.9

diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.93.ebuild
similarity index 96%
rename from gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-2.91.93.ebuild
index 734344a..b7ab781 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.93.ebuild
@@ -96,8 +96,5 @@ src_prepare() {
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-	# https://bugs.gentoo.org/show_bug.cgi?id=360057
-	epatch "${FILESDIR}/${P}-fix-desktop-file.patch"
-
 	gnome2_src_prepare
 }

diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
index 645537a..b7ab781 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -96,8 +96,5 @@ src_prepare() {
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 
-	# https://bugs.gentoo.org/show_bug.cgi?id=360057
-	epatch "${FILESDIR}/${PN}-fix-gnomecc-menu.patch"
-
 	gnome2_src_prepare
 }