[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-115-g17efd23

[Sébastien S. <ss...@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  17efd236389445ce86eda5b53b1dc26aebfe9125 (commit)
      from  74a31dd148e0472e02dd0489ac68ae9eef8f07f8 (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 17efd236389445ce86eda5b53b1dc26aebfe9125
Author: Sébastien Szymanski <ss...@us...>
Date:   Mon Feb 17 09:16:50 2014 +0100

    [BUILDROOT] 2013.11: qt: move to version 4.8.5

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

Summary of changes:
 ...-qt-full_integration_with_cross_compiling.patch |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/patches/buildroot/2013.11/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2013.11/132-qt-full_integration_with_cross_compiling.patch
index 8f13f31..afe0268 100644
--- a/patches/buildroot/2013.11/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2013.11/132-qt-full_integration_with_cross_compiling.patch
@@ -4,9 +4,9 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
 
 Index: buildroot/package/qt/Config.in
 ===================================================================
---- buildroot.orig/package/qt/Config.in	2013-05-31 22:29:04.000000000 +0200
-+++ buildroot/package/qt/Config.in	2013-08-22 14:59:25.000000000 +0200
-@@ -18,7 +18,13 @@
+--- buildroot.orig/package/qt/Config.in
++++ buildroot/package/qt/Config.in
+@@ -21,7 +21,13 @@ config BR2_PACKAGE_QT_DEBUG
  	  If unsure, say N.
  
  config BR2_PACKAGE_QT_DEMOS
@@ -23,22 +23,22 @@ Index: buildroot/package/qt/Config.in
  	  If unsure, say N.
 Index: buildroot/package/qt/qt.mk
 ===================================================================
---- buildroot.orig/package/qt/qt.mk	2013-05-31 22:29:04.000000000 +0200
-+++ buildroot/package/qt/qt.mk	2013-08-22 15:03:52.000000000 +0200
+--- buildroot.orig/package/qt/qt.mk
++++ buildroot/package/qt/qt.mk
 @@ -11,9 +11,10 @@
  #
- ######################################################################
+ ################################################################################
  
 -QT_VERSION = 4.8.5
 +QT_VERSION_MAJOR = 4.8
-+QT_VERSION = $(QT_VERSION_MAJOR).4
++QT_VERSION = $(QT_VERSION_MAJOR).5
  QT_SOURCE  = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
 -QT_SITE    = http://download.qt-project.org/official_releases/qt/4.8/$(QT_VERSION)
-+QT_SITE    = http://download.qt-project.org/archive/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
++QT_SITE    = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
  QT_DEPENDENCIES = host-pkgconf
  QT_INSTALL_STAGING = YES
  
-@@ -57,9 +58,14 @@
+@@ -58,9 +59,14 @@ QT_CONFIGURE_OPTS += -no-qt3support
  endif
  
  ifeq ($(BR2_PACKAGE_QT_DEMOS),y)


hooks/post-receive
-- 
armadeus