[Gnash-commit] [SCM] Gnash branch, master, updated. 2fa2a0633d6c3ca5f0b583858c307437c643a00b

[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  2fa2a0633d6c3ca5f0b583858c307437c643a00b (commit)
       via  42a8240d8e1d5f8ded1c28b294afc71f1924481c (commit)
      from  253687751e94195fecaaec6f5330eaf599388646 (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=2fa2a0633d6c3ca5f0b583858c307437c643a00b


commit 2fa2a0633d6c3ca5f0b583858c307437c643a00b
Merge: 42a8240 2536877
Author: Rob Savoye <address@hidden>
Date:   Tue Oct 26 11:22:49 2010 -0600

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=42a8240d8e1d5f8ded1c28b294afc71f1924481c


commit 42a8240d8e1d5f8ded1c28b294afc71f1924481c
Author: Rob Savoye <address@hidden>
Date:   Tue Oct 26 11:22:33 2010 -0600

    aloways use dist-packages with python 2.6, and site-packages with 2.5

diff --git a/packaging/deb.am b/packaging/deb.am
index 108e57a..7281ea5 100644
--- a/packaging/deb.am
+++ b/packaging/deb.am
@@ -144,16 +144,14 @@ deb-edit-python:
        @release=`lsb_release -i | sed -e 's/.*:[ \t]//'`; \
        version=`python --version  2>&1 | tr -d '.' | cut -d ' ' -f 2 | sed -e 
's:rc[0-9]*::'`; \
        if test $${version} -gt 260; then \
+         echo "Editing $(BUILD_DIR)/debian/gtk-plugin-gnash.install for Python 
2.6"; \
          pdir=2.6; \
-       else \
-         pdir=2.5; \
-       fi; \
-       if test x"$${release}" = x"Ubuntu"; then \
          packages="dist-packages"; \
        else \
+         echo "Editing $(BUILD_DIR)/debian/gtk-plugin-gnash.install for Python 
2.5"; \
+         pdir=2.5; \
          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; \
@@ -167,7 +165,7 @@ deb-edit-browser:
        @if test `echo $(FIREFOX_PLUGINS) | grep -c mozilla` -eq 0; then \
           echo "Adjusting plugin path for a NPAPI compliant browser"; \
           if test -e $(BUILD_DIR)/debian/browser-plugin-gnash.dirs; then \
-            mv -f $(BUILD_DIR)/debian/browser-plugin-gnash.dirs 
$(BUILD_DIR)/debian/python-gtk-gnash.install.orig; \
+            mv -f $(BUILD_DIR)/debian/browser-plugin-gnash.dirs 
$(BUILD_DIR)/debian/browser-plugin-gnash.orig; \
           fi; \
           echo $(FIREFOX_PLUGINS) | sed -e 's:/::' > 
$(BUILD_DIR)/debian/browser-plugin-gnash.dirs; \
        fi;

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

Summary of changes:
 packaging/deb.am |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash