From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-329442-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Q3HWO-0003rv-J8
for garchives@archives.gentoo.org; Sat, 26 Mar 2011 00:38:28 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 78533E0603;
Sat, 26 Mar 2011 00:37:56 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 385AFE0603
for <gentoo-commits@lists.gentoo.org>; Sat, 26 Mar 2011 00:37:56 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 98DD41B40FC
for <gentoo-commits@lists.gentoo.org>; Sat, 26 Mar 2011 00:37:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 05CE18006A
for <gentoo-commits@lists.gentoo.org>; Sat, 26 Mar 2011 00:37:55 +0000 (UTC)
From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" <nirbheek@gentoo.org>
Message-ID: <e1ba1983e56987616a4d083385f211b470d03cb3.nirbheek@gentoo>
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
X-VCS-Repository: proj/gnome
X-VCS-Files: gnome-base/gnome-control-center/files/gnome-control-center-2.91.92-fix-desktop-file.patch gnome-base/gnome-control-center/files/gnome-control-center-fix-gnomecc-menu.patch gnome-base/gnome-control-center/gnome-control-center-2.91.92-r1.ebuild gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
X-VCS-Directories: gnome-base/gnome-control-center/ gnome-base/gnome-control-center/files/
X-VCS-Committer: nirbheek
X-VCS-Committer-Name: Nirbheek Chauhan
X-VCS-Revision: e1ba1983e56987616a4d083385f211b470d03cb3
Date: Sat, 26 Mar 2011 00:37:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: c22745cc15b3d7ab59ae3538ae4ebb4b
commit: e1ba1983e56987616a4d083385f211b470d03cb3
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 23:17:04 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 23:17:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D=
commit;h=3De1ba1983
gnome-base/gnome-control-center: proper fix for desktop file problems
---
...e-control-center-2.91.92-fix-desktop-file.patch | 24 ++++++++++++++=
+++++
.../gnome-control-center-fix-gnomecc-menu.patch | 25 --------------=
------
...uild =3D> gnome-control-center-2.91.92-r2.ebuild} | 2 +-
3 files changed, 25 insertions(+), 26 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/gno=
me-control-center-2.91.92-fix-desktop-file.patch
new file mode 100644
index 0000000..9a051b6
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.91.92-=
fix-desktop-file.patch
@@ -0,0 +1,24 @@
+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-cont=
rol-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=3Dgnome-control-center --overview
+ Terminal=3Dfalse
+ Type=3DApplication
+ StartupNotify=3Dtrue
+-Categories=3DGNOME;GTK;Settings;
++Categories=3DGNOME;GTK;System;
+ OnlyShowIn=3DGNOME;
+ X-GNOME-Bugzilla-Bugzilla=3DGNOME
+ X-GNOME-Bugzilla-Product=3Dgnome-control-center
+--
+cgit v0.9
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-f=
ix-gnomecc-menu.patch b/gnome-base/gnome-control-center/files/gnome-contr=
ol-center-fix-gnomecc-menu.patch
deleted file mode 100644
index 850e3e8..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-fix-gnom=
ecc-menu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e9bd833af23596529f5007409c75b79227118d8a Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@gentoo.org>
-Date: Wed, 23 Mar 2011 12:25:55 +0530
-Subject: [PATCH] shell: fix shell launcher .desktop file name in gnomecc=
.menu
-
----
- shell/gnomecc.menu | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/shell/gnomecc.menu b/shell/gnomecc.menu
-index edf829a..8f1c34d 100644
---- a/shell/gnomecc.menu
-+++ b/shell/gnomecc.menu
-@@ -39,7 +39,7 @@
-=20
- <!-- Avoid the shell having a launcher for itself -->
- <Exclude>
-- <Filename>gnome-control-center.desktop</Filename>
-+ <Filename>gnome-shell.desktop</Filename>
- </Exclude>
-=20
- <!-- Personal category -->
---=20
-1.7.3.4
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.92=
-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.92=
-r2.ebuild
similarity index 98%
rename from gnome-base/gnome-control-center/gnome-control-center-2.91.92-=
r1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2=
.ebuild
index 4d4d1fd..84027a5 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r1.ebu=
ild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebu=
ild
@@ -96,7 +96,7 @@ src_prepare() {
DOCS=3D"AUTHORS ChangeLog NEWS README TODO"
=20
# https://bugs.gentoo.org/show_bug.cgi?id=3D360057
- epatch "${FILESDIR}/${PN}-fix-gnomecc-menu.patch"
+ epatch "${FILESDIR}/${PN}-fix-desktop-file.patch"
=20
gnome2_src_prepare
}