tag 464266 patch
thanks
The attached patch makes flashplugin-nonfree use the flash-mozilla.so
alternative instead of installing symbolic links in the browser plugin
directories. It appears to work on my system.
--
Matt http://ftbfs.org/
diff -Nru flashplugin-nonfree-1.6.3~/debian/links.amd64
flashplugin-nonfree-1.6.3/debian/links.amd64
--- flashplugin-nonfree-1.6.3~/debian/links.amd64 2008-08-22
13:14:16.000000000 -0700
+++ flashplugin-nonfree-1.6.3/debian/links.amd64 1969-12-31
16:00:00.000000000 -0800
@@ -1,5 +0,0 @@
-/usr/lib/nspluginwrapper/plugins/npwrapper.libflashplayer.so
/usr/lib/mozilla/plugins/npwrapper.libflashplayer.so
-/usr/lib/nspluginwrapper/plugins/npwrapper.libflashplayer.so
/usr/lib/mozilla-firefox/plugins/npwrapper.libflashplayer.so
-/usr/lib/nspluginwrapper/plugins/npwrapper.libflashplayer.so
/usr/lib/firefox/plugins/npwrapper.libflashplayer.so
-/usr/lib/nspluginwrapper/plugins/npwrapper.libflashplayer.so
/usr/lib/iceweasel/plugins/npwrapper.libflashplayer.so
-/usr/lib/nspluginwrapper/plugins/npwrapper.libflashplayer.so
/usr/lib/iceape/plugins/npwrapper.libflashplayer.so
diff -Nru flashplugin-nonfree-1.6.3~/debian/links.i386
flashplugin-nonfree-1.6.3/debian/links.i386
--- flashplugin-nonfree-1.6.3~/debian/links.i386 2008-08-22
13:14:16.000000000 -0700
+++ flashplugin-nonfree-1.6.3/debian/links.i386 1969-12-31 16:00:00.000000000
-0800
@@ -1,5 +0,0 @@
-/usr/lib/flashplugin-nonfree/libflashplayer.so
/usr/lib/mozilla/plugins/libflashplayer.so
-/usr/lib/flashplugin-nonfree/libflashplayer.so
/usr/lib/mozilla-firefox/plugins/libflashplayer.so
-/usr/lib/flashplugin-nonfree/libflashplayer.so
/usr/lib/firefox/plugins/libflashplayer.so
-/usr/lib/flashplugin-nonfree/libflashplayer.so
/usr/lib/iceweasel/plugins/libflashplayer.so
-/usr/lib/flashplugin-nonfree/libflashplayer.so
/usr/lib/iceape/plugins/libflashplayer.so
diff -Nru flashplugin-nonfree-1.6.3~/debian/postinst
flashplugin-nonfree-1.6.3/debian/postinst
--- flashplugin-nonfree-1.6.3~/debian/postinst 2008-08-22 13:14:16.000000000
-0700
+++ flashplugin-nonfree-1.6.3/debian/postinst 2008-08-22 13:18:15.000000000
-0700
@@ -6,6 +6,9 @@
configure)
update-flashplugin-nonfree --install --fast || \
echo "Try again later with \"update-flashplugin-nonfree --install\"."
+ update-alternatives --quiet --install \
+ /usr/lib/mozilla/plugins/flash-mozilla.so flash-mozilla.so \
+ /usr/lib/flashplugin-nonfree/libflashplayer.so 10
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -Nru flashplugin-nonfree-1.6.3~/debian/prerm
flashplugin-nonfree-1.6.3/debian/prerm
--- flashplugin-nonfree-1.6.3~/debian/prerm 2008-08-22 13:14:16.000000000
-0700
+++ flashplugin-nonfree-1.6.3/debian/prerm 2008-08-22 13:17:05.000000000
-0700
@@ -5,6 +5,8 @@
case "$1" in
remove|upgrade|deconfigure)
update-flashplugin-nonfree --uninstall || true
+ update-alternatives --quiet --remove flash-mozilla.so \
+ /usr/lib/flashplugin-nonfree/libflashplayer.so
;;
failed-upgrade)
diff -Nru flashplugin-nonfree-1.6.3~/debian/rules
flashplugin-nonfree-1.6.3/debian/rules
--- flashplugin-nonfree-1.6.3~/debian/rules 2008-08-22 13:14:16.000000000
-0700
+++ flashplugin-nonfree-1.6.3/debian/rules 2008-08-22 13:19:07.000000000
-0700
@@ -2,12 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
-update-config::
- [ -e debian/links ] || cp -p debian/links.$(DEB_HOST_ARCH) debian/links
-
-reverse-config::
- rm -f debian/links
-
publish-checksums:
cp -p
/var/cache/flashplugin-nonfree/install_flash_player_9_linux.tar.gz .
tar xozf install_flash_player_9_linux.tar.gz
