[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-132-gc921476

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  c9214767073c68ab6b25e014ebe9b8c6a1dffae6 (commit)
      from  5e85e33634f0b7dcb45a53f69251aa89b4ac5dd2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=c9214767073c68ab6b25e014ebe9b8c6a1dffae6


commit c9214767073c68ab6b25e014ebe9b8c6a1dffae6
Author: Hicham HAOUARI <address@hidden>
Date:   Fri Feb 25 16:34:29 2011 +0000

    Rename gtk-gnash and kde4-gnash launchers

diff --git a/configure.ac b/configure.ac
index 14b4f41..13e4f61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2954,7 +2954,8 @@ 
AC_CONFIG_LINKS(testsuite/libbase.all/gnashrc-local:testsuite/libbase.all/gnashr
 
 AC_CONFIG_FILES(
 gnash.pc:gnash.pc.in
-gui/klash:gui/klash.in
+desktop/gnash-gtk-launcher:desktop/gnash-gtk-launcher.in
+desktop/gnash-qt-launcher:desktop/gnash-qt-launcher.in
 )
 
 AC_OUTPUT(Makefile
diff --git a/desktop/Makefile.am b/desktop/Makefile.am
index afbebd9..0d08120 100644
--- a/desktop/Makefile.am
+++ b/desktop/Makefile.am
@@ -7,16 +7,24 @@ icons32_DATA =
 splashdir = $(pkgdatadir)
 splash_DATA = gnash-splash.swf
 
-EXTRA_DIST = $(splash_DATA) $(desktop_DATA) $(icons32_DATA)
+bin_SCRIPTS =
+
+EXTRA_DIST = gnash-splash.swf \
+             gnash.desktop \
+             klash.desktop \
+             gnash-gtk-launcher.in \
+             gnash-qt-launcher.in
 
 if BUILD_GTK_GUI
 desktop_DATA += gnash.desktop
 icons32_DATA += ../packaging/gnash.xpm
+bin_SCRIPTS  += gnash-gtk-launcher
 endif
 
 if BUILD_KDE4_GUI
 desktop_DATA += klash.desktop
 icons32_DATA += ../packaging/klash.xpm
+bin_SCRIPTS  += gnash-qt-launcher
 endif
 
 validate-gnash-desktop: gnash.desktop
diff --git a/gui/klash.in b/desktop/gnash-gtk-launcher.in
similarity index 78%
copy from gui/klash.in
copy to desktop/gnash-gtk-launcher.in
index 199598d..f00e1c8 100644
--- a/gui/klash.in
+++ b/desktop/gnash-gtk-launcher.in
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# klash:  Wrapper script for running the KDE version of gnash
+# gnash.splashed.launcher.gtk :  Wrapper script for running the GTK version of 
gnash
 #
 #   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software 
Foundation, Inc.
 #
@@ -20,8 +20,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-if test "x$1" = "x" -a -f @datadir@/gnash/gnash-splash.swf; then
-  kde4-gnash @datadir@/gnash-splash.swf
+if test "x$1" = "x" -a -f @prefix@/share/gnash/gnash-splash.swf; then
+  gtk-gnash @prefix@/share/gnash/gnash-splash.swf
 else
-  kde4-gnash "$@"
+  gtk-gnash "$@"
 fi
diff --git a/gui/klash.in b/desktop/gnash-qt-launcher.in
similarity index 88%
rename from gui/klash.in
rename to desktop/gnash-qt-launcher.in
index 199598d..6e50cbe 100644
--- a/gui/klash.in
+++ b/desktop/gnash-qt-launcher.in
@@ -20,8 +20,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-if test "x$1" = "x" -a -f @datadir@/gnash/gnash-splash.swf; then
-  kde4-gnash @datadir@/gnash-splash.swf
+if test "x$1" = "x" -a -f @prefix@/share/gnash/gnash-splash.swf; then
+  kde4-gnash @prefix@/share/gnash/gnash-splash.swf
 else
   kde4-gnash "$@"
 fi
diff --git a/desktop/gnash.desktop b/desktop/gnash.desktop
index 98c4c5a..4e68ef5 100644
--- a/desktop/gnash.desktop
+++ b/desktop/gnash.desktop
@@ -4,7 +4,7 @@ Name=Gnash SWF Viewer
 GenericName=SWF Viewer
 Comment=View SWF Files
 Icon=gnash
-Exec=gnash %U
+Exec=gnash-gtk-launcher %U
 Terminal=false
 Categories=AudioVideo;Video;Player;GTK;
 MimeType=application/x-shockwave-flash;application/futuresplash;
diff --git a/desktop/klash.desktop b/desktop/klash.desktop
index 6efab62..357c990 100644
--- a/desktop/klash.desktop
+++ b/desktop/klash.desktop
@@ -4,7 +4,7 @@ Name=Gnash SWF Viewer for KDE
 GenericName=SWF Viewer
 Comment=View SWF Files
 Icon=klash
-Exec=klash %U
+Exec=gnash-qt-launcher %U
 Terminal=false
 Categories=AudioVideo;Qt;KDE;
 MimeType=application/x-shockwave-flash;application/futuresplash;
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 46cd7ca..4e997b7 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -191,10 +191,6 @@ gnash: gnash.in
        cp $(srcdir)/gnash.in $@
        chmod +x $@
 
-if BUILD_KDE4_GUI
-bin_SCRIPTS += klash
-endif
-
 # Always include the device files in the source tarball
 EXTRA_DIST += \
        fb/TouchDevice.cpp \
diff --git a/gui/gnash.in b/gui/gnash.in
index 595710c..ca0f16d 100755
--- a/gui/gnash.in
+++ b/gui/gnash.in
@@ -57,11 +57,7 @@ fi
 for gui in ${gui} ${GUIS}; do
        exe=${THIS_DIR}/${gui}-gnash
        if test -e ${exe}; then
-               if test "x$1" = "x" -a -f @datadir@/gnash/gnash-splash.swf -a 
"${gui}" = "gtk";then
-                       exec ${exe} @datadir@/gnash/gnash-splash.swf
-               else
-                       exec ${exe} "$@"
-               fi
+               exec ${exe} "$@"
        fi
 done
 

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                                  |    3 ++-
 desktop/Makefile.am                           |   10 +++++++++-
 gui/klash.in => desktop/gnash-gtk-launcher.in |    8 ++++----
 gui/klash.in => desktop/gnash-qt-launcher.in  |    4 ++--
 desktop/gnash.desktop                         |    2 +-
 desktop/klash.desktop                         |    2 +-
 gui/Makefile.am                               |    4 ----
 gui/gnash.in                                  |    6 +-----
 8 files changed, 20 insertions(+), 19 deletions(-)
 copy gui/klash.in => desktop/gnash-gtk-launcher.in (78%)
 rename gui/klash.in => desktop/gnash-qt-launcher.in (88%)


hooks/post-receive
-- 
Gnash