[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-158-g66cf271

[jscheer <js...@us...>]

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 "armadeus".

The branch, master has been updated
       via  66cf2713e93d3a179dd126f306ca79bdc9606de9 (commit)
       via  35c3b1e0ea8543dbaee0a27f2b515fc59603342a (commit)
      from  d9ebdafc9f402ec241f085573fb52837833185dc (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 -----------------------------------------------------------------
commit 66cf2713e93d3a179dd126f306ca79bdc9606de9
Merge: 35c3b1e d9ebdaf
Author: Jeremie Scheer <jer...@ar...>
Date:   Mon Mar 19 18:26:31 2012 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 35c3b1e0ea8543dbaee0a27f2b515fc59603342a
Author: Jeremie Scheer <jer...@ar...>
Date:   Mon Mar 19 18:25:48 2012 +0100

    [BUILDROOT] Fix QWT patch Qt directory variable.

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

Summary of changes:
 .../buildroot/2012.02/133-qwt-add_package.patch    |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/patches/buildroot/2012.02/133-qwt-add_package.patch b/patches/buildroot/2012.02/133-qwt-add_package.patch
index c0860ab..8d2d1a9 100644
--- a/patches/buildroot/2012.02/133-qwt-add_package.patch
+++ b/patches/buildroot/2012.02/133-qwt-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
 
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in	2012-02-21 16:45:49.000000000 +0100
-+++ buildroot/package/Config.in	2012-02-21 16:45:52.000000000 +0100
+--- buildroot.orig/package/Config.in	2012-03-16 17:30:27.000000000 +0100
++++ buildroot/package/Config.in	2012-03-19 18:24:10.000000000 +0100
 @@ -140,6 +140,7 @@
  comment "other GUIs"
  source "package/efl/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
 Index: buildroot/package/qwt/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/Config.in	2012-02-21 16:45:52.000000000 +0100
++++ buildroot/package/qwt/Config.in	2012-03-19 15:48:04.000000000 +0100
 @@ -0,0 +1,20 @@
 +comment "Qwt requires Qt to be installed"
 +	depends on !BR2_PACKAGE_QT
@@ -42,7 +42,7 @@ Index: buildroot/package/qwt/Config.in
 Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch	2012-02-21 16:45:52.000000000 +0100
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch	2012-03-19 15:48:04.000000000 +0100
 @@ -0,0 +1,30 @@
 +--- qwt-5.2.1/qwtconfig.pri.orig	2010-09-28 14:34:01.000000000 +0200
 ++++ qwt-5.2.1/qwtconfig.pri	2010-09-28 15:37:02.000000000 +0200
@@ -77,7 +77,7 @@ Index: buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch
 Index: buildroot/package/qwt/qwt.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/qwt/qwt.mk	2012-02-21 16:45:52.000000000 +0100
++++ buildroot/package/qwt/qwt.mk	2012-03-19 18:24:33.000000000 +0100
 @@ -0,0 +1,82 @@
 +######################################################################
 +#
@@ -92,7 +92,7 @@ Index: buildroot/package/qwt/qwt.mk
 +QWT_TARGET_DIR:=$(BUILD_DIR)/qwt-$(QWT_VERSION)
 +QWT_CONFIG_FILE:=qwt.pro
 +QWT_EXAMPLES_CONFIG_FILE:=examples.pro
-+QT_DIR:=$(HOST_DIR)/usr
++QT_HOST_DIR:=$(HOST_DIR)/usr
 +
 +$(DL_DIR)/$(QWT_SOURCE):
 +	$(call DOWNLOAD,$(QWT_SITE),$(QWT_SOURCE))
@@ -125,7 +125,7 @@ Index: buildroot/package/qwt/qwt.mk
 +
 +$(QWT_TARGET_DIR)/examples/.configured:
 +	-[ -f $(QWT_TARGET_DIR)/examples/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR)/examples distclean
-+	$(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
++	$(QT_HOST_DIR)/bin/qmake $(QWT_TARGET_DIR)/examples/$(QWT_EXAMPLES_CONFIG_FILE)
 +	touch $@
 +
 +$(QWT_TARGET_DIR)/examples/.compiled: $(QWT_TARGET_DIR)/examples/.configured


hooks/post-receive
-- 
armadeus