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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
Date: Sat, 26 Mar 2011 00:37:55 +0000 (UTC)	[thread overview]
Message-ID: <e1ba1983e56987616a4d083385f211b470d03cb3.nirbheek@gentoo> (raw)

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=proj/gnome.git;a=commit;h=e1ba1983

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 => 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/gnome-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-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/files/gnome-control-center-fix-gnomecc-menu.patch b/gnome-base/gnome-control-center/files/gnome-control-center-fix-gnomecc-menu.patch
deleted file mode 100644
index 850e3e8..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-fix-gnomecc-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 @@
- 
-   <!-- Avoid the shell having a launcher for itself -->
-   <Exclude>
--    <Filename>gnome-control-center.desktop</Filename>
-+    <Filename>gnome-shell.desktop</Filename>
-   </Exclude>
- 
-   <!-- Personal category -->
--- 
-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.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
@@ -96,7 +96,7 @@ src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 
 	# https://bugs.gentoo.org/show_bug.cgi?id=360057
-	epatch "${FILESDIR}/${PN}-fix-gnomecc-menu.patch"
+	epatch "${FILESDIR}/${PN}-fix-desktop-file.patch"
 
 	gnome2_src_prepare
 }

next             reply	other threads:[~2011-03-26  0:38 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-26  0:37 Nirbheek Chauhan [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-03-25  0:56 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/ Ole Reifschneider
2015-10-02 12:50 Ole Reifschneider
2015-05-10 17:20 Gilles Dartiguelongue
2014-10-12 23:19 Gilles Dartiguelongue
2014-04-25 21:07 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2013-12-09 23:06 Gilles Dartiguelongue
2012-12-07 20:02 Arun Raghavan
2012-10-27  8:43 Priit Laes
2012-09-21  0:27 Nirbheek Chauhan
2012-09-10 16:13 Priit Laes
2012-09-10  5:08 Nirbheek Chauhan
2012-07-19  2:47 Alexandre Restovtsev
2012-05-25  8:22 Alexandre Restovtsev
2012-03-26  8:20 Nirbheek Chauhan
2011-10-28  5:28 Alexandre Restovtsev
2011-07-12  0:28 Alexandre Restovtsev
2011-06-24 17:35 Alexandre Restovtsev
2011-03-29  8:35 Nirbheek Chauhan
2011-02-28  7:48 Nirbheek Chauhan
2011-02-18  6:31 Nirbheek Chauhan

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:9a051b6 dfblob:850e3e8 dfblob:4d4d1fd dfblob:84027a5 )
 OR (
bs:"[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e1ba1983e56987616a4d083385f211b470d03cb3.nirbheek@gentoo \
    --to=nirbheek@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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