[Gnash-commit] [SCM] Gnash branch, master, updated. 0c49a88bdb50e9717e42163f6401d776788b1ad2

[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  0c49a88bdb50e9717e42163f6401d776788b1ad2 (commit)
       via  7bcd4ce9ebd9d5bf8be892044ab158959afb0f18 (commit)
       via  1e2e75a2cf9e322e6f9be6463a2b39718dbaa87d (commit)
      from  33875ea91377cfac80c4cc5ab766dfacf2ebcbdd (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=0c49a88bdb50e9717e42163f6401d776788b1ad2


commit 0c49a88bdb50e9717e42163f6401d776788b1ad2
Merge: 7bcd4ce 33875ea
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 14:54:14 2010 -0600

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


http://git.savannah.gnu.org/cgit//commit/?id=7bcd4ce9ebd9d5bf8be892044ab158959afb0f18


commit 7bcd4ce9ebd9d5bf8be892044ab158959afb0f18
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 14:53:57 2010 -0600

    drop libxv, add lsb-release

diff --git a/packaging/debian/control b/packaging/debian/control
index 127096e..b47efe0 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -30,13 +30,12 @@ Build-Depends: dpkg-dev (>= 1.13.19),
               libsdl1.2-dev,
               intltool, 
               intltool-debian,
-              x11proto-video-dev,
-              libxv-dev,
               libmysqlclient-dev,
               libavformat-dev,
               libavcodec-dev,
               libavutil-dev,
-              libswscale-dev
+              libswscale-dev,
+              lsb-release
 # OpenGL packages are disabled for now
 # libgl1-mesa-dev, libglu1-mesa-dev, libgtkglext1-dev, libqt4-opengl-dev, 
 Standards-Version: 3.8.4

http://git.savannah.gnu.org/cgit//commit/?id=1e2e75a2cf9e322e6f9be6463a2b39718dbaa87d


commit 1e2e75a2cf9e322e6f9be6463a2b39718dbaa87d
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 14:53:19 2010 -0600

    use the lsb_release ID instead of the python version, as this is a distro 
specific test

diff --git a/packaging/deb.am b/packaging/deb.am
index ef16394..bf639df 100644
--- a/packaging/deb.am
+++ b/packaging/deb.am
@@ -140,8 +140,9 @@ deb-edit-utilities:
 
 # Python is at different revisions and paths depending on the Distribution and 
release
 deb-edit-python:
-       @version=`python --version  2>&1 | tr -d '.' | cut -d ' ' -f 2`; \
-        if test $${version} -gt 260; then \
+       @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; \

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

Summary of changes:
 packaging/deb.am         |    5 +++--
 packaging/debian/control |    5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash