r160 - in /packages/gnash/branches/0.8.1/debian: changelog control gnash-tool.sh gnash.install gnash.links gnash.sh patches/konqueror_plugin.patch patches/series
baby-guest at users.alioth.debian.org
baby-guest at users.alioth.debian.org
Fri Aug 17 20:56:46 UTC 2007
Author: baby-guest
Date: Fri Aug 17 20:56:46 2007
New Revision: 160
URL: http://svn.debian.org/wsvn/pkg-flash/?sc=1&rev=160
Log:
Make konqueror work
Added:
packages/gnash/branches/0.8.1/debian/patches/konqueror_plugin.patch
Modified:
packages/gnash/branches/0.8.1/debian/changelog
packages/gnash/branches/0.8.1/debian/control
packages/gnash/branches/0.8.1/debian/gnash-tool.sh
packages/gnash/branches/0.8.1/debian/gnash.install
packages/gnash/branches/0.8.1/debian/gnash.links
packages/gnash/branches/0.8.1/debian/gnash.sh
packages/gnash/branches/0.8.1/debian/patches/series
Modified: packages/gnash/branches/0.8.1/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.1/debian/changelog?rev=160&op=diff
==============================================================================
--- packages/gnash/branches/0.8.1/debian/changelog (original)
+++ packages/gnash/branches/0.8.1/debian/changelog Fri Aug 17 20:56:46 2007
@@ -1,6 +1,7 @@
gnash (0.8.0+cvs20070815.1920-1) experimental; urgency=low
* New Upstream Release. Downloaded from CVS.
+ * Fixed Konqueror plugin problem. Thanks David MartÃnez MartÃ.
-- Miriam Ruiz <little_miry at yahoo.es> Wed, 15 Aug 2007 21:22:15 +0200
Modified: packages/gnash/branches/0.8.1/debian/control
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.1/debian/control?rev=160&op=diff
==============================================================================
--- packages/gnash/branches/0.8.1/debian/control (original)
+++ packages/gnash/branches/0.8.1/debian/control Fri Aug 17 20:56:46 2007
@@ -1,7 +1,6 @@
Source: gnash
Priority: optional
Maintainer: Miriam Ruiz <little_miry at yahoo.es>
-Uploaders: Alexander Sack <asac at debian.org>
Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 4.0.0), quilt, sharutils, chrpath,
autoconf, automake1.9 | automake (> 1.10), libtool, libltdl3-dev, help2man,
libxmu-dev, dejagnu, autotools-dev, libboost-dev, libboost-thread-dev, libxml2-dev,
Modified: packages/gnash/branches/0.8.1/debian/gnash-tool.sh
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.1/debian/gnash-tool.sh?rev=160&op=diff
==============================================================================
--- packages/gnash/branches/0.8.1/debian/gnash-tool.sh (original)
+++ packages/gnash/branches/0.8.1/debian/gnash-tool.sh Fri Aug 17 20:56:46 2007
@@ -23,12 +23,18 @@
GUIS="gtk kde"
RENDERS="agg opengl"
+THIS_DIR="`dirname $0`"
+THIS_FILE="`echo \"$0\" | sed -e \"s/\/*$//\" -e \"/\//! s/^/.\//\" -e \"s/.*\///\"`"
+
+if test "${THIS_DIR}" = "/usr/share/gnash/scripts"; then
+ THIS_DIR="/usr/bin"
+fi
for gui in ${GUIS}; do
for rend in ${RENDERS}; do
#echo Trying: $0.${gui}-${rend} >&2
- if test -e $0.${gui}-${rend}; then
- exec $0.${gui}-${rend} "$@"
+ if test -e "${THIS_DIR}/${THIS_FILE}.${gui}-${rend}"; then
+ exec "${THIS_DIR}/${THIS_FILE}.${gui}-${rend}" "$@"
fi
done
done
Modified: packages/gnash/branches/0.8.1/debian/gnash.install
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.1/debian/gnash.install?rev=160&op=diff
==============================================================================
--- packages/gnash/branches/0.8.1/debian/gnash.install (original)
+++ packages/gnash/branches/0.8.1/debian/gnash.install Fri Aug 17 20:56:46 2007
@@ -1,3 +1,4 @@
+gnash.sh usr/share/gnash/scripts/
gnash-tool.sh usr/share/gnash/scripts/
tmp-gtk-agg/usr/share/locale usr/share/
gnash.xpm usr/share/pixmaps/
Modified: packages/gnash/branches/0.8.1/debian/gnash.links
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.1/debian/gnash.links?rev=160&op=diff
==============================================================================
--- packages/gnash/branches/0.8.1/debian/gnash.links (original)
+++ packages/gnash/branches/0.8.1/debian/gnash.links Fri Aug 17 20:56:46 2007
@@ -1,3 +1,7 @@
usr/share/gnash/scripts/gnash.sh usr/bin/gnash
+usr/share/gnash/scripts/gnash.sh usr/bin/gtk-gnash
+usr/share/gnash/scripts/gnash.sh usr/bin/kde-gnash
usr/share/gnash/scripts/gnash-tool.sh usr/bin/gparser
usr/share/gnash/scripts/gnash-tool.sh usr/bin/gprocessor
+usr/share/man/man1/gnash.1.gz usr/share/man/man1/kde-gnash.1.gz
+usr/share/man/man1/gnash.1.gz usr/share/man/man1/gtk-gnash.1.gz
Modified: packages/gnash/branches/0.8.1/debian/gnash.sh
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.1/debian/gnash.sh?rev=160&op=diff
==============================================================================
--- packages/gnash/branches/0.8.1/debian/gnash.sh (original)
+++ packages/gnash/branches/0.8.1/debian/gnash.sh Fri Aug 17 20:56:46 2007
@@ -21,41 +21,51 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+GUI=""
GUIS="gtk kde"
RENDERS="agg opengl"
THIS_DIR="`dirname $0`"
+THIS_FILE="`echo \"$0\" | sed -e \"s/\/*$//\" -e \"/\//! s/^/.\//\" -e \"s/.*\///\"`"
+
+if test "${THIS_DIR}" = "/usr/share/gnash/scripts"; then
+ THIS_DIR="/usr/bin"
+fi
+
+if test "${THIS_FILE}" = "gtk-gnash"; then
+ GUIS="gtk kde"
+# GUI="gtk"
+fi
+
+if test "${THIS_FILE}" = "kde-gnash"; then
+ GUIS="kde gtk"
+# GUI="kde"
+fi
if test "$1" = "-G"; then
shift
- gui=`echo "$1" | tr '[A-Z]' '[a-z]'`
+ GUI=`echo "$1" | tr '[A-Z]' '[a-z]'`
shift
- #echo Trying: ${THIS_DIR}/${gui}-gnash >&2
- if test -e ${THIS_DIR}/${gui}-gnash; then
- exec ${THIS_DIR}/${gui}-gnash "$@"
- fi
+fi
+
+if test ! -z "${GUI}"; then
for rend in ${RENDERS}; do
#echo Trying: ${THIS_DIR}/gnash.${gui}-${rend} >&2
- if test -e ${THIS_DIR}/gnash.${gui}-${rend}; then
- exec ${THIS_DIR}/gnash.${gui}-${rend} "$@"
+ if test -e "${THIS_DIR}/gnash.${GUI}-${rend}"; then
+ exec "${THIS_DIR}/gnash.${GUI}-${rend}" "$@"
fi
done
- echo "Can't find ${gui}-gnash." >&2
+ echo "Could not find any gnash.${GUI}-<renderer> executable under directory \"${THIS_DIR}\"" >&2
exit 1
fi
for gui in ${GUIS}; do
- exe=${THIS_DIR}/${gui}-gnash
- #echo Trying: ${exe} >&2
- if test -e ${exe}; then
- exec ${exe} "$@"
- fi
for rend in ${RENDERS}; do
#echo Trying: ${THIS_DIR}/gnash.${gui}-${rend} >&2
- if test -e ${THIS_DIR}/gnash.${gui}-${rend}; then
- exec ${THIS_DIR}/gnash.${gui}-${rend} "$@"
+ if test -e "${THIS_DIR}/gnash.${gui}-${rend}"; then
+ exec "${THIS_DIR}/gnash.${gui}-${rend}" "$@"
fi
done
done
-echo "Could not find any <gui>-gnash nor gnash.<gui>-<renderer> executable under directory \"${THIS_DIR}\"" >&2
+echo "Could not find any gnash.<gui>-<renderer> executable under directory \"${THIS_DIR}\"" >&2
exit 1
Added: packages/gnash/branches/0.8.1/debian/patches/konqueror_plugin.patch
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.1/debian/patches/konqueror_plugin.patch?rev=160&op=file
==============================================================================
--- packages/gnash/branches/0.8.1/debian/patches/konqueror_plugin.patch (added)
+++ packages/gnash/branches/0.8.1/debian/patches/konqueror_plugin.patch Fri Aug 17 20:56:46 2007
@@ -1,0 +1,12 @@
+--- gnash-0.8.0+cvs20070815.1920.orig/plugin/klash/klash_part.cpp
++++ gnash-0.8.0+cvs20070815.1920/plugin/klash/klash_part.cpp
+@@ -162,8 +162,7 @@
+ QString procname;
+ char *gnash_env = getenv("KLASH_PLAYER");
+ if (!gnash_env) {
+- procname = GNASHBINDIR;
+- procname += "/kde-gnash";
++ procname = "/usr/bin/kde-gnash";
+ } else {
+ procname = gnash_env;
+ }
Modified: packages/gnash/branches/0.8.1/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-flash/packages/gnash/branches/0.8.1/debian/patches/series?rev=160&op=diff
==============================================================================
--- packages/gnash/branches/0.8.1/debian/patches/series (original)
+++ packages/gnash/branches/0.8.1/debian/patches/series Fri Aug 17 20:56:46 2007
@@ -1,3 +1,4 @@
exclude_testsuite.patch
+fix_network.patch
+konqueror_plugin.patch
gnashg_png.patch
-fix_network.patch
More information about the pkg-flash-devel
mailing list