[Gnash-commit] /srv/bzr/gnash/trunk r11894: only have the default path in mozilla-plugin-gnash. Edit this file from setup-deb if a different browser is found at configure time.

[Rob Savoye]

------------------------------------------------------------
revno: 11894
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Wed 2010-02-03 21:39:49 -0700
message:
  only have the default path in mozilla-plugin-gnash. Edit this file from 
setup-deb if a different browser is found at configure time.
modified:
  packaging/deb.am
  packaging/debian/mozilla-plugin-gnash.dirs

=== modified file 'packaging/deb.am'
--- a/packaging/deb.am  2010-02-03 21:33:26 +0000
+++ b/packaging/deb.am  2010-02-04 04:39:49 +0000
@@ -23,6 +23,12 @@
 # into the proper files to build a package with the version in
 # all the right places. This involves editing the debian/changelog
 # file. Configure.ac is edited by the snapshot target.
+# We also edit the gtk-plugin-gnash paths, as these differ between
+# python versions and GNU/Linux distributions. Also if configured
+# with the plugin not going into the standard directory of
+# /usr/lib/mozilla/plugins or $HOME/.mozilla/plugins, we also
+# have to change the path to the NPAPI plugin so it gets installed
+# for the correct browser.
 setup-deb: 
        snapshot_dir="gnash-$(SNAPSHOT_VERSION)"; \
        if test -d $(SNAPSHOT_DIR); then \
@@ -44,6 +50,12 @@
            mv -f $${snapshot_dir}/debian/gtk-plugin-gnash.install 
$${snapshot_dir}/debian/gtk-plugin-gnash.install.orig; \
          fi; \
          sed -e 's:python2.5/site:python2.6/dist:' 
$${snapshot_dir}/debian/gtk-plugin-gnash.install.orig > 
$${snapshot_dir}/debian/gtk-plugin-gnash.install; \
+         if test `echo $(FIREFOX_PLUGINS) | grep -c mozilla` -eq 0; then \
+           if test -e $${snapshot_dir}/debian/mozilla-plugin-gnash.dirs; then \
+             mv -f $${snapshot_dir}/debian/mozilla-plugin-gnash.dirs 
$${snapshot_dir}/debian/gtk-plugin-gnash.install.orig; \
+           fi; \
+           echo $(FIREFOX_PLUGINS) | sed -e 's:/::' > 
$${snapshot_dir}/debian/mozilla-plugin-gnash.dirs; \
+         fi; \
        fi;
 
 snapshot-deb:

=== modified file 'packaging/debian/mozilla-plugin-gnash.dirs'
--- a/packaging/debian/mozilla-plugin-gnash.dirs        2009-12-20 20:44:07 
+0000
+++ b/packaging/debian/mozilla-plugin-gnash.dirs        2010-02-04 04:39:49 
+0000
@@ -1,5 +1,1 @@
-usr/lib/iceweasel/plugins
 usr/lib/mozilla/plugins
-usr/lib/firefox/plugins
-usr/lib/xulrunner/plugins
-usr/lib/midbrowser/plugins