updated changelog and bumped version numbers for v1.5.2

diff --git a/ChangeLog b/ChangeLog
index d407e38ef70c1d5cd8627b5a2ee53cd3a4b04a72..15d5a73e25bc2ec09e8a77494194342f1c4d3b76 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 --git a/debian/changelog b/debian/changelog
index d407e38ef70c1d5cd8627b5a2ee53cd3a4b04a72..15d5a73e25bc2ec09e8a77494194342f1c4d3b76 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 --git a/include/cectypes.h b/include/cectypes.h
index 76056cd63458701285c5c5d1fe9c741c7cd50de9..095416e445020446efb37413b2c4ae08cea30657 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -948,14 +948,16 @@ typedef enum cec_client_version
 {
   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 --git a/project/cec-config.rc b/project/cec-config.rc
index 07a63248875c3c6fca4c41ca481af8df236331e8..180f4f050acf9882a287d1144d293a21bf783876 100644 (file)
Binary files a/project/cec-config.rc and b/project/cec-config.rc differ

diff --git a/project/libcec.rc b/project/libcec.rc
index 6e422e2fadf0e493a45416c2ff45c96c11d68eb6..4de5b4fa94028e021d401b8d4da0d80115dfe513 100644 (file)
Binary files a/project/libcec.rc and b/project/libcec.rc differ

diff --git a/project/testclient.rc b/project/testclient.rc
index 1a3b7792d3e6d20e08702572f047441c9fbbec2f..15edfb5a5f2080c5845050e16f3992e72fee829d 100644 (file)
Binary files a/project/testclient.rc and b/project/testclient.rc differ

diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs
index 0f0423893609eff36911d4ba8505647ea0b65c08..e12aca92a80ebcf6ba338bba6b5442d790634ddd 100644 (file)
--- a/src/CecSharpTester/Properties/AssemblyInfo.cs
+++ b/src/CecSharpTester/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 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 --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp
index ef09f79aed5ca5bcf76c77c2292721aa5b5f332b..5dfbef2d600b2f90fa096f30d5a2d513a24ef9f2 100644 (file)
--- a/src/LibCecSharp/AssemblyInfo.cpp
+++ b/src/LibCecSharp/AssemblyInfo.cpp
@@ -13,7 +13,7 @@ using namespace System::Security::Permissions;
 [assembly:AssemblyTrademarkAttribute("")];
 [assembly:AssemblyCultureAttribute("")];
 
-[assembly:AssemblyVersionAttribute("1.5.0.0")];
+[assembly:AssemblyVersionAttribute("1.5.2.0")];
 
 [assembly:ComVisible(false)];
 [assembly:CLSCompliantAttribute(true)];

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index 65fa7cd4fa5e22bd2d8ba71b74edb39a91d73b33..8cdaa89a0e9e797f2931fedb936534c3009a2bd2 100644 (file)
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -327,14 +327,16 @@ namespace CecSharp
        {
                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 --git a/src/cec-config-gui/Properties/AssemblyInfo.cs b/src/cec-config-gui/Properties/AssemblyInfo.cs
index b99c5531cd1e6344b8af3de4ec1b8ca98d621d10..a1206f99126633184aa7a86119ba51ec14a948ed 100644 (file)
--- a/src/cec-config-gui/Properties/AssemblyInfo.cs
+++ b/src/cec-config-gui/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 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 --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp
index 96e82ce626ff4f23f3e3287b0ead0cd26f2797df..b455ac88d9ab0558e81f77108e703be494331f4b 100644 (file)
--- a/src/lib/CECProcessor.cpp
+++ b/src/lib/CECProcessor.cpp
@@ -78,7 +78,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con
     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 @@ const char *CCECProcessor::ToString(const cec_client_version version)
     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 @@ const char *CCECProcessor::ToString(const cec_server_version version)
   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 --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp
index b36d25425d87dd298dc51011023f202b1d49b17d..ab05822a230a1c7784dfe924f1426279578fa93e 100644 (file)
--- a/src/lib/LibCEC.cpp
+++ b/src/lib/LibCEC.cpp
@@ -60,7 +60,7 @@ CLibCEC::CLibCEC(libcec_configuration *configuration) :
     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);
 }