Author: pulkomandy Date: 2011-05-25 20:21:54 +0200 (Wed, 25 May 2011) New Revision: 41748 Changeset: https://dev.haiku-os.org/changeset/41748 Modified: haiku/branches/releases/r1alpha3/ haiku/branches/releases/r1alpha3/build/jam/ haiku/branches/releases/r1alpha3/build/jam/OptionalBuildFeatures haiku/branches/releases/r1alpha3/build/jam/OptionalPackages haiku/branches/releases/r1alpha3/headers/libs/freetype2/ haiku/branches/releases/r1alpha3/headers/libs/png/png.h haiku/branches/releases/r1alpha3/headers/libs/png/pngconf.h haiku/branches/releases/r1alpha3/headers/libs/tiff/tiff.h haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffio.h haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffvers.h haiku/branches/releases/r1alpha3/src/add-ons/kernel/bus_managers/acpi/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral/ haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi/ haiku/branches/releases/r1alpha3/src/add-ons/media/plugins/ffmpeg/ haiku/branches/releases/r1alpha3/src/build/libbe/storage/mime/ haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h haiku/branches/releases/r1alpha3/src/libs/freetype2/ haiku/branches/releases/r1alpha3/src/libs/png/ haiku/branches/releases/r1alpha3/src/libs/tiff/ Log: Merge 41711,41720,41737 Property changes on: haiku/branches/releases/r1alpha3 ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals:40148-40195 /haiku/branches/developer/bonefish/weak-symbols:39365-39568 /haiku/trunk:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 + /haiku/branches/developer/bonefish/signals:40148-40195 /haiku/branches/developer/bonefish/weak-symbols:39365-39568 /haiku/trunk:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 Property changes on: haiku/branches/releases/r1alpha3/build/jam ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/build/jam:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568 /haiku/trunk/build/jam:41551,41558-41559,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 + /haiku/branches/developer/bonefish/signals/build/jam:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/build/jam:39365-39568 /haiku/trunk/build/jam:41551,41558-41559,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 Modified: haiku/branches/releases/r1alpha3/build/jam/OptionalBuildFeatures =================================================================== --- haiku/branches/releases/r1alpha3/build/jam/OptionalBuildFeatures 2011-05-25 18:09:07 UTC (rev 41747) +++ haiku/branches/releases/r1alpha3/build/jam/OptionalBuildFeatures 2011-05-25 18:21:54 UTC (rev 41748) @@ -12,7 +12,7 @@ } if $(HAIKU_GCC_VERSION[1]) >= 4 { - HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-r1a3-x86-gcc4-2011-05-20.zip ; + HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-r1a3-x86-gcc4-2011-05-24.zip ; } else { HAIKU_OPENSSL_PACKAGE = openssl-1.0.0d-r1a3-x86-gcc2-2011-05-17.zip ; } Modified: haiku/branches/releases/r1alpha3/build/jam/OptionalPackages =================================================================== --- haiku/branches/releases/r1alpha3/build/jam/OptionalPackages 2011-05-25 18:09:07 UTC (rev 41747) +++ haiku/branches/releases/r1alpha3/build/jam/OptionalPackages 2011-05-25 18:21:54 UTC (rev 41748) @@ -115,8 +115,8 @@ Echo "No optional package APR available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - apr-1.4.2-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/apr-1.4.2-r1a3-x86-gcc4-2011-05-21.zip + apr-1.4.2-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/apr-1.4.2-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -133,8 +133,8 @@ Echo "No optional package APR-util available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - apr-util-1.3.10-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/apr-util-1.3.10-r1a3-x86-gcc4-2011-05-21.zip + apr-util-1.3.10-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/apr-util-1.3.10-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -166,8 +166,8 @@ if $(TARGET_ARCH) != x86 { Echo "No optional package Bazaar available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage bzr-2.2.0-gcc4-2010-09-15.zip - : $(baseURL)/bzr-2.2.0-x86-gcc4-2010-09-15.zip ; + InstallOptionalHaikuImagePackage bzr-2.2.2-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/bzr-2.2.2-r1a3-x86-gcc4-2011-05-23.zip ; } else { InstallOptionalHaikuImagePackage bzr-2.2.2-r1a3-x86-gcc2-2011-05-17.zip : $(baseURL)/bzr-2.2.2-r1a3-x86-gcc2-2011-05-17.zip ; @@ -182,8 +182,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - beae-22-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/beae-22-r1a3-x86-gcc4-2011-05-21.zip ; + beae-22-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/beae-22-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage beae-22-r1a3-x86-gcc2-2011-05-18.zip @@ -332,8 +332,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - burnitnow-39-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/burnitnow-39-r1a3-x86-gcc4-2011-05-21.zip ; + burnitnow-39-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/burnitnow-39-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage burnitnow-39-r1a3-x86-gcc2-2011-05-18.zip @@ -351,8 +351,8 @@ Echo "No optional package Bzip available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - bzip2-1.0.6-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/bzip2-1.0.6-r1a3-x86-gcc4-2011-05-21.zip + bzip2-1.0.6-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/bzip2-1.0.6-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -369,8 +369,8 @@ Echo "No optional package CCache available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - ccache-3.0.1-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/ccache-3.0.1-r1a3-x86-gcc4-2011-05-21.zip ; + ccache-3.0.1-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/ccache-3.0.1-r1a3-x86-gcc4-2011-05-23.zip ; } else { InstallOptionalHaikuImagePackage ccache-3.0.1-r1a3-x86-gcc2-2011-05-17.zip @@ -385,8 +385,8 @@ Echo "No optional package CDRecord available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - cdrtools-3.01a01-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/cdrtools-3.01a01-r1a3-x86-gcc4-2011-05-21.zip ; + cdrtools-3.01a01-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/cdrtools-3.01a01-r1a3-x86-gcc4-2011-05-23.zip ; } else { InstallOptionalHaikuImagePackage cdrtools-3.01a01-r1a3-x86-gcc2-2011-05-17.zip @@ -437,8 +437,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - cmake-2.8.4-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/cmake-2.8.4-r1a3-x86-gcc4-2011-05-21.zip + cmake-2.8.4-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/cmake-2.8.4-r1a3-x86-gcc4-2011-05-23.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -455,8 +455,8 @@ if $(TARGET_ARCH) != x86 { Echo "No optional package Curl available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage curl-7.21.6-r1a3-x86-gcc4-2011-05-20.zip - : $(baseURL)/curl-7.21.6-r1a3-x86-gcc4-2011-05-20.zip ; + InstallOptionalHaikuImagePackage curl-7.21.6-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/curl-7.21.6-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage curl-7.21.6-r1a3-x86-gcc2-2011-05-17.zip : $(baseURL)/curl-7.21.6-r1a3-x86-gcc2-2011-05-17.zip ; @@ -471,8 +471,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - cvs-1.12.13.1-r1a3-x86-gcc4-2011-05-20.zip - : $(baseURL)/cvs-1.12.13.1-r1a3-x86-gcc4-2011-05-20.zip + cvs-1.12.13.1-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/cvs-1.12.13.1-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -489,20 +489,20 @@ # autotools if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - autoconf-2.68-r1a3-x86-gcc4-2011-05-20.zip - : $(baseURL)/autoconf-2.68-r1a3-x86-gcc4-2011-05-20.zip + autoconf-2.68-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/autoconf-2.68-r1a3-x86-gcc4-2011-05-23.zip : : true ; InstallOptionalHaikuImagePackage - automake-1.11.1-r1a3-x86-gcc4-2011-05-20.zip - : $(baseURL)/automake-1.11.1-r1a3-x86-gcc4-2011-05-20.zip + automake-1.11.1-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/automake-1.11.1-r1a3-x86-gcc4-2011-05-23.zip : : true ; InstallOptionalHaikuImagePackage - libtool-2.4-r1a3-x86-gcc4-2011-05-20.zip - : $(baseURL)/libtool-2.4-r1a3-x86-gcc4-2011-05-20.zip + libtool-2.4-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/libtool-2.4-r1a3-x86-gcc4-2011-05-23.zip : : true ; InstallOptionalHaikuImagePackage - texinfo-4.13a-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/texinfo-4.13a-r1a3-x86-gcc4-2011-05-21.zip + texinfo-4.13a-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/texinfo-4.13a-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -565,23 +565,23 @@ # other commonly used tools if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - bison-2.4.3-r1a3-x86-gcc4-2011-05-20.zip - : $(baseURL)/bison-2.4.3-r1a3-x86-gcc4-2011-05-20.zip ; + bison-2.4.3-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/bison-2.4.3-r1a3-x86-gcc4-2011-05-23.zip ; InstallOptionalHaikuImagePackage - m4-1.4.16-r1a3-x86-gcc4-2011-05-20.zip - : $(baseURL)/m4-1.4.16-r1a3-x86-gcc4-2011-05-20.zip ; + m4-1.4.16-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/m4-1.4.16-r1a3-x86-gcc4-2011-05-23.zip ; InstallOptionalHaikuImagePackage - flex-2.5.35-r1a3-x86-gcc4-2011-05-20.zip - : $(baseURL)/flex-2.5.35-r1a3-x86-gcc4-2011-05-20.zip ; + flex-2.5.35-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/flex-2.5.35-r1a3-x86-gcc4-2011-05-23.zip ; InstallOptionalHaikuImagePackage - jam-2.5-r1a3-x86-gcc4-2011-05-20.zip - : $(baseURL)/jam-2.5-r1a3-x86-gcc4-2011-05-20.zip ; + jam-2.5-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/jam-2.5-r1a3-x86-gcc4-2011-05-23.zip ; InstallOptionalHaikuImagePackage - mkdepend-1.7-r1a3-x86-gcc4-2011-05-20.zip - : $(baseURL)/mkdepend-1.7-r1a3-x86-gcc4-2011-05-20.zip ; + mkdepend-1.7-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/mkdepend-1.7-r1a3-x86-gcc4-2011-05-23.zip ; InstallOptionalHaikuImagePackage - make-3.82-r1a3-x86-gcc4-2011-05-20.zip - : $(baseURL)/make-3.82-r1a3-x86-gcc4-2011-05-20.zip ; + make-3.82-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/make-3.82-r1a3-x86-gcc4-2011-05-23.zip ; } else { InstallOptionalHaikuImagePackage bison-2.4.3-r1a3-x86-gcc2-2011-05-17.zip @@ -762,8 +762,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - expat-2.0.1-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/expat-2.0.1-r1a3-x86-gcc4-2011-05-21.zip + expat-2.0.1-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/expat-2.0.1-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -781,8 +781,8 @@ Echo "No optional package Fastdep available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - fastdep-0.16-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/fastdep-0.16-r1a3-x86-gcc4-2011-05-21.zip ; + fastdep-0.16-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/fastdep-0.16-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage fastdep-0.16-r1a3-x86-gcc2-2011-05-18.zip @@ -812,8 +812,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - gettext-0.18.1.1-x86-gcc4-2011-02-07.zip - : $(baseURL)/gettext-0.18.1.1-x86-gcc4-2011-02-07.zip + gettext-0.18.1.1-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/gettext-0.18.1.1-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -832,8 +832,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - git-1.7.5-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/git-1.7.5-r1a3-x86-gcc4-2011-05-21.zip + git-1.7.5-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/git-1.7.5-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -852,8 +852,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - gperf-3.0.4-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/gperf-3.0.4-r1a3-x86-gcc4-2011-05-21.zip + gperf-3.0.4-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/gperf-3.0.4-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -872,8 +872,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - groff-1.20.1-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/groff-1.20.1-r1a3-x86-gcc4-2011-05-21.zip + groff-1.20.1-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/groff-1.20.1-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -962,8 +962,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libevent-2.0.10-x86-gcc4-2011-02-28.zip - : $(baseURL)/lib/libevent-2.0.10-x86-gcc4-2011-02-28.zip + libevent-2.0.10-x86-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/lib/libevent-2.0.10-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -982,8 +982,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libiconv-1.13.1-x86-gcc4-2011-05-13.zip - : $(baseURL)/libiconv-1.13.1-x86-gcc4-2011-05-13.zip ; + libiconv-1.13.1-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/libiconv-1.13.1-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage libiconv-1.13.1-r1a3-x86-gcc2-2011-05-18.zip @@ -1012,8 +1012,8 @@ Echo "No optional package Libmng available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libmng-1.0.10-x86-gcc4-2010-10-30.zip - : $(baseURL)/lib/libmng-1.0.10-x86-gcc4-2010-10-30.zip ; + libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/lib/libmng-1.0.10-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage libmng-1.0.10-r1a3-x86-gcc2-2011-05-18.zip @@ -1029,8 +1029,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libxml2-2.7.8-x86-gcc4-2011-03-16.zip - : $(baseURL)/libxml2-2.7.8-x86-gcc4-2011-03-16.zip ; + libxml2-2.7.8-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/libxml2-2.7.8-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage libxml2-2.7.8-r1a3-x86-gcc2-2011-05-18.zip @@ -1044,6 +1044,10 @@ if [ IsOptionalHaikuImagePackageAdded LibXSLT ] { if $(TARGET_ARCH) != x86 { Echo "No optional package LibXSLT available for $(TARGET_ARCH)" ; + } else if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage + libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/libxslt-1.1.26-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage libxslt-1.1.26-r1a3-x86-gcc2-2011-05-18.zip @@ -1094,8 +1098,8 @@ Echo "No optional package Man available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - man-1.6f-x86-gcc4-2011-05-12.zip - : $(baseURL)/man-1.6f-x86-gcc4-2011-05-12.zip ; + man-1.6f-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/man-1.6f-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage man-1.6f-r1a3-x86-gcc2-2011-05-18.zip @@ -1117,8 +1121,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - mercurial-1.8.3-x86-gcc4-2011-05-10.zip - : $(baseURL)/mercurial-1.8.3-x86-gcc4-2011-05-10.zip + mercurial-1.8.3-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/mercurial-1.8.3-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -1137,8 +1141,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - nano-2.2.6-x86-gcc4-2011-03-14.zip - : $(baseURL)/nano-2.2.6-x86-gcc4-2011-03-14.zip ; + nano-2.2.6-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/nano-2.2.6-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage nano-2.2.6-r1a3-x86-gcc2-2011-05-18.zip @@ -1155,8 +1159,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - neon-0.29.6-x86-r1a3-gcc4-2011-05-20.zip - : $(baseURL)/neon-0.29.6-r1a3-x86-gcc4-2011-05-20.zip ; + neon-0.29.6-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/neon-0.29.6-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage neon-0.29.6-r1a3-x86-gcc2-2011-05-18.zip @@ -1251,8 +1255,8 @@ if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - openssh-5.8p2-x86-gcc4-2011-05-11.zip - : $(baseURL)/openssh-5.8p2-x86-gcc4-2011-05-11.zip ; + openssh-5.8p2-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/openssh-5.8p2-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage openssh-5.8p2-r1a3-x86-gcc2-2011-05-18.zip @@ -1288,8 +1292,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - p7zip-9.13-x86-gcc4-2011-02-28.zip - : $(baseURL)/p7zip-9.13-x86-gcc4-2011-02-28.zip ; + p7zip-9.13-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/p7zip-9.13-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage p7zip-9.13-r1a3-x86-gcc2-2011-05-18.zip @@ -1311,8 +1315,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - paladin-1.3-x86-gcc4-2011-03-18.zip - : $(baseURL)/paladin-1.3-x86-gcc4-2011-03-18.zip ; + paladin-1.3-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/paladin-1.3-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage paladin-1.3-r1a3-x86-gcc2-2011-05-18.zip @@ -1334,8 +1338,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - libpcre-8.12-x86-gcc4-2011-05-13.zip - : $(baseURL)/libpcre-8.12-x86-gcc4-2011-05-13.zip ; + libpcre-8.12-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/libpcre-8.12-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage libpcre-8.12-r1a3-x86-gcc2-2011-05-17.zip @@ -1352,8 +1356,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - pe-2.4.3-600-x86-gcc4-2010-11-14.zip - : $(baseURL)/pe-2.4.3-600-x86-gcc4-2010-11-14.zip ; + pe-2.4.3-600-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/pe-2.4.3-600-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage pe-2.4.3-600-r1a3-x86-gcc2-2011-05-18.zip @@ -1374,8 +1378,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - perl-5.10.1-x86-gcc4-2010-11-12.zip - : $(baseURL)/perl-5.10.1-x86-gcc4-2010-11-12.zip + perl-5.10.1-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/perl-5.10.1-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -1394,8 +1398,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - python-2.6.6-x86-gcc4-2010-11-12.zip - : $(baseURL)/python-2.6.6-x86-gcc4-2010-11-12.zip + python-2.6.6-r1a3-x86-gcc4-2011-05-23.zip + : $(baseURL)/python-2.6.6-r1a3-x86-gcc4-2011-05-23.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -1414,8 +1418,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - rsync-3.0.7-x86-gcc4-2011-05-06.zip - : $(baseURL)/rsync-3.0.7-x86-gcc4-2011-05-06.zip + rsync-3.0.7-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/rsync-3.0.7-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -1431,6 +1435,10 @@ if [ IsOptionalHaikuImagePackageAdded Ruby ] { if $(TARGET_ARCH) != x86 { Echo "No optional package Ruby available for $(TARGET_ARCH)" ; + } else if $(HAIKU_GCC_VERSION[1]) >= 4 { + InstallOptionalHaikuImagePackage + ruby-1.9.1-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/ruby-1.9.1-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage ruby-1.9.1-x86-gcc2-2010-05-20.zip @@ -1445,8 +1453,8 @@ Echo "No optional package Sed available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - sed-4.2.1-x86-gcc4-2011-05-13.zip - : $(baseURL)/sed-4.2.1-x86-gcc4-2011-05-13.zip ; + sed-4.2.1-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/sed-4.2.1-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage sed-4.2.1-r1a3-x86-gcc2-2011-05-17.zip @@ -1462,8 +1470,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - sqlite-3.7.5-r1a3-x86-gcc4-2011-05-21.zip - : $(baseURL)/sqlite-3.7.5-r1a3-x86-gcc4-2011-05-21.zip ; + sqlite-3.7.5-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/sqlite-3.7.5-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage sqlite-3.7.5-r1a3-x86-gcc2-2011-05-17.zip @@ -1480,8 +1488,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - subversion-1.6.15-x86-gcc4-2011-05-14.zip - : $(baseURL)/subversion-1.6.15-x86-gcc4-2011-05-14.zip + subversion-1.6.15-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/subversion-1.6.15-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage @@ -1499,8 +1507,8 @@ Echo "No optional package TagLib available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - taglib-1.6.3-x86-gcc4-2011-05-13.zip - : $(baseURL)/taglib-1.6.3-x86-gcc4-2011-05-13.zip ; + taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip + : $(baseURL)/taglib-1.6.3-r1r3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage taglib-1.6.3-r1a3-x86-gcc2-2011-05-20.zip @@ -1516,8 +1524,8 @@ } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - tar-1.25-x86-gcc4-2011-03-14.zip - : $(baseURL)/tar-1.25-x86-gcc4-2011-03-14.zip ; + tar-1.25-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/tar-1.25-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage tar-1.25-r1a3-x86-gcc2-2011-05-20.zip @@ -1619,8 +1627,8 @@ Echo "No optional package Vim available for $(TARGET_ARCH)" ; } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage vim-7.3-x86-gcc4-2010-08-22.zip - : $(baseURL)/vim-7.3-x86-gcc4-2010-08-22.zip + InstallOptionalHaikuImagePackage vim-7.3-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/vim-7.3-r1a3-x86-gcc4-2011-05-24.zip : : true ; } else { InstallOptionalHaikuImagePackage vim-7.3-x86-gcc2-2010-08-22.zip @@ -1641,8 +1649,8 @@ Echo "No optional package Vision available for $(TARGET_ARCH)" ; } else { if $(HAIKU_GCC_VERSION[1]) >= 4 { - InstallOptionalHaikuImagePackage vision-908-x86-gcc4-2010-11-14.zip - : $(baseURL)/vision-908-x86-gcc4-2010-11-14.zip ; + InstallOptionalHaikuImagePackage vision-908-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/vision-908-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage vision-908-r1a3-x86-gcc2-2011-05-18.zip @@ -1762,8 +1770,8 @@ Echo "No optional package XZ-Utils available for $(TARGET_ARCH)" ; } else { InstallOptionalHaikuImagePackage - xz-utils-5.0.1-x86-gcc4-2011-05-06.zip - : $(baseURL)/xz-utils-5.0.1-x86-gcc4-2011-05-06.zip ; + xz-utils-5.0.1-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/xz-utils-5.0.1-r1a3-x86-gcc4-2011-05-24.zip ; AddExpanderRuleToHaikuImage "application/x-xz" : .tar.xz : "tar -Jtvf \\0045s" : "tar -Jxvf \\0045s" @@ -1786,8 +1794,8 @@ Echo "No optional package Yasm available for $(TARGET_ARCH)" ; } else if $(HAIKU_GCC_VERSION[1]) >= 4 { InstallOptionalHaikuImagePackage - yasm-1.1.0-r1a3-x86-gcc4-2011-05-20.zip - : $(baseURL)/yasm-1.1.0-r1a3-x86-gcc4-2011-05-20.zip ; + yasm-1.1.0-r1a3-x86-gcc4-2011-05-24.zip + : $(baseURL)/yasm-1.1.0-r1a3-x86-gcc4-2011-05-24.zip ; } else { InstallOptionalHaikuImagePackage yasm-1.1.0-r1a3-x86-gcc2-2011-05-17.zip Property changes on: haiku/branches/releases/r1alpha3/headers/libs/freetype2 ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/freetype2:40148-40195 /haiku/trunk/headers/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freetype2/2.4.4/include:40532 /haiku/vendor/freetype2/current/include:37946-40531 + /haiku/branches/developer/bonefish/signals/headers/libs/freetype2:40148-40195 /haiku/trunk/headers/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freetype2/2.4.4/include:40532 /haiku/vendor/freetype2/current/include:37946-40531 Property changes on: haiku/branches/releases/r1alpha3/headers/libs/png/png.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/png/png.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/png.h:39365-39568 /haiku/trunk/headers/libs/png/png.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/libpng/1.4.4/png.h:39522 /haiku/vendor/libpng/current/png.h:35840-39521 + /haiku/branches/developer/bonefish/signals/headers/libs/png/png.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/png.h:39365-39568 /haiku/trunk/headers/libs/png/png.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/libpng/1.4.4/png.h:39522 /haiku/vendor/libpng/current/png.h:35840-39521 Property changes on: haiku/branches/releases/r1alpha3/headers/libs/png/pngconf.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/png/pngconf.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/pngconf.h:39365-39568 /haiku/trunk/headers/libs/png/pngconf.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/libpng/1.4.4/pngconf.h:39522 /haiku/vendor/libpng/current/pngconf.h:35840-39521 + /haiku/branches/developer/bonefish/signals/headers/libs/png/pngconf.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/png/pngconf.h:39365-39568 /haiku/trunk/headers/libs/png/pngconf.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/libpng/1.4.4/pngconf.h:39522 /haiku/vendor/libpng/current/pngconf.h:35840-39521 Property changes on: haiku/branches/releases/r1alpha3/headers/libs/tiff/tiff.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiff.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiff.h:39365-39568 /haiku/trunk/headers/libs/tiff/tiff.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/libtiff/3.9.4/libtiff/tiff.h:38702 /haiku/vendor/libtiff/current/libtiff/tiff.h:38700-38701 + /haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiff.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiff.h:39365-39568 /haiku/trunk/headers/libs/tiff/tiff.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/libtiff/3.9.4/libtiff/tiff.h:38702 /haiku/vendor/libtiff/current/libtiff/tiff.h:38700-38701 Property changes on: haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffio.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffio.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffio.h:39365-39568 /haiku/trunk/headers/libs/tiff/tiffio.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/libtiff/3.9.4/libtiff/tiffio.h:38702 /haiku/vendor/libtiff/current/libtiff/tiffio.h:38700-38701 + /haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffio.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffio.h:39365-39568 /haiku/trunk/headers/libs/tiff/tiffio.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/libtiff/3.9.4/libtiff/tiffio.h:38702 /haiku/vendor/libtiff/current/libtiff/tiffio.h:38700-38701 Property changes on: haiku/branches/releases/r1alpha3/headers/libs/tiff/tiffvers.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffvers.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffvers.h:39365-39568 /haiku/trunk/headers/libs/tiff/tiffvers.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/libtiff/3.9.4/libtiff/tiffvers.h:38702 /haiku/vendor/libtiff/current/libtiff/tiffvers.h:38700-38701 + /haiku/branches/developer/bonefish/signals/headers/libs/tiff/tiffvers.h:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/headers/libs/tiff/tiffvers.h:39365-39568 /haiku/trunk/headers/libs/tiff/tiffvers.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/libtiff/3.9.4/libtiff/tiffvers.h:38702 /haiku/vendor/libtiff/current/libtiff/tiffvers.h:38700-38701 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/bus_managers/acpi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/bus_managers/acpi:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/bus_managers/acpi:39365-39568 /haiku/trunk/src/add-ons/kernel/bus_managers/acpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/acpica/current:33139-36866 + /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/bus_managers/acpi:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/bus_managers/acpi:39365-39568 /haiku/trunk/src/add-ons/kernel/bus_managers/acpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/acpica/current:33139-36866 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/an:41235 /haiku/vendor/freebsd/current/dev/an:34496-41234 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/aironetwifi/dev/an:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/an:41235 /haiku/vendor/freebsd/current/dev/an:34496-41234 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:39365-39568 /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/HEAD/dev/ath/r204100:35677-35713 /haiku/vendor/freebsd/current/dev/ath:34314-35676 + /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:39365-39568 /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/atheroswifi/dev/ath:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/HEAD/dev/ath/r204100:35677-35713 /haiku/vendor/freebsd/current/dev/ath:34314-35676 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/bwi:41230-41235 /haiku/vendor/freebsd/current/dev/bwi:34314-41229 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/broadcom43xx/dev/bwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/bwi:41230-41235 /haiku/vendor/freebsd/current/dev/bwi:34314-41229 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwi:41234-41235 /haiku/vendor/freebsd/current/dev/iwi:34314-41233 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi2200/dev/iwi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwi:41234-41235 /haiku/vendor/freebsd/current/dev/iwi:34314-41233 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/wpi:41231-41235 /haiku/vendor/freebsd/current/dev/wpi:34314-41230 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/dev/wpi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/wpi:41231-41235 /haiku/vendor/freebsd/current/dev/wpi:34314-41230 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:39365-39568 /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwn:41229-41235 /haiku/vendor/freebsd/current/dev/iwn:34314-41228 + /haiku/branches/developer/bonefish/signals/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:39365-39568 /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/dev/iwn:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/iwn:41229-41235 /haiku/vendor/freebsd/current/dev/iwn:34314-41228 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/malo:41233-41235 /haiku/vendor/freebsd/current/dev/malo:34496-41232 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8335/dev/malo:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/malo:41233-41235 /haiku/vendor/freebsd/current/dev/malo:34496-41232 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/mwl:41228-41235 /haiku/vendor/freebsd/current/dev/mwl:34314-41227 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/dev/mwl:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/mwl:41228-41235 /haiku/vendor/freebsd/current/dev/mwl:34314-41227 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/ral:41232-41235 /haiku/vendor/freebsd/current/dev/ral:34496-41231 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/dev/ral:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/ral:41232-41235 /haiku/vendor/freebsd/current/dev/ral:34496-41231 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/wi:41227-41235 /haiku/vendor/freebsd/current/dev/wi:34496-41226 + /haiku/trunk/src/add-ons/kernel/drivers/network/wlan/wavelanwifi/dev/wi:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/RELEASE_8_2_0/dev/wi:41227-41235 /haiku/vendor/freebsd/current/dev/wi:34496-41226 Property changes on: haiku/branches/releases/r1alpha3/src/add-ons/media/plugins/ffmpeg ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/add-ons/media/plugins/ffmpeg:40148-40195 /haiku/trunk/src/add-ons/media/plugins/ffmpeg:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/ffmpeg/0.6.1:39559 /haiku/vendor/ffmpeg/current:39539-39558 + /haiku/branches/developer/bonefish/signals/src/add-ons/media/plugins/ffmpeg:40148-40195 /haiku/trunk/src/add-ons/media/plugins/ffmpeg:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/ffmpeg/0.6.1:39559 /haiku/vendor/ffmpeg/current:39539-39558 Property changes on: haiku/branches/releases/r1alpha3/src/build/libbe/storage/mime ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/build/libbe/storage/mime:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/build/libbe/storage/mime:39365-39568 /haiku/trunk/src/build/libbe/storage/mime:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /trunk/current/src/build/libbe/storage/mime:11-11768 + /haiku/branches/developer/bonefish/signals/src/build/libbe/storage/mime:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/build/libbe/storage/mime:39365-39568 /haiku/trunk/src/build/libbe/storage/mime:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /trunk/current/src/build/libbe/storage/mime:11-11768 Property changes on: haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211 ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/libs/compat/freebsd_wlan/net80211:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211:41237 /haiku/vendor/freebsd/current/net80211:34316-41236 + /haiku/trunk/src/libs/compat/freebsd_wlan/net80211:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211:41237 /haiku/vendor/freebsd/current/net80211:34316-41236 Property changes on: haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.c:41237-41557 /haiku/vendor/freebsd/current/net80211/ieee80211_node.c:34316-41236 + /haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.c:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.c:41237-41557 /haiku/vendor/freebsd/current/net80211/ieee80211_node.c:34316-41236 Property changes on: haiku/branches/releases/r1alpha3/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.h:41237-41557 /haiku/vendor/freebsd/current/net80211/ieee80211_node.h:34316-41236 + /haiku/trunk/src/libs/compat/freebsd_wlan/net80211/ieee80211_node.h:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freebsd/RELEASE_8_2_0/net80211/ieee80211_node.h:41237-41557 /haiku/vendor/freebsd/current/net80211/ieee80211_node.h:34316-41236 Property changes on: haiku/branches/releases/r1alpha3/src/libs/freetype2 ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/libs/freetype2:40148-40195 /haiku/trunk/src/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/freetype2/2.4.3:39521-39522 /haiku/vendor/freetype2/2.4.4/src:40532 /haiku/vendor/freetype2/current:37946-39520 /haiku/vendor/freetype2/current/src:37946-40531 + /haiku/branches/developer/bonefish/signals/src/libs/freetype2:40148-40195 /haiku/trunk/src/libs/freetype2:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/freetype2/2.4.3:39521-39522 /haiku/vendor/freetype2/2.4.4/src:40532 /haiku/vendor/freetype2/current:37946-39520 /haiku/vendor/freetype2/current/src:37946-40531 Property changes on: haiku/branches/releases/r1alpha3/src/libs/png ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/libs/png:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/libs/png:39365-39568 /haiku/trunk/src/libs/png:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/libpng/1.4.4:39522 /haiku/vendor/libpng/current:35840-39521 + /haiku/branches/developer/bonefish/signals/src/libs/png:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/libs/png:39365-39568 /haiku/trunk/src/libs/png:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/libpng/1.4.4:39522 /haiku/vendor/libpng/current:35840-39521 Property changes on: haiku/branches/releases/r1alpha3/src/libs/tiff ___________________________________________________________________ Modified: svn:mergeinfo - /haiku/branches/developer/bonefish/signals/src/libs/tiff:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/libs/tiff:39365-39568 /haiku/trunk/src/libs/tiff:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41716 /haiku/vendor/libtiff/3.9.4/libtiff:38702 /haiku/vendor/libtiff/current/libtiff:38700-38701 + /haiku/branches/developer/bonefish/signals/src/libs/tiff:40148-40195 /haiku/branches/developer/bonefish/weak-symbols/src/libs/tiff:39365-39568 /haiku/trunk/src/libs/tiff:41558-41559,41564,41579,41581-41582,41585,41590,41598,41602-41608,41610,41613-41614,41624,41626,41629-41630,41632-41633,41637-41638,41640,41646-41649,41651-41652,41655-41656,41658,41662,41665,41667,41685-41686,41711,41716,41720,41737 /haiku/vendor/libtiff/3.9.4/libtiff:38702 /haiku/vendor/libtiff/current/libtiff:38700-38701