[SCM] GNU Shockwave Flash (SWF) player branch, master, updated. debian/0.8.9-1-3-g86525d7

[Gabriele Giacone]

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 "GNU Shockwave Flash (SWF) player".

The branch, master has been updated
       via  86525d7686998b7bcbf6a1d77457560055cf7699 (commit)
       via  37216d216cfb7bbed4c95f0b89978b40f4f07954 (commit)
       via  8568c6bb53926214f96f9c5c8c9f6cb9bb18cdef (commit)
      from  d95f973b975eadf4d2bbb846a6099ae3c752a816 (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 -----------------------------------------------------------------
commit 86525d7686998b7bcbf6a1d77457560055cf7699
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sun Mar 27 00:28:36 2011 +0100

    Remove without-included-ltdl config option.

commit 37216d216cfb7bbed4c95f0b89978b40f4f07954
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Mar 26 19:30:45 2011 +0100

    Rename kde4 to qt4.

commit 8568c6bb53926214f96f9c5c8c9f6cb9bb18cdef
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Mar 26 19:04:41 2011 +0100

    Remove 01mysqltypo patch.

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

Summary of changes:
 debian/klash.install                  |    2 +-
 debian/klash.links                    |    4 ++--
 debian/konqueror-plugin-gnash.install |    2 +-
 debian/patches/01mysqltypo            |   16 ----------------
 debian/patches/series                 |    1 -
 debian/rules                          |    5 ++---
 6 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/debian/klash.install b/debian/klash.install
index cef7260..676bfa6 100644
--- a/debian/klash.install
+++ b/debian/klash.install
@@ -1,2 +1,2 @@
-usr/bin/kde4-gnash
+usr/bin/qt4-gnash
 debian/klash.desktop usr/share/applications/
diff --git a/debian/klash.links b/debian/klash.links
index da2596e..609847a 100644
--- a/debian/klash.links
+++ b/debian/klash.links
@@ -1,3 +1,3 @@
-usr/bin/kde4-gnash usr/bin/klash
+usr/bin/qt4-gnash usr/bin/klash
 usr/share/man/man1/gnash.1.gz usr/share/man/man1/klash.1.gz
-usr/share/man/man1/gnash.1.gz usr/share/man/man1/kde4-gnash.1.gz
+usr/share/man/man1/gnash.1.gz usr/share/man/man1/qt4-gnash.1.gz
diff --git a/debian/konqueror-plugin-gnash.install b/debian/konqueror-plugin-gnash.install
index 1d96c40..c710a5c 100644
--- a/debian/konqueror-plugin-gnash.install
+++ b/debian/konqueror-plugin-gnash.install
@@ -1,3 +1,3 @@
 usr/lib/kde4/libklashpart.so
 usr/share/kde4/apps/klash
-usr/share/kde4/services/[Kk]lash*
+usr/share/kde4/services/klash_part.desktop
diff --git a/debian/patches/01mysqltypo b/debian/patches/01mysqltypo
deleted file mode 100644
index c2e55b7..0000000
--- a/debian/patches/01mysqltypo
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix typo. This makes mysql extension properly linked.
-Origin: commit:eb8ba6870f56218765d29df11c9520aef99bd5e2
-Author: Bastiaan Jacques <bastiaan at bjacques.org>
-Date:   Mon Mar 21 00:43:30 2011 +0100
-
---- a/extensions/mysql/Makefile.am
-+++ b/extensions/mysql/Makefile.am
-@@ -42,7 +42,7 @@ AM_LDFLAGS =  \
- 
- mysql_la_SOURCES = mysql_db.cpp mysql_db.h
- mysql_la_LDFLAGS = -module -avoid-version -no-undefined
--mysql_la_LIBDADD = $(AM_LDFLAGS)
-+mysql_la_LIBADD = $(AM_LDFLAGS)
- 
- CLEANFILES = \
-       gnash-dbg.log
diff --git a/debian/patches/series b/debian/patches/series
index f17d2c9..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-01mysqltypo
diff --git a/debian/rules b/debian/rules
index b8d593a..8419d43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,14 +49,13 @@ CONFIGURE_FLAGS = \
 		--enable-jemalloc \
 		--enable-hwaccel=none \
 		--enable-media='gst,ffmpeg' \
-		--enable-gui='gtk,kde4' \
+		--enable-gui='gtk,qt4' \
 		--enable-renderer=all \
 		--enable-docbook \
 		--enable-extensions=fileio,lirc,mysql \
 		--with-npapi-plugindir=/usr/lib/gnash \
 		--with-plugins-install=system \
-		--enable-shared=yes \
-		--without-included-ltdl
+		--enable-shared=yes
 
 override_dh_auto_configure:
 	./autogen.sh


hooks/post-receive
-- 
GNU Shockwave Flash (SWF) player