From 9cb6333b6cd066eb553a59a49e7555e95e575263 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Thu, 5 Aug 2010 12:57:54 +0000
Subject: [PATCH] (trunk) rename "transmission" as "transmission-gtk" and
 "transmissioncli" as "transmission-cli" for consistency with the other
 transmission apps

---
 cli/Makefile.am                                  |  8 ++++----
 cli/{transmissioncli.1 => transmission-cli.1}    |  0
 configure.ac                                     |  4 ++--
 gtk/Makefile.am                                  | 16 ++++++++--------
 gtk/{transmission.1 => transmission-gtk.1}       |  0
 ...on.desktop.in => transmission-gtk.desktop.in} |  0
 transmission.spec.in => transmission-gtk.spec.in |  0
 7 files changed, 14 insertions(+), 14 deletions(-)
 rename cli/{transmissioncli.1 => transmission-cli.1} (100%)
 rename gtk/{transmission.1 => transmission-gtk.1} (100%)
 rename gtk/{transmission.desktop.in => transmission-gtk.desktop.in} (100%)
 rename transmission.spec.in => transmission-gtk.spec.in (100%)

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 1cae94557..2c15d42ac 100644
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -10,13 +10,13 @@ AM_CFLAGS = \
 AM_LDFLAGS = \
     @ZLIB_LDFLAGS@
 
-bin_PROGRAMS = transmissioncli
+bin_PROGRAMS = transmission-cli
 
-dist_man_MANS = transmissioncli.1
+dist_man_MANS = transmission-cli.1
 
-transmissioncli_SOURCES = cli.c
+transmission_cli_SOURCES = cli.c
 
-transmissioncli_LDADD = \
+transmission_cli_LDADD = \
     $(top_builddir)/libtransmission/libtransmission.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
diff --git a/cli/transmissioncli.1 b/cli/transmission-cli.1
similarity index 100%
rename from cli/transmissioncli.1
rename to cli/transmission-cli.1
diff --git a/configure.ac b/configure.ac
index 2431c4914..c1c558810 100644
--- a/configure.ac
+++ b/configure.ac
@@ -384,7 +384,7 @@ if test "x$enable_nls" = "xyes" ; then
     use_nls=yes
     IT_PROG_INTLTOOL([0.35.0],[no-xml])
     AC_CHECK_HEADERS([libintl.h])
-    GETTEXT_PACKAGE=transmission
+    GETTEXT_PACKAGE=transmission-gtk
     AC_SUBST(GETTEXT_PACKAGE)
     AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
     AM_GLIB_GNU_GETTEXT
@@ -471,7 +471,7 @@ dnl
 dnl  Generate the output
 
 AC_CONFIG_FILES([Makefile
-                 transmission.spec
+                 transmission-gtk.spec
                  cli/Makefile
                  daemon/Makefile
                  extras/Makefile
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index ec2b59152..16faaeab1 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -71,11 +71,11 @@ noinst_HEADERS = \
     ui.h \
     util.h
 
-bin_PROGRAMS = transmission
+bin_PROGRAMS = transmission-gtk
 
 dbus_generated_sources = tr-core-dbus.h
 
-transmission_SOURCES = \
+transmission_gtk_SOURCES = \
     actions.c \
     add-dialog.c \
     conf.c \
@@ -104,9 +104,9 @@ transmission_SOURCES = \
     util.c \
     $(dbus_generated_sources)
 
-dist_man_MANS = transmission.1
+dist_man_MANS = transmission-gtk.1
 
-transmission_LDADD = \
+transmission_gtk_LDADD = \
     $(top_builddir)/libtransmission/libtransmission.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
@@ -124,7 +124,7 @@ transmission_LDADD = \
     @ZLIB_LIBS@ \
     @PTHREAD_LIBS@
 
-DESKTOP_IN_FILES=transmission.desktop.in
+DESKTOP_IN_FILES=transmission-gtk.desktop.in
 DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
@@ -141,7 +141,7 @@ EXTRA_DIST = \
     transmission.png
 
 DISTCLEANFILES = \
-    transmission.desktop
+    transmission-gtk.desktop
 
 CLEANFILES = $(dbus_generated_sources)
 
@@ -163,10 +163,10 @@ BUILT_SOURCES = \
 CLEANFILES += \
 	transmission.res
 
-transmission_LDADD += \
+transmission_gtk_LDADD += \
 	transmission.res
 
-transmission_LDFLAGS = \
+transmission_gtk_LDFLAGS = \
 	-mwindows
 
 else
diff --git a/gtk/transmission.1 b/gtk/transmission-gtk.1
similarity index 100%
rename from gtk/transmission.1
rename to gtk/transmission-gtk.1
diff --git a/gtk/transmission.desktop.in b/gtk/transmission-gtk.desktop.in
similarity index 100%
rename from gtk/transmission.desktop.in
rename to gtk/transmission-gtk.desktop.in
diff --git a/transmission.spec.in b/transmission-gtk.spec.in
similarity index 100%
rename from transmission.spec.in
rename to transmission-gtk.spec.in