[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-487-g9149a3d

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  9149a3d57af0fbfcbe3675bdd45e5123dba48736 (commit)
      from  144a9f147c815612cf5b2826d63a1ae04bab7876 (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 9149a3d57af0fbfcbe3675bdd45e5123dba48736
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Jun 21 16:43:41 2010 +0200

    Forgot a patch file when moving fbtest package as BR patch

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

Summary of changes:
 patches/buildroot/119-fbtest-add_package.patch     |   16 ++++++++++
 .../buildroot/2010.05/119-fbtest-add_package.patch |   30 +++++++++++++++----
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/patches/buildroot/119-fbtest-add_package.patch b/patches/buildroot/119-fbtest-add_package.patch
index 5ddfb1e..4406f6b 100644
--- a/patches/buildroot/119-fbtest-add_package.patch
+++ b/patches/buildroot/119-fbtest-add_package.patch
@@ -139,3 +139,19 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
 + 
 + OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
 + 	tests/tests.o
+Index: buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch	2010-06-21 16:35:18.000000000 +0200
+@@ -0,0 +1,11 @@
++--- fbtest-20041102-1.org/pnmtohex/Makefile	2004-11-02 09:43:02.000000000 +0100
+++++ fbtest-20041102-1/pnmtohex/Makefile	2005-11-16 22:24:08.406157582 +0100
++@@ -3,7 +3,7 @@ TOPDIR = ..
++ 
++ HOST_TARGET = pnmtohex
++ 
++-LIBS += -lnetpnm -lnetpbm -lnetpgm -lnetppm
+++LIBS += -lnetpbm -lm
++ 
++ include $(TOPDIR)/Rules.make
++ 
diff --git a/patches/buildroot/2010.05/119-fbtest-add_package.patch b/patches/buildroot/2010.05/119-fbtest-add_package.patch
index 33b4125..f62df8a 100644
--- a/patches/buildroot/2010.05/119-fbtest-add_package.patch
+++ b/patches/buildroot/2010.05/119-fbtest-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
 
 Index: buildroot/package/Config.in
 ===================================================================
---- buildroot.orig/package/Config.in	2010-06-18 23:44:05.000000000 +0200
-+++ buildroot/package/Config.in	2010-06-18 23:49:19.000000000 +0200
-@@ -95,6 +95,7 @@
+--- buildroot.orig/package/Config.in	2010-06-21 16:33:40.000000000 +0200
++++ buildroot/package/Config.in	2010-06-21 16:34:21.000000000 +0200
+@@ -99,6 +99,7 @@
  if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
  source "package/fbset/Config.in"
  endif
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
 Index: buildroot/package/fbtest/Config.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/Config.in	2010-06-18 23:51:27.000000000 +0200
++++ buildroot/package/fbtest/Config.in	2010-06-21 16:33:40.000000000 +0200
 @@ -0,0 +1,7 @@
 +config BR2_PACKAGE_FBTEST
 +	bool "fbtest"
@@ -29,7 +29,7 @@ Index: buildroot/package/fbtest/Config.in
 Index: buildroot/package/fbtest/fbtest.mk
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest.mk	2010-06-18 23:56:39.000000000 +0200
++++ buildroot/package/fbtest/fbtest.mk	2010-06-21 16:33:40.000000000 +0200
 @@ -0,0 +1,51 @@
 +#############################################################
 +#
@@ -85,7 +85,7 @@ Index: buildroot/package/fbtest/fbtest.mk
 Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch	2010-06-18 23:56:15.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch	2010-06-21 16:33:40.000000000 +0200
 @@ -0,0 +1,36 @@
 +--- fbtest-20041102-1.org/fb.c	2003-04-04 14:07:55.000000000 +0200
 ++++ fbtest-20041102-1/fb.c	2009-05-20 10:32:32.000000000 +0200
@@ -126,7 +126,7 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
 Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch	2010-06-19 00:01:03.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch	2010-06-21 16:33:40.000000000 +0200
 @@ -0,0 +1,11 @@
 +--- fbtest-20041102-1.org/Makefile	2009-05-21 10:16:05.000000000 +0200
 ++++ fbtest-20041102-1/Makefile	2009-05-21 10:17:47.000000000 +0200
@@ -139,3 +139,19 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
 + 
 + OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
 + 	tests/tests.o
+Index: buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch	2010-06-21 16:35:18.000000000 +0200
+@@ -0,0 +1,11 @@
++--- fbtest-20041102-1.org/pnmtohex/Makefile	2004-11-02 09:43:02.000000000 +0100
+++++ fbtest-20041102-1/pnmtohex/Makefile	2005-11-16 22:24:08.406157582 +0100
++@@ -3,7 +3,7 @@ TOPDIR = ..
++ 
++ HOST_TARGET = pnmtohex
++ 
++-LIBS += -lnetpnm -lnetpbm -lnetpgm -lnetppm
+++LIBS += -lnetpbm -lm
++ 
++ include $(TOPDIR)/Rules.make
++ 


hooks/post-receive
-- 
armadeus


