[Gnash-commit] [SCM] Gnash branch, master, updated. 43c270b65425806f98b6573d5b086a144306e289

[Rob Savoye]

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  43c270b65425806f98b6573d5b086a144306e289 (commit)
      from  37cd82a364ce637daf91b733c16f96deca664566 (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=43c270b65425806f98b6573d5b086a144306e289


commit 43c270b65425806f98b6573d5b086a144306e289
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 16:56:52 2010 -0600

    improve handling the python plugin install directories

diff --git a/packaging/deb.am b/packaging/deb.am
index bf639df..108e57a 100644
--- a/packaging/deb.am
+++ b/packaging/deb.am
@@ -138,21 +138,30 @@ deb-edit-utilities:
           sed -e '/webcam/d' -e '/microphone/d' 
$(BUILD_DIR)/debian/gnash-tools.manpages.orig > 
$(BUILD_DIR)/debian/gnash-tools.manpages; \
        fi;
 
-# Python is at different revisions and paths depending on the Distribution and 
release
+# Python is at different revisions and paths depending on the Distribution
+# and release. Debian uses site-packages, while Ubuntu uses dist-packages.
 deb-edit-python:
        @release=`lsb_release -i | sed -e 's/.*:[ \t]//'`; \
-       version=`python --version  2>&1 | tr -d '.' | cut -d ' ' -f 2i | sed -e 
's:rc[0-9]*::'`; \
-        if test x"$${release}" = x"Ubuntu"; then \
-          echo "Editing $(BUILD_DIR)/debian/gtk-plugin-gnash.install for 
Ubuntu"; \
-          if test -e $(BUILD_DIR)/debian/python-gtk-gnash.install; then \
-            mv -f $(BUILD_DIR)/debian/python-gtk-gnash.install 
$(BUILD_DIR)/debian/python-gtk-gnash.install.orig; \
-          fi; \
-          sed -e 's:python2.5/site:python2.6/dist:' 
$(BUILD_DIR)/debian/python-gtk-gnash.install.orig > 
$(BUILD_DIR)/debian/python-gtk-gnash.install; \
-          if test -e $(BUILD_DIR)/debian/python-gtk-gnash.dirs; then \
-            mv -f $(BUILD_DIR)/debian/python-gtk-gnash.dirs 
$(BUILD_DIR)/debian/python-gtk-gnash.dirs.orig; \
-          fi; \
-          sed -e "s:python2.5/site:python2.6/dist:" 
$(BUILD_DIR)/debian/python-gtk-gnash.dirs.orig > 
$(BUILD_DIR)/debian/python-gtk-gnash.dirs; \
-       fi;
+       version=`python --version  2>&1 | tr -d '.' | cut -d ' ' -f 2 | sed -e 
's:rc[0-9]*::'`; \
+       if test $${version} -gt 260; then \
+         pdir=2.6; \
+       else \
+         pdir=2.5; \
+       fi; \
+       if test x"$${release}" = x"Ubuntu"; then \
+         packages="dist-packages"; \
+       else \
+         packages="site-packages"; \
+       fi; \
+       echo "Editing $(BUILD_DIR)/debian/gtk-plugin-gnash.install for Ubuntu"; 
\
+       if test -e $(BUILD_DIR)/debian/python-gtk-gnash.install; then \
+         mv -f $(BUILD_DIR)/debian/python-gtk-gnash.install 
$(BUILD_DIR)/debian/python-gtk-gnash.install.orig; \
+       fi; \
+       sed -e "s:python2.X/site-packages:python$${pdir}/$${packages}:" 
$(BUILD_DIR)/debian/python-gtk-gnash.install.orig > 
$(BUILD_DIR)/debian/python-gtk-gnash.install; \
+       if test -e $(BUILD_DIR)/debian/python-gtk-gnash.dirs; then \
+         mv -f $(BUILD_DIR)/debian/python-gtk-gnash.dirs 
$(BUILD_DIR)/debian/python-gtk-gnash.dirs.orig; \
+       fi; \
+       sed -e "s:python2.X/site-packages:python$${pdir}/$${packages}:" 
$(BUILD_DIR)/debian/python-gtk-gnash.dirs.orig > 
$(BUILD_DIR)/debian/python-gtk-gnash.dirs;
 
 deb-edit-browser:
        @if test `echo $(FIREFOX_PLUGINS) | grep -c mozilla` -eq 0; then \
diff --git a/packaging/debian/python-gtk-gnash.dirs 
b/packaging/debian/python-gtk-gnash.dirs
index f799d50..1045101 100644
--- a/packaging/debian/python-gtk-gnash.dirs
+++ b/packaging/debian/python-gtk-gnash.dirs
@@ -1 +1 @@
-usr/lib/python2.5/site-packages/gtk-2.0
+usr/lib/python2.X/site-packages/gtk-2.0
diff --git a/packaging/debian/python-gtk-gnash.install 
b/packaging/debian/python-gtk-gnash.install
index 9389aec..27a82f0 100644
--- a/packaging/debian/python-gtk-gnash.install
+++ b/packaging/debian/python-gtk-gnash.install
@@ -1 +1 @@
-usr/lib/python2.5/site-packages/gtk-2.0/gnash.*
+usr/lib/python2.X/site-packages/gtk-2.0/gnash.*

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

Summary of changes:
 packaging/deb.am                          |   35 ++++++++++++++++++----------
 packaging/debian/python-gtk-gnash.dirs    |    2 +-
 packaging/debian/python-gtk-gnash.install |    2 +-
 3 files changed, 24 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
Gnash