[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-29-g8e9c7ab

[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  8e9c7abcdcce343f9fa47e39ecf1d26edce6b2c2 (commit)
       via  211a63805dacb725f4df2c368f7d83da459843c3 (commit)
      from  61a40fae286177d40721a4634c2fd360c293eed1 (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 8e9c7abcdcce343f9fa47e39ecf1d26edce6b2c2
Merge: 211a638 61a40fa
Author: Jeremie Scheer <jer...@ar...>
Date:   Mon Feb 6 17:13:53 2012 +0100

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

commit 211a63805dacb725f4df2c368f7d83da459843c3
Author: Jeremie Scheer <jer...@ar...>
Date:   Mon Feb 6 17:12:44 2012 +0100

    [BUILDROOT] Fix qmake path in Qwt Makefile.

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

Summary of changes:
 .../buildroot/2011.05/133-qwt-add_package.patch    |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/buildroot/2011.05/133-qwt-add_package.patch b/patches/buildroot/2011.05/133-qwt-add_package.patch
index 6583c87..a931316 100644
--- a/patches/buildroot/2011.05/133-qwt-add_package.patch
+++ b/patches/buildroot/2011.05/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	2011-08-08 12:16:09.000000000 +0200
-+++ buildroot/package/Config.in	2011-08-08 12:16:21.000000000 +0200
+--- buildroot.orig/package/Config.in	2012-02-06 17:00:50.000000000 +0100
++++ buildroot/package/Config.in	2012-02-06 17:05:03.000000000 +0100
 @@ -134,6 +134,7 @@
  
  comment "other GUIs"
@@ -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	2011-08-08 12:16:21.000000000 +0200
++++ buildroot/package/qwt/Config.in	2012-02-06 17:00:50.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	2011-08-08 12:16:21.000000000 +0200
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch	2012-02-06 17:00:50.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	2011-08-08 12:16:21.000000000 +0200
++++ buildroot/package/qwt/qwt.mk	2012-02-06 17:06:49.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:=$(STAGING_DIR)/usr
++QT_DIR:=$(HOST_DIR)/usr
 +
 +$(DL_DIR)/$(QWT_SOURCE):
 +	$(call DOWNLOAD,$(QWT_SITE),$(QWT_SOURCE))


hooks/post-receive
-- 
armadeus