[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-142-g1484678

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  1484678ad850fcafcd51f6503401fb2b92fe4eb2 (commit)
       via  14dba0bec68b42fa96ed74bcc1cf4c3d386dd2f5 (commit)
      from  f3addf0634096076dc613602bb0baff83a2fab79 (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 1484678ad850fcafcd51f6503401fb2b92fe4eb2
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jan 26 22:47:49 2010 +0100

    [LINUX] Fixes APW Bluetooth module init and UART5 GPIOs freeing. Thanks to Nicolas S.

commit 14dba0bec68b42fa96ed74bcc1cf4c3d386dd2f5
Author: Julien Boibessot <jul...@ar...>
Date:   Tue Jan 26 22:33:09 2010 +0100

    [BUILDROOT] Patches cleanup

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

Summary of changes:
 .../2.6.29/281-apf27-armadeus-add_apf27.c.patch    |   27 +++++++++++---------
 ...eroot.patch => 038-fakeroot-bump_version.patch} |    0
 .../046-prboom-install_it_only_once.patch          |    2 +
 ...e_kernel_version_with_latest_minor_number.patch |    2 +-
 ...ownload_minor_patches_from_kernel_org_too.patch |    2 +-
 ...s_building_when_modules_compilation_fails.patch |    2 +-
 patches/buildroot/051-u-boot.patch                 |    2 +
 patches/buildroot/053-libusb.patch                 |    2 +
 .../054-ntp-allow_ntpd_selection_or_not.patch      |    8 ++++++
 ...serial.patch => 055-pyserial-add_package.patch} |    0
 patches/buildroot/056-makedevs.patch               |    2 +
 ...pymysql.patch => 057-pymysql-add_package.patch} |    0
 ...lsa_work_with_eabi_and_large_file_options.patch |    4 +++
 ...61-mysql_client-reduce_installation_size.patch} |    7 ++++-
 ...patch => 064-tslib-add_alternate_dl_site.patch} |    2 +
 ....patch => 065-mpfr-add_alternate_dl_site.patch} |    2 +
 ...=> 066-add_alternate_site_functionnality.patch} |    2 +
 patches/buildroot/067-libpcap_patch_failure.patch  |    2 +
 patches/buildroot/069-setserial_2.17-45.patch      |    2 +
 .../buildroot/073-php-fixes_download_site.patch    |    2 +
 ...0-compiles_tslib_before_sdl_if_applicable.patch |    2 +
 patches/buildroot/087-dont_hide_all_editors.patch  |    4 ++-
 ...ch => 092-zlib-use_cp_instead_of_install.patch} |    0
 .../093-sdl_ttf-add_freetype_dependancy.patch      |    2 +
 ...6-libsndfile-updates_makefile_to_autotool.patch |    2 +-
 25 files changed, 64 insertions(+), 18 deletions(-)
 rename patches/buildroot/{038-fakeroot.patch => 038-fakeroot-bump_version.patch} (100%)
 rename patches/buildroot/{055-pyserial.patch => 055-pyserial-add_package.patch} (100%)
 rename patches/buildroot/{057-pymysql.patch => 057-pymysql-add_package.patch} (100%)
 rename patches/buildroot/{061-mysql_client.patch => 061-mysql_client-reduce_installation_size.patch} (87%)
 rename patches/buildroot/{064-add_tslib_alternate_site.patch => 064-tslib-add_alternate_dl_site.patch} (85%)
 rename patches/buildroot/{065-add_mpfr_alternate_site.patch => 065-mpfr-add_alternate_dl_site.patch} (92%)
 rename patches/buildroot/{066-add_autotool_alternate_site.patch => 066-add_alternate_site_functionnality.patch} (98%)
 rename patches/buildroot/{092-zlib.patch => 092-zlib-use_cp_instead_of_install.patch} (100%)

diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
index b7a7f2e..0bf74ac 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/281-apf27-armadeus-add_apf27.c.patch
@@ -9,7 +9,7 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
 Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c	2010-01-19 17:08:44.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27.c	2010-01-21 11:06:41.000000000 +0100
 @@ -0,0 +1,712 @@
 + /*
 + * apf27.c
@@ -726,8 +726,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27.c
 Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c	2010-01-19 17:21:40.000000000 +0100
-@@ -0,0 +1,1018 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c	2010-01-26 22:31:08.000000000 +0100
+@@ -0,0 +1,1019 @@
 + /*
 + * apf27-dev.c
 + * Support for AFP27 module's development baseboard
@@ -1068,7 +1068,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
 +
 +static int uart_mxc_port4_exit(struct platform_device *pdev)
 +{
-+	mxc_gpio_release_multiple_pins(mxc_uart1_pins, ARRAY_SIZE(mxc_uart4_pins));
++	mxc_gpio_release_multiple_pins(mxc_uart4_pins,
++			ARRAY_SIZE(mxc_uart4_pins));
 +
 +	return 0;
 +}
@@ -1749,7 +1750,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev.c
 Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c	2010-01-19 17:08:44.000000000 +0100
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c	2010-01-21 11:06:41.000000000 +0100
 @@ -0,0 +1,220 @@
 +/*
 + * apf27-lcd.c
@@ -1974,8 +1975,8 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-lcd.c
 Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c	2010-01-19 17:08:44.000000000 +0100
-@@ -0,0 +1,199 @@
++++ linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c	2010-01-26 19:01:12.000000000 +0100
+@@ -0,0 +1,201 @@
 + /*
 + * apf27-dev-ext-apw.c
 + * Support for AFP27Dev's wireless extension board.
@@ -2071,12 +2072,12 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
 +   extension board */
 +#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT_WIFI
 +
-+#define BT_RESET	(GPIO_PORTB | 14)	/* CSI_D4 */
++#define BT_RESETn	(GPIO_PORTB | 14)	/* CSI_D4 */
 +#define WIFI_PWRDNn	(GPIO_PORTE | 10)	/* UART3_CTS */
 +
 +static int apw_bt_wifi_pins[] = {
 +#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
-+	(BT_RESET | GPIO_OUT | GPIO_GPIO),	/* Shared with CSI */
++	(BT_RESETn | GPIO_OUT | GPIO_GPIO),	/* Shared with CSI */
 +#endif
 +	(WIFI_PWRDNn | GPIO_OUT | GPIO_GPIO),
 +};
@@ -2116,7 +2117,9 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
 +	int res;
 +
 +	gpio_set_value(WIFI_PWRDNn, 1);	/* WiFi on */
-+
++#ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
++	gpio_set_value(BT_RESETn, 1);	/* Bluetooth on */
++#endif
 +	res = mxc_gpio_setup_multiple_pins(apw_bt_wifi_pins,
 +			ARRAY_SIZE(apw_bt_wifi_pins), "BT_WIFI");
 +	if (!res)
@@ -2131,7 +2134,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
 +{
 +#ifdef CONFIG_PM
 +# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
-+	gpio_set_value(BT_RESET, 0);
++	gpio_set_value(BT_RESETn, 1);
 +# endif
 +# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_WIFI
 +	gpio_set_value(WIFI_PWRDNn, 1);
@@ -2146,7 +2149,7 @@ Index: linux-2.6.29.6/arch/arm/mach-mx2/apf27-dev-ext-apw.c
 +{
 +#ifdef CONFIG_PM
 +# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_BT
-+	gpio_set_value(BT_RESET, 1);
++	gpio_set_value(BT_RESETn, 0);
 +# endif
 +# ifdef CONFIG_MACH_APF27_DEV_EXT_WIRELESS_WIFI
 +	gpio_set_value(WIFI_PWRDNn, 0);
diff --git a/patches/buildroot/038-fakeroot.patch b/patches/buildroot/038-fakeroot-bump_version.patch
similarity index 100%
rename from patches/buildroot/038-fakeroot.patch
rename to patches/buildroot/038-fakeroot-bump_version.patch
diff --git a/patches/buildroot/046-prboom-install_it_only_once.patch b/patches/buildroot/046-prboom-install_it_only_once.patch
index e26ddca..39185ac 100644
--- a/patches/buildroot/046-prboom-install_it_only_once.patch
+++ b/patches/buildroot/046-prboom-install_it_only_once.patch
@@ -2,6 +2,8 @@ Install PrBoom only once.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
+Integrated in latest BR.
+
 Index: buildroot/package/games/prboom/prboom.mk
 ===================================================================
 --- buildroot/package/games/prboom/prboom.mk	(revision 23937)
diff --git a/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch b/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch
index 392e7af..6c79a48 100644
--- a/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch
+++ b/patches/buildroot/048-linux-correctly_define_kernel_version_with_latest_minor_number.patch
@@ -1,6 +1,6 @@
 "Calculate" BR2_LINUX26_VERSION when BR2_KERNEL_ADD_LATEST_MINORPATCH is used.
 
-Sent to Buildroot guys.
+Sent to Buildroot guys. Not integrated.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
diff --git a/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch b/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
index 66ae854..8a7a737 100644
--- a/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
+++ b/patches/buildroot/049-linux-download_minor_patches_from_kernel_org_too.patch
@@ -1,6 +1,6 @@
 Download Kernel.org minor patches at the same time as full sources.
 
-Sent to Buildroot guys.
+Sent to Buildroot guys. Not integrated.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
diff --git a/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch b/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch
index 6e18d3f..7986c6e 100644
--- a/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch
+++ b/patches/buildroot/050-linux-stops_building_when_modules_compilation_fails.patch
@@ -1,6 +1,6 @@
 Stops Linux building when modules compilation fails.
 
-Sent to Buildroot guys.
+Sent to Buildroot guys. Not integrated.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
diff --git a/patches/buildroot/051-u-boot.patch b/patches/buildroot/051-u-boot.patch
index 2697416..937ec89 100644
--- a/patches/buildroot/051-u-boot.patch
+++ b/patches/buildroot/051-u-boot.patch
@@ -1,3 +1,5 @@
+Never send to BR.
+
 Index: buildroot/target/u-boot/Config.in
 ===================================================================
 --- buildroot.orig/target/u-boot/Config.in	2008-11-03 09:15:09.000000000 +0100
diff --git a/patches/buildroot/053-libusb.patch b/patches/buildroot/053-libusb.patch
index 8ee4ff0..dfff8c8 100644
--- a/patches/buildroot/053-libusb.patch
+++ b/patches/buildroot/053-libusb.patch
@@ -1,3 +1,5 @@
+Latest BR downgrades to 0.1.12-10 from snapshot.debian.net
+
 --- buildroot/package/libusb/libusb.mk~	2008-11-21 09:15:25.000000000 +0100
 +++ buildroot/package/libusb/libusb.mk	2008-11-22 18:12:18.000000000 +0100
 @@ -4,7 +4,7 @@
diff --git a/patches/buildroot/054-ntp-allow_ntpd_selection_or_not.patch b/patches/buildroot/054-ntp-allow_ntpd_selection_or_not.patch
index a7c9afb..8eee944 100644
--- a/patches/buildroot/054-ntp-allow_ntpd_selection_or_not.patch
+++ b/patches/buildroot/054-ntp-allow_ntpd_selection_or_not.patch
@@ -1,3 +1,11 @@
+Some systems might only want to install ntpdate without installing
+(and launching at each startup ntpd daemon). So makes the installation of
+ntpd selectable.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Would BR be interested ?
+
 --- buildroot/package/ntp/Config.in	2008-11-03 09:15:26.000000000 +0100
 +++ buildroot/package/ntp/Config.in	2008-11-26 12:11:59.000000000 +0100
 @@ -6,6 +6,12 @@
diff --git a/patches/buildroot/055-pyserial.patch b/patches/buildroot/055-pyserial-add_package.patch
similarity index 100%
rename from patches/buildroot/055-pyserial.patch
rename to patches/buildroot/055-pyserial-add_package.patch
diff --git a/patches/buildroot/056-makedevs.patch b/patches/buildroot/056-makedevs.patch
index 0b7271b..8bfdbca 100644
--- a/patches/buildroot/056-makedevs.patch
+++ b/patches/buildroot/056-makedevs.patch
@@ -1,3 +1,5 @@
+Integrated in latest BR.
+
 Signed-off-by: Jeremy Kerr
 Signed-off-by: Thomas Petazzoni
 
diff --git a/patches/buildroot/057-pymysql.patch b/patches/buildroot/057-pymysql-add_package.patch
similarity index 100%
rename from patches/buildroot/057-pymysql.patch
rename to patches/buildroot/057-pymysql-add_package.patch
diff --git a/patches/buildroot/058-makes_alsa_work_with_eabi_and_large_file_options.patch b/patches/buildroot/058-makes_alsa_work_with_eabi_and_large_file_options.patch
index 713ff3d..745c6d8 100644
--- a/patches/buildroot/058-makes_alsa_work_with_eabi_and_large_file_options.patch
+++ b/patches/buildroot/058-makes_alsa_work_with_eabi_and_large_file_options.patch
@@ -3,6 +3,10 @@ Deals with following points:
 * pb when compiled with EABI
 * pb when compiled with -D_FILE_OFFSET_BITS=64 flag
 
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Needs to be merged with latest BR modifications.
+
 --- buildroot/package/audio/alsa-lib/alsa-lib.mk.org	2008-12-11 14:35:36.000000000 +0100
 +++ buildroot/package/audio/alsa-lib/alsa-lib.mk	2008-12-11 14:43:07.000000000 +0100
 @@ -11,14 +11,16 @@
diff --git a/patches/buildroot/061-mysql_client.patch b/patches/buildroot/061-mysql_client-reduce_installation_size.patch
similarity index 87%
rename from patches/buildroot/061-mysql_client.patch
rename to patches/buildroot/061-mysql_client-reduce_installation_size.patch
index 7f2ca6b..113b695 100644
--- a/patches/buildroot/061-mysql_client.patch
+++ b/patches/buildroot/061-mysql_client-reduce_installation_size.patch
@@ -1,3 +1,8 @@
+Help to reduce size of mysql client installation by adding an option to remove
+unneeded stuff for most everyday use.
+
+Signed-off-by: Fabien Marteau <fab...@ar...>
+
 --- /home/fabien/virgin-armadeus/buildroot/package/database/mysql_client/Config.in	2008-12-15 13:18:29.000000000 +0100
 +++ buildroot/package/database/mysql_client/Config.in	2008-12-15 11:00:35.000000000 +0100
 @@ -2,3 +2,21 @@ config BR2_PACKAGE_MYSQL_CLIENT
@@ -9,7 +14,7 @@
 +config BR2_PACKAGE_MYSQL_CLIENT_SHRINK
 +	bool "MySQL client shrink"
 +	help
-+	  Reduce the size of MySQL package suppressing:
++	  Reduce the size of MySQL package by suppressing:
 +	  usr/mysql-test/
 +	  usr/sql-bench/
 +	  usr/bin/mysql_client_test
diff --git a/patches/buildroot/064-add_tslib_alternate_site.patch b/patches/buildroot/064-tslib-add_alternate_dl_site.patch
similarity index 85%
rename from patches/buildroot/064-add_tslib_alternate_site.patch
rename to patches/buildroot/064-tslib-add_alternate_dl_site.patch
index 61775a8..c7e883c 100644
--- a/patches/buildroot/064-add_tslib_alternate_site.patch
+++ b/patches/buildroot/064-tslib-add_alternate_dl_site.patch
@@ -1,3 +1,5 @@
+Not needed for latest BR as tslib package moved to autotools infrastructure.
+
 --- buildroot/package/tslib/tslib.mk.ref	2009-01-01 17:19:34.000000000 +0100
 +++ buildroot/package/tslib/tslib.mk	2009-01-03 18:56:28.000000000 +0100
 @@ -10,7 +10,8 @@
diff --git a/patches/buildroot/065-add_mpfr_alternate_site.patch b/patches/buildroot/065-mpfr-add_alternate_dl_site.patch
similarity index 92%
rename from patches/buildroot/065-add_mpfr_alternate_site.patch
rename to patches/buildroot/065-mpfr-add_alternate_dl_site.patch
index e9896dd..9f1f803 100644
--- a/patches/buildroot/065-add_mpfr_alternate_site.patch
+++ b/patches/buildroot/065-mpfr-add_alternate_dl_site.patch
@@ -1,3 +1,5 @@
+Not needed in latest BR as mpfr now uses DOWNLOAD macro.
+
 --- buildroot/package/mpfr/mpfr.mk.ori	2008-11-03 09:15:26.000000000 +0100
 +++ buildroot/package/mpfr/mpfr.mk	2009-01-03 17:47:34.000000000 +0100
 @@ -21,11 +21,13 @@
diff --git a/patches/buildroot/066-add_autotool_alternate_site.patch b/patches/buildroot/066-add_alternate_site_functionnality.patch
similarity index 98%
rename from patches/buildroot/066-add_autotool_alternate_site.patch
rename to patches/buildroot/066-add_alternate_site_functionnality.patch
index bf9ea5f..137d855 100644
--- a/patches/buildroot/066-add_autotool_alternate_site.patch
+++ b/patches/buildroot/066-add_alternate_site_functionnality.patch
@@ -1,3 +1,5 @@
+Integrated in latest BR.
+
 --- buildroot/package/Makefile.autotools.in.ori	2008-11-03 09:15:31.000000000 +0100
 +++ buildroot/package/Makefile.autotools.in	2009-01-03 20:17:03.000000000 +0100
 @@ -135,16 +135,20 @@
diff --git a/patches/buildroot/067-libpcap_patch_failure.patch b/patches/buildroot/067-libpcap_patch_failure.patch
index 64331f8..b8e33e9 100644
--- a/patches/buildroot/067-libpcap_patch_failure.patch
+++ b/patches/buildroot/067-libpcap_patch_failure.patch
@@ -1,3 +1,5 @@
+Probably no more needed with latest BR.
+
 diff -urN buildroot/package.ori/libpcap/libpcap.mk buildroot/package/libpcap/libpcap.mk
 --- buildroot/package.ori/libpcap/libpcap.mk	2008-11-03 09:15:26.000000000 +0100
 +++ buildroot/package/libpcap/libpcap.mk	2009-01-05 22:42:26.000000000 +0100
diff --git a/patches/buildroot/069-setserial_2.17-45.patch b/patches/buildroot/069-setserial_2.17-45.patch
index 2225cd9..66148a1 100644
--- a/patches/buildroot/069-setserial_2.17-45.patch
+++ b/patches/buildroot/069-setserial_2.17-45.patch
@@ -1,3 +1,5 @@
+No more needed in latest BR.
+
 --- buildroot/package/setserial/setserial.mk.ori	2008-11-03 09:15:29.000000000 +0100
 +++ buildroot/package/setserial/setserial.mk	2009-01-08 01:49:45.000000000 +0100
 @@ -4,10 +4,11 @@
diff --git a/patches/buildroot/073-php-fixes_download_site.patch b/patches/buildroot/073-php-fixes_download_site.patch
index 52a608d..5f2db45 100644
--- a/patches/buildroot/073-php-fixes_download_site.patch
+++ b/patches/buildroot/073-php-fixes_download_site.patch
@@ -1,3 +1,5 @@
+Not needed in latest BR.
+
 --- buildroot/package/php/php.mk.org	2009-04-28 15:45:51.000000000 +0200
 +++ buildroot/package/php/php.mk	2009-04-28 15:57:47.000000000 +0200
 @@ -5,7 +5,7 @@
diff --git a/patches/buildroot/080-compiles_tslib_before_sdl_if_applicable.patch b/patches/buildroot/080-compiles_tslib_before_sdl_if_applicable.patch
index bc2e418..49dae26 100644
--- a/patches/buildroot/080-compiles_tslib_before_sdl_if_applicable.patch
+++ b/patches/buildroot/080-compiles_tslib_before_sdl_if_applicable.patch
@@ -4,6 +4,8 @@ touchscreen's support in SDL is crappy.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
+Integrated by BR for 2010.02.
+
 Index: buildroot/package/sdl/sdl.mk
 ===================================================================
 --- buildroot.orig/package/sdl/sdl.mk	2009-06-23 18:44:22.000000000 +0200
diff --git a/patches/buildroot/087-dont_hide_all_editors.patch b/patches/buildroot/087-dont_hide_all_editors.patch
index f494eca..d6899cf 100644
--- a/patches/buildroot/087-dont_hide_all_editors.patch
+++ b/patches/buildroot/087-dont_hide_all_editors.patch
@@ -2,8 +2,10 @@
 Don't hide all editors in config if BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is selected.
 Indeed vi is the only editor already provided by busybox.
 
-
 Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Integrated in BR for 2010.02.
+
 ---
 
 Index: buildroot/package/Config.in
diff --git a/patches/buildroot/092-zlib.patch b/patches/buildroot/092-zlib-use_cp_instead_of_install.patch
similarity index 100%
rename from patches/buildroot/092-zlib.patch
rename to patches/buildroot/092-zlib-use_cp_instead_of_install.patch
diff --git a/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch b/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch
index bd7560c..5eb9517 100644
--- a/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch
+++ b/patches/buildroot/093-sdl_ttf-add_freetype_dependancy.patch
@@ -2,6 +2,8 @@ SDL_ttf needs freetype to be built and installed first.
 
 Signed-off-by: Julien Boibessot <jul...@ar...>
 
+Integrated by BR for 2010.02
+
 Index: buildroot/package/sdl_ttf/sdl_ttf.mk
 ===================================================================
 --- buildroot.orig/package/sdl_ttf/sdl_ttf.mk	2009-12-11 10:14:53.000000000 +0100
diff --git a/patches/buildroot/096-libsndfile-updates_makefile_to_autotool.patch b/patches/buildroot/096-libsndfile-updates_makefile_to_autotool.patch
index e7c77b3..e20b324 100644
--- a/patches/buildroot/096-libsndfile-updates_makefile_to_autotool.patch
+++ b/patches/buildroot/096-libsndfile-updates_makefile_to_autotool.patch
@@ -1,6 +1,6 @@
 Moves libsndfile to autotools infrastructure and bump version to 1.0.21.
 
-Will be removed or merged when updating to Buildroot 2010.02 (send 1.0.21
+Will have to be merged when updating to Buildroot 2010.02 (send 1.0.21
 modifications upstream; remove STRIP hack before)
 
 Signed-off-by: Julien Boibessot <jul...@ar...>


hooks/post-receive
-- 
armadeus


