[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-553-gfb72aed

[Fabien M <fa...@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  fb72aedbc92c05f903c6d438ffb0b2c3fc2c607a (commit)
       via  0f0427e9b4e58c9e513db9e82f4cbde8ad857815 (commit)
      from  53368b143adfe51c95f15afbcb78bad2a504cf30 (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 fb72aedbc92c05f903c6d438ffb0b2c3fc2c607a
Merge: 0f0427e9b4e58c9e513db9e82f4cbde8ad857815 53368b143adfe51c95f15afbcb78bad2a504cf30
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jul 27 15:08:11 2010 +0200

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

commit 0f0427e9b4e58c9e513db9e82f4cbde8ad857815
Author: Fabien Marteau <fab...@ar...>
Date:   Tue Jul 27 15:07:15 2010 +0200

    [buildroot] Put joysticktest package in the right place in menuconfig

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

Summary of changes:
 ...est-add_joystick_testing_programs_package.patch |   23 ++++++++++---------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
index 3b234cf..c86d77c 100644
--- a/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
+++ b/patches/buildroot/123-joysticktest-add_joystick_testing_programs_package.patch
@@ -4,19 +4,20 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
 
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in	2010-07-13 15:27:37.000000000 +0200
-+++ buildroot/package/Config.in	2010-07-13 15:36:09.000000000 +0200
-@@ -499,5 +499,6 @@
- 
- # various games packages
- source "package/games/Config.in"
+--- buildroot.orig/package/Config.in	2010-07-27 14:34:09.000000000 +0200
++++ buildroot/package/Config.in	2010-07-27 15:02:52.000000000 +0200
+@@ -268,6 +268,7 @@
+ source "package/i2c-tools/Config.in"
+ source "package/input-tools/Config.in"
+ source "package/iostat/Config.in"
 +source "package/joysticktest/Config.in"
- 
- endmenu
+ source "package/lcd4linux/Config.in"
+ source "package/libaio/Config.in"
+ source "package/libraw1394/Config.in"
 Index: buildroot/package/joysticktest/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/Config.in	2010-07-13 15:27:37.000000000 +0200
++++ buildroot/package/joysticktest/Config.in	2010-07-27 14:34:09.000000000 +0200
 @@ -0,0 +1,4 @@
 +config BR2_PACKAGE_JOYSTICKTEST
 +        bool "joysticktest"
@@ -25,7 +26,7 @@ Index: buildroot/package/joysticktest/Config.in
 Index: buildroot/package/joysticktest/joysticktest.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest.mk	2010-07-13 15:34:38.000000000 +0200
++++ buildroot/package/joysticktest/joysticktest.mk	2010-07-27 14:34:09.000000000 +0200
 @@ -0,0 +1,51 @@
 +#############################################################
 +#
@@ -81,7 +82,7 @@ Index: buildroot/package/joysticktest/joysticktest.mk
 Index: buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch	2010-07-13 15:28:27.000000000 +0200
++++ buildroot/package/joysticktest/joysticktest-1.2.15-compile_only_testing_programs.patch	2010-07-27 14:34:09.000000000 +0200
 @@ -0,0 +1,198 @@
 +Index: joystick-1.2.15/Makefile
 +===================================================================


hooks/post-receive
-- 
armadeus