From 8944000061cbfb995e56b74ab03034ec3541caac Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Tue, 18 May 2010 13:53:39 -0700
Subject: [PATCH] grc: rename execution binary from 'grc' to
 'gnuradio-companion'

This change resolves a conflict with the Generic Colorizer application
which also uses the binary name 'grc'.

Interested users can add an alias to their shell environment to run
gnuradio-companion when grc is invoked.
---
 grc/freedesktop/Makefile.am                                   | 2 +-
 ...uradio-grc.desktop => gnuradio-gnuradio-companion.desktop} | 2 +-
 grc/freedesktop/grc_setup_freedesktop.in                      | 2 +-
 grc/scripts/Makefile.am                                       | 4 ++--
 grc/scripts/{grc => gnuradio-companion}                       | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename grc/freedesktop/{gnuradio-grc.desktop => gnuradio-gnuradio-companion.desktop} (82%)
 rename grc/scripts/{grc => gnuradio-companion} (100%)

diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am
index bfbdee94..23bb70bf 100644
--- a/grc/freedesktop/Makefile.am
+++ b/grc/freedesktop/Makefile.am
@@ -30,7 +30,7 @@ dist_ourdata_DATA = \
 	grc-icon-48.png \
 	grc-icon-32.png \
 	gnuradio-grc.xml \
-	gnuradio-grc.desktop \
+	gnuradio-gnuradio-companion.desktop \
 	gnuradio-usrp2_probe.desktop \
 	gnuradio-usrp_probe.desktop
 
diff --git a/grc/freedesktop/gnuradio-grc.desktop b/grc/freedesktop/gnuradio-gnuradio-companion.desktop
similarity index 82%
rename from grc/freedesktop/gnuradio-grc.desktop
rename to grc/freedesktop/gnuradio-gnuradio-companion.desktop
index d9c70ca9..5fd04978 100644
--- a/grc/freedesktop/gnuradio-grc.desktop
+++ b/grc/freedesktop/gnuradio-gnuradio-companion.desktop
@@ -2,7 +2,7 @@
 Version=1.0
 Type=Application
 Name=GRC
-Exec=grc %F
+Exec=gnuradio-companion %F
 Categories=Development;
 MimeType=application/gnuradio-grc;
 Icon=gnuradio-grc
diff --git a/grc/freedesktop/grc_setup_freedesktop.in b/grc/freedesktop/grc_setup_freedesktop.in
index db650645..a0c5ac19 100644
--- a/grc/freedesktop/grc_setup_freedesktop.in
+++ b/grc/freedesktop/grc_setup_freedesktop.in
@@ -8,7 +8,7 @@
 ##################################################
 
 ICON_SIZES="32 48 64 128 256"
-MENU_ITEMS="grc usrp2_probe usrp_probe"
+MENU_ITEMS="gnuradio-companion usrp2_probe usrp_probe"
 if [ -n "$2" ]; then
 	SRCDIR="$2"
 else
diff --git a/grc/scripts/Makefile.am b/grc/scripts/Makefile.am
index e24f8880..9019ec5c 100644
--- a/grc/scripts/Makefile.am
+++ b/grc/scripts/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008, 2009 Free Software Foundation, Inc.
+# Copyright 2008, 2009, 2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,4 +21,4 @@
 
 include $(top_srcdir)/Makefile.common
 
-dist_bin_SCRIPTS = grc usrp2_probe usrp_probe
+dist_bin_SCRIPTS = gnuradio-companion usrp2_probe usrp_probe
diff --git a/grc/scripts/grc b/grc/scripts/gnuradio-companion
similarity index 100%
rename from grc/scripts/grc
rename to grc/scripts/gnuradio-companion
-- 
2.30.2