[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 4505e32152dfb557b8bb
From: |
Rob Savoye |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 4505e32152dfb557b8bb2ec68464e525f8ba9d09 |
Date: |
Mon, 04 Oct 2010 12:58:53 +0000 |
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 4505e32152dfb557b8bb2ec68464e525f8ba9d09 (commit)
via edea6e1cd8c22e2a819d87058c41c05e0290c633 (commit)
via 06f5a491973e016b3c573db661d723a5442a5c78 (commit)
via a167d3f7c648fcc9fc07871e4c89418f84588f15 (commit)
from 8bf9901e124b346512817aa0de46a79a45a17d26 (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=4505e32152dfb557b8bb2ec68464e525f8ba9d09
commit 4505e32152dfb557b8bb2ec68464e525f8ba9d09
Author: Rob Savoye <address@hidden>
Date: Mon Oct 4 06:58:46 2010 -0600
only build some of the extensions
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 51ed293..dc22c2b 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -148,7 +148,7 @@ CONFIGURE_FLAGS = CFLAGS="$(CFLAGS)" \
--enable-python \
--with-plugins-install=system \
--disable-dependency-tracking \
- --enable-extensions=all \
+ --enable-extension=fileio,lirc,mysql \
$(BUILD_FLAGS)
config: config-stamp
http://git.savannah.gnu.org/cgit//commit/?id=edea6e1cd8c22e2a819d87058c41c05e0290c633
commit edea6e1cd8c22e2a819d87058c41c05e0290c633
Author: Rob Savoye <address@hidden>
Date: Mon Oct 4 06:58:07 2010 -0600
add libqt4-dev and kdelibs-bin
diff --git a/packaging/debian/control b/packaging/debian/control
index 2e63958..80d32fb 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -17,7 +17,10 @@ Build-Depends: dpkg-dev (>= 1.13.19),
libgtk2.0-dev,
libatk1.0-dev,
python2.6-dev | python2.5-dev,
- kdelibs5-dev, python-gtk2-dev,
+ kdelibs5-dev | kdelibs-dev,
+ kdelibs-bin,
+ libqt4-dev,
+ python-gtk2-dev,
qt4-qmake,
docbook,
docbook2x,
http://git.savannah.gnu.org/cgit//commit/?id=06f5a491973e016b3c573db661d723a5442a5c78
commit 06f5a491973e016b3c573db661d723a5442a5c78
Author: Rob Savoye <address@hidden>
Date: Mon Oct 4 06:55:49 2010 -0600
don't edit the other include dirs for qt4 away, or it breaks pbuilder.
diff --git a/macros/qt4.m4 b/macros/qt4.m4
index 416c74f..e3c1060 100644
--- a/macros/qt4.m4
+++ b/macros/qt4.m4
@@ -68,7 +68,7 @@ dnl fi
if test x$cross_compiling = xno; then
if test x"${PKG_CONFIG}" != x -a x"${ac_cv_path_qt4_incl}" = x; then
${PKG_CONFIG} --exists QtOpenGL QtCore QtGui &&
ac_cv_path_qt4_incl="`$PKG_CONFIG --cflags-only-I QtOpenGL QtCore QtGui`"
- gnash_qt4_topdir=`echo "${ac_cv_path_qt4_incl}" | sed -e 's/-I//g' |
cut -d ' ' -f 1`
+ gnash_qt4_topdir=`echo "${ac_cv_path_qt4_incl}"`
fi
fi
http://git.savannah.gnu.org/cgit//commit/?id=a167d3f7c648fcc9fc07871e4c89418f84588f15
commit a167d3f7c648fcc9fc07871e4c89418f84588f15
Author: Rob Savoye <address@hidden>
Date: Mon Oct 4 06:54:51 2010 -0600
use the python version instead of uname when editing the python deb files.
diff --git a/packaging/deb.am b/packaging/deb.am
index 9057f26..ef16394 100644
--- a/packaging/deb.am
+++ b/packaging/deb.am
@@ -140,8 +140,8 @@ deb-edit-utilities:
# Python is at different revisions and paths depending on the Distribution and
release
deb-edit-python:
- @ubuntu=`uname -a | grep -ci ubuntu`; \
- if test $${ubuntu} -eq 1; then \
+ @version=`python --version 2>&1 | tr -d '.' | cut -d ' ' -f 2`; \
+ if test $${version} -gt 260; 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:
macros/qt4.m4 | 2 +-
packaging/deb.am | 4 ++--
packaging/debian/control | 5 ++++-
packaging/debian/rules | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 4505e32152dfb557b8bb2ec68464e525f8ba9d09,
Rob Savoye <=