diff -Nru libcec-1.5-maverick/ChangeLog libcec-1.5-maverick/ChangeLog
--- libcec-1.5-maverick/ChangeLog	2012-02-29 00:13:10.000000000 +0000
+++ libcec-1.5-maverick/ChangeLog	2012-03-03 14:43:29.000000000 +0000
@@ -1,3 +1,13 @@
+libcec (1.5-3) unstable; urgency=low
+
+  * fixed:
+    * OS-X compilation
+    * default to firmware version 1 after 3 tries. some versions didn't send a
+      version.
+    * fixed cec-config win32 compilation
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Sat, 03 Mar 2012 15:21:00 +0100
+
 libcec (1.5-2) unstable; urgency=low
 
   * changed/added:
diff -Nru libcec-1.5-maverick/configure libcec-1.5-maverick/configure
--- libcec-1.5-maverick/configure	2012-02-29 10:44:19.000000000 +0000
+++ libcec-1.5-maverick/configure	2012-03-03 14:43:51.000000000 +0000
@@ -14421,6 +14421,7 @@
 $as_echo "yes" >&6; }
 
 fi
+    LIBS+=" -lrt"
     ;;
   *-apple-darwin*)
     has_libudev="no";
diff -Nru libcec-1.5-maverick/configure.ac libcec-1.5-maverick/configure.ac
--- libcec-1.5-maverick/configure.ac	2012-02-19 10:26:42.000000000 +0000
+++ libcec-1.5-maverick/configure.ac	2012-03-03 14:43:29.000000000 +0000
@@ -8,6 +8,7 @@
 case "${host}" in
   *-*-linux*)
     PKG_CHECK_MODULES([UDEV],[libudev],,[has_libudev="no";AC_MSG_WARN("library 'udev' is missing - adapter detection will not be available")])
+    LIBS+=" -lrt"
     ;;
   *-apple-darwin*)
     has_libudev="no";
diff -Nru libcec-1.5-maverick/debian/changelog libcec-1.5-maverick/debian/changelog
--- libcec-1.5-maverick/debian/changelog	2012-02-29 10:44:24.000000000 +0000
+++ libcec-1.5-maverick/debian/changelog	2012-03-03 14:44:02.000000000 +0000
@@ -1,3 +1,13 @@
+libcec (1.5-maverick-3) maverick; urgency=low
+
+  * fixed:
+    * OS-X compilation
+    * default to firmware version 1 after 3 tries. some versions didn't send a
+      version.
+    * fixed cec-config win32 compilation
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Sat, 03 Mar 2012 15:21:00 +0100
+
 libcec (1.5-maverick-2) maverick; urgency=low
 
   * changed/added:
diff -Nru libcec-1.5-maverick/include/cectypes.h libcec-1.5-maverick/include/cectypes.h
--- libcec-1.5-maverick/include/cectypes.h	2012-02-29 00:13:10.000000000 +0000
+++ libcec-1.5-maverick/include/cectypes.h	2012-03-03 14:43:29.000000000 +0000
@@ -948,14 +948,16 @@
 {
   CEC_CLIENT_VERSION_PRE_1_5 = 0,
   CEC_CLIENT_VERSION_1_5_0   = 0x1500,
-  CEC_CLIENT_VERSION_1_5_1   = 0x1501
+  CEC_CLIENT_VERSION_1_5_1   = 0x1501,
+  CEC_CLIENT_VERSION_1_5_2   = 0x1502
 } cec_client_version;
 
 typedef enum cec_server_version
 {
   CEC_SERVER_VERSION_PRE_1_5 = 0,
   CEC_SERVER_VERSION_1_5_0   = 0x1500,
-  CEC_SERVER_VERSION_1_5_1   = 0x1501
+  CEC_SERVER_VERSION_1_5_1   = 0x1501,
+  CEC_SERVER_VERSION_1_5_2   = 0x1502
 } cec_server_version;
 
 typedef struct libcec_configuration
diff -Nru libcec-1.5-maverick/README libcec-1.5-maverick/README
--- libcec-1.5-maverick/README	2012-01-03 23:59:54.000000000 +0000
+++ libcec-1.5-maverick/README	2012-03-03 14:43:29.000000000 +0000
@@ -12,6 +12,7 @@
 * autoconf 2.13 or later
 * automake 1.11 or later
 * pkg-config
+* libtool
 * udev development headers v151 or later
 * gcc 4.2 or later
 
diff -Nru libcec-1.5-maverick/src/cec-config/cec-config.cpp libcec-1.5-maverick/src/cec-config/cec-config.cpp
--- libcec-1.5-maverick/src/cec-config/cec-config.cpp	2012-02-29 00:13:10.000000000 +0000
+++ libcec-1.5-maverick/src/cec-config/cec-config.cpp	2012-03-03 14:43:29.000000000 +0000
@@ -468,8 +468,8 @@
         "<settings>\n" <<
           "\t<setting id=\"enabled\" value=\"1\" />\n" <<
           "\t<setting id=\"activate_source\" value=\"" << (int)g_config.bActivateSource << "\" />\n" <<
-          "\t<setting id=\"wake_devices\" value=\"" << strWakeDevices.Trim().c_str() << "\" />\n" <<
-          "\t<setting id=\"standby_devices\" value=\"" << strStandbyDevices.Trim().c_str() << "\" />\n" <<
+          "\t<setting id=\"wake_devices\" value=\"" << strWakeDevices.c_str() << "\" />\n" <<
+          "\t<setting id=\"standby_devices\" value=\"" << strStandbyDevices.c_str() << "\" />\n" <<
           "\t<setting id=\"cec_standby_screensaver\" value=\"" << (int)g_config.bPowerOffScreensaver << "\" />\n" <<
           "\t<setting id=\"standby_pc_on_tv_standby\" value=\"" << (int)g_config.bPowerOffOnStandby << "\" />\n" <<
           "\t<setting id=\"use_tv_menu_language\" value=\"" << (int)g_config.bUseTVMenuLanguage << "\" />\n" <<
diff -Nru libcec-1.5-maverick/src/cec-config/Makefile.am libcec-1.5-maverick/src/cec-config/Makefile.am
--- libcec-1.5-maverick/src/cec-config/Makefile.am	2012-02-29 00:13:10.000000000 +0000
+++ libcec-1.5-maverick/src/cec-config/Makefile.am	2012-03-03 14:43:29.000000000 +0000
@@ -2,4 +2,4 @@
 cec_config_SOURCES = cec-config.cpp
 
 cec_config_CPPFLAGS = -I@abs_top_srcdir@/include
-cec_config_LDFLAGS = @LIBS_DL@ -lrt
\ No newline at end of file
+cec_config_LDFLAGS = @LIBS_DL@
\ No newline at end of file
diff -Nru libcec-1.5-maverick/src/cec-config/Makefile.in libcec-1.5-maverick/src/cec-config/Makefile.in
--- libcec-1.5-maverick/src/cec-config/Makefile.in	2012-02-29 10:44:19.000000000 +0000
+++ libcec-1.5-maverick/src/cec-config/Makefile.in	2012-03-03 14:43:52.000000000 +0000
@@ -195,7 +195,7 @@
 top_srcdir = @top_srcdir@
 cec_config_SOURCES = cec-config.cpp
 cec_config_CPPFLAGS = -I@abs_top_srcdir@/include
-cec_config_LDFLAGS = @LIBS_DL@ -lrt
+cec_config_LDFLAGS = @LIBS_DL@
 all: all-am
 
 .SUFFIXES:
diff -Nru libcec-1.5-maverick/src/cec-config-gui/Properties/AssemblyInfo.cs libcec-1.5-maverick/src/cec-config-gui/Properties/AssemblyInfo.cs
--- libcec-1.5-maverick/src/cec-config-gui/Properties/AssemblyInfo.cs	2012-02-19 10:26:42.000000000 +0000
+++ libcec-1.5-maverick/src/cec-config-gui/Properties/AssemblyInfo.cs	2012-03-03 14:43:29.000000000 +0000
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyFileVersion("1.5.2.0")]
diff -Nru libcec-1.5-maverick/src/CecSharpTester/Properties/AssemblyInfo.cs libcec-1.5-maverick/src/CecSharpTester/Properties/AssemblyInfo.cs
--- libcec-1.5-maverick/src/CecSharpTester/Properties/AssemblyInfo.cs	2012-02-19 10:26:42.000000000 +0000
+++ libcec-1.5-maverick/src/CecSharpTester/Properties/AssemblyInfo.cs	2012-03-03 14:43:29.000000000 +0000
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.0.0")]
-[assembly: AssemblyFileVersion("1.5.0.0")]
+[assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyFileVersion("1.5.2.0")]
diff -Nru libcec-1.5-maverick/src/lib/adapter/USBCECAdapterCommunication.cpp libcec-1.5-maverick/src/lib/adapter/USBCECAdapterCommunication.cpp
--- libcec-1.5-maverick/src/lib/adapter/USBCECAdapterCommunication.cpp	2012-02-29 00:13:10.000000000 +0000
+++ libcec-1.5-maverick/src/lib/adapter/USBCECAdapterCommunication.cpp	2012-03-03 14:43:29.000000000 +0000
@@ -97,13 +97,19 @@
   /* try to read the firmware version */
   m_iFirmwareVersion = CEC_FW_VERSION_UNKNOWN;
   unsigned iFwVersionTry(0);
-  while (bPinged && iNow < iTarget && (m_iFirmwareVersion = GetFirmwareVersion()) == CEC_FW_VERSION_UNKNOWN)
+  while (bPinged && iNow < iTarget && (m_iFirmwareVersion = GetFirmwareVersion()) == CEC_FW_VERSION_UNKNOWN && iFwVersionTry < 3)
   {
-    CLibCEC::AddLog(CEC_LOG_ERROR, "the adapter did not respond with a correct firmware version (try %d)", ++iFwVersionTry);
+    CLibCEC::AddLog(CEC_LOG_WARNING, "the adapter did not respond with a correct firmware version (try %d)", ++iFwVersionTry);
     CEvent::Sleep(500);
     iNow = GetTimeMs();
   }
 
+  if (m_iFirmwareVersion == CEC_FW_VERSION_UNKNOWN)
+  {
+    CLibCEC::AddLog(CEC_LOG_DEBUG, "defaulting to firmware version 1");
+    m_iFirmwareVersion = 1;
+  }
+
   if (m_iFirmwareVersion >= 2)
   {
     /* try to set controlled mode */
diff -Nru libcec-1.5-maverick/src/lib/CECProcessor.cpp libcec-1.5-maverick/src/lib/CECProcessor.cpp
--- libcec-1.5-maverick/src/lib/CECProcessor.cpp	2012-02-29 00:13:10.000000000 +0000
+++ libcec-1.5-maverick/src/lib/CECProcessor.cpp	2012-03-03 14:43:29.000000000 +0000
@@ -78,7 +78,7 @@
     m_iLastTransmission(0)
 {
   m_configuration.Clear();
-  m_configuration.serverVersion    = CEC_SERVER_VERSION_1_5_1;
+  m_configuration.serverVersion    = CEC_SERVER_VERSION_1_5_2;
 
   // client version < 1.5.0
   m_configuration.clientVersion    = (uint32_t)CEC_CLIENT_VERSION_PRE_1_5;
@@ -1374,6 +1374,8 @@
     return "1.5.0";
   case CEC_CLIENT_VERSION_1_5_1:
     return "1.5.1";
+  case CEC_CLIENT_VERSION_1_5_2:
+    return "1.5.2";
   default:
     return "Unknown";
   }
@@ -1388,7 +1390,9 @@
   case CEC_SERVER_VERSION_1_5_0:
     return "1.5.0";
   case CEC_SERVER_VERSION_1_5_1:
-      return "1.5.1";
+    return "1.5.1";
+  case CEC_SERVER_VERSION_1_5_2:
+    return "1.5.2";
   default:
     return "Unknown";
   }
diff -Nru libcec-1.5-maverick/src/lib/LibCEC.cpp libcec-1.5-maverick/src/lib/LibCEC.cpp
--- libcec-1.5-maverick/src/lib/LibCEC.cpp	2012-02-29 00:13:10.000000000 +0000
+++ libcec-1.5-maverick/src/lib/LibCEC.cpp	2012-03-03 14:43:29.000000000 +0000
@@ -60,7 +60,7 @@
     m_callbacks(configuration->callbacks),
     m_cbParam(configuration->callbackParam)
 {
-  configuration->serverVersion = CEC_SERVER_VERSION_1_5_1;
+  configuration->serverVersion = CEC_SERVER_VERSION_1_5_2;
   m_cec = new CCECProcessor(this, configuration);
 }
 
diff -Nru libcec-1.5-maverick/src/lib/Makefile.am libcec-1.5-maverick/src/lib/Makefile.am
--- libcec-1.5-maverick/src/lib/Makefile.am	2012-02-29 00:13:10.000000000 +0000
+++ libcec-1.5-maverick/src/lib/Makefile.am	2012-03-03 14:43:29.000000000 +0000
@@ -26,5 +26,5 @@
 					implementations/RLCommandHandler.cpp \
                     platform/posix/serialport.cpp
 
-libcec_la_LDFLAGS = @LIBS@ -version-info @VERSION@ -lrt
+libcec_la_LDFLAGS = @LIBS@ -version-info @VERSION@
 libcec_la_CPPFLAGS = -I@abs_top_srcdir@/include
diff -Nru libcec-1.5-maverick/src/lib/Makefile.in libcec-1.5-maverick/src/lib/Makefile.in
--- libcec-1.5-maverick/src/lib/Makefile.in	2012-02-29 10:44:19.000000000 +0000
+++ libcec-1.5-maverick/src/lib/Makefile.in	2012-03-03 14:43:53.000000000 +0000
@@ -254,7 +254,7 @@
 					implementations/RLCommandHandler.cpp \
                     platform/posix/serialport.cpp
 
-libcec_la_LDFLAGS = @LIBS@ -version-info @VERSION@ -lrt
+libcec_la_LDFLAGS = @LIBS@ -version-info @VERSION@
 libcec_la_CPPFLAGS = -I@abs_top_srcdir@/include
 all: all-am
 
diff -Nru libcec-1.5-maverick/src/LibCecSharp/AssemblyInfo.cpp libcec-1.5-maverick/src/LibCecSharp/AssemblyInfo.cpp
--- libcec-1.5-maverick/src/LibCecSharp/AssemblyInfo.cpp	2012-02-19 10:26:42.000000000 +0000
+++ libcec-1.5-maverick/src/LibCecSharp/AssemblyInfo.cpp	2012-03-03 14:43:29.000000000 +0000
@@ -13,7 +13,7 @@
 [assembly:AssemblyTrademarkAttribute("")];
 [assembly:AssemblyCultureAttribute("")];
 
-[assembly:AssemblyVersionAttribute("1.5.0.0")];
+[assembly:AssemblyVersionAttribute("1.5.2.0")];
 
 [assembly:ComVisible(false)];
 [assembly:CLSCompliantAttribute(true)];
diff -Nru libcec-1.5-maverick/src/LibCecSharp/CecSharpTypes.h libcec-1.5-maverick/src/LibCecSharp/CecSharpTypes.h
--- libcec-1.5-maverick/src/LibCecSharp/CecSharpTypes.h	2012-02-29 00:13:10.000000000 +0000
+++ libcec-1.5-maverick/src/LibCecSharp/CecSharpTypes.h	2012-03-03 14:43:29.000000000 +0000
@@ -327,14 +327,16 @@
 	{
 		VersionPre1_5 = 0,
 		Version1_5_0  = 0x1500,
-    Version1_5_1  = 0x1501
+    Version1_5_1  = 0x1501,
+    Version1_5_2  = 0x1502
 	};
 
   public enum class CecServerVersion
 	{
 		VersionPre1_5 = 0,
 		Version1_5_0  = 0x1500,
-    Version1_5_1  = 0x1501
+    Version1_5_1  = 0x1501,
+    Version1_5_2  = 0x1502
 	};
 
 	public ref class CecAdapter
diff -Nru libcec-1.5-maverick/src/testclient/Makefile.am libcec-1.5-maverick/src/testclient/Makefile.am
--- libcec-1.5-maverick/src/testclient/Makefile.am	2012-02-29 00:13:10.000000000 +0000
+++ libcec-1.5-maverick/src/testclient/Makefile.am	2012-03-03 14:43:29.000000000 +0000
@@ -2,4 +2,4 @@
 cec_client_SOURCES = main.cpp
 
 cec_client_CPPFLAGS = -I@abs_top_srcdir@/include
-cec_client_LDFLAGS = @LIBS_DL@ -lrt
\ No newline at end of file
+cec_client_LDFLAGS = @LIBS_DL@
\ No newline at end of file
diff -Nru libcec-1.5-maverick/src/testclient/Makefile.in libcec-1.5-maverick/src/testclient/Makefile.in
--- libcec-1.5-maverick/src/testclient/Makefile.in	2012-02-29 10:44:19.000000000 +0000
+++ libcec-1.5-maverick/src/testclient/Makefile.in	2012-03-03 14:43:53.000000000 +0000
@@ -195,7 +195,7 @@
 top_srcdir = @top_srcdir@
 cec_client_SOURCES = main.cpp
 cec_client_CPPFLAGS = -I@abs_top_srcdir@/include
-cec_client_LDFLAGS = @LIBS_DL@ -lrt
+cec_client_LDFLAGS = @LIBS_DL@
 all: all-am
 
 .SUFFIXES: