[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-78-g8a2d2a3

[Julien B a. A. <ar...@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  8a2d2a31d213297ae70a5805c090e06201e32874 (commit)
       via  64384040b7fe3bfcf25e805bc95d86c165b82a0d (commit)
      from  85e4189cb79797f90cc1ff9e238d7ff2b6f1d58c (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 8a2d2a31d213297ae70a5805c090e06201e32874
Merge: 6438404 85e4189
Author: Julien Boibessot <jul...@ar...>
Date:   Thu Dec 27 12:00:48 2012 +0100

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

commit 64384040b7fe3bfcf25e805bc95d86c165b82a0d
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Nov 27 10:10:23 2012 +0100

    [BUILDROOT] 2012.02: compat-wireless: makes 2012-11-18 patches only apply when 2012-11-18 version is selected

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

Summary of changes:
 .../2012.02/199-compat-wireless-add_package.patch  |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/buildroot/2012.02/199-compat-wireless-add_package.patch b/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
index 0fc6503..f80d2dd 100644
--- a/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
+++ b/patches/buildroot/2012.02/199-compat-wireless-add_package.patch
@@ -89,10 +89,10 @@ Index: buildroot/package/Config.in
  source "package/cramfs/Config.in"
  source "package/cwiid/Config.in"
  source "package/dbus/Config.in"
-Index: buildroot/package/compat-wireless/compat-wireless-2012-11-18-hacks.patch
+Index: buildroot/package/compat-wireless/compat-wireless-2012-11-18/compat-wireless-2012-11-18-hacks.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/compat-wireless/compat-wireless-2012-11-18-hacks.patch	2012-11-25 17:12:17.000000000 +0100
++++ buildroot/package/compat-wireless/compat-wireless-2012-11-18/compat-wireless-2012-11-18-hacks.patch	2012-11-25 17:12:17.000000000 +0100
 @@ -0,0 +1,24 @@
 +Remove x86 specific stuff.
 +Better way has to be found IMHO before sending to BR mainline.


hooks/post-receive
-- 
armadeus