[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-295-g35b8245

[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  35b82458979f3f0550f00c9e39827ca718292566 (commit)
      from  72e00f4e5869198a8e428f32b5c028e7c8f41cc2 (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 35b82458979f3f0550f00c9e39827ca718292566
Author: Jeremie Scheer <jer...@ar...>
Date:   Fri May 4 18:12:00 2012 +0200

    [BUILDROOT] Fix QWT package source URL.
    [BUILDROOT] Fix QWT package qmake path for configuration.

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

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 8d2d1a9..552296a 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-03-16 17:30:27.000000000 +0100
-+++ buildroot/package/Config.in	2012-03-19 18:24:10.000000000 +0100
+--- buildroot.orig/package/Config.in	2012-05-04 18:01:25.000000000 +0200
++++ buildroot/package/Config.in	2012-05-04 18:09:24.000000000 +0200
 @@ -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-03-19 15:48:04.000000000 +0100
++++ buildroot/package/qwt/Config.in	2012-05-04 18:01:25.000000000 +0200
 @@ -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-03-19 15:48:04.000000000 +0100
++++ buildroot/package/qwt/qwt-5.2.1-change_install_dir_and_no_designer.patch	2012-05-04 18:01:25.000000000 +0200
 @@ -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-03-19 18:24:33.000000000 +0100
++++ buildroot/package/qwt/qwt.mk	2012-05-04 18:03:07.000000000 +0200
 @@ -0,0 +1,82 @@
 +######################################################################
 +#
@@ -87,7 +87,7 @@ Index: buildroot/package/qwt/qwt.mk
 +
 +QWT_VERSION:=5.2.1
 +QWT_SOURCE:=qwt-$(QWT_VERSION).zip
-+QWT_SITE:=https://sourceforge.net/projects/qwt/files/qwt/$(QWT_VERSION)
++QWT_SITE:=http://sourceforge.net/projects/qwt/files/qwt/$(QWT_VERSION)
 +QWT_UNZIP:=unzip
 +QWT_TARGET_DIR:=$(BUILD_DIR)/qwt-$(QWT_VERSION)
 +QWT_CONFIG_FILE:=qwt.pro
@@ -109,7 +109,7 @@ Index: buildroot/package/qwt/qwt.mk
 +
 +$(QWT_TARGET_DIR)/.configured: $(QWT_TARGET_DIR)/.unpacked
 +	-[ -f $(QWT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QWT_TARGET_DIR) distclean
-+	$(QT_DIR)/bin/qmake $(QWT_TARGET_DIR)/$(QWT_CONFIG_FILE)
++	$(QT_HOST_DIR)/bin/qmake $(QWT_TARGET_DIR)/$(QWT_CONFIG_FILE)
 +	touch $@
 +
 +$(QWT_TARGET_DIR)/.compiled: $(QWT_TARGET_DIR)/.configured


hooks/post-receive
-- 
armadeus