Merge branch 'master' into release

Pulse-Eight · Jul 13, 2020 · f1004d1 · f1004d1
2 parents cf8cea4 + e058b96
commit f1004d1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.12.0)
 
 set(LIBCEC_VERSION_MAJOR 6)
 set(LIBCEC_VERSION_MINOR 0)
-set(LIBCEC_VERSION_PATCH 0)
+set(LIBCEC_VERSION_PATCH 1)
 
 # cec-client
 add_subdirectory(src/cec-client)
@@ -35,8 +35,12 @@ if(WIN32)
                  ${CMAKE_CURRENT_SOURCE_DIR}/src/dotnetlib/LibCecSharpCore/AssemblyInfo.cpp)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/dotnet/src/LibCecTray/LibCECTray.csproj.in
                  ${CMAKE_CURRENT_SOURCE_DIR}/src/dotnet/src/LibCecTray/LibCECTray.csproj)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/dotnet/src/LibCecTray/Properties/AssemblyInfo.cs.in
+                 ${CMAKE_CURRENT_SOURCE_DIR}/src/dotnet/src/LibCecTray/Properties/AssemblyInfo.cs)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/dotnet/src/CecSharpTester/netcore/CecSharpCoreTester.csproj.in
                  ${CMAKE_CURRENT_SOURCE_DIR}/src/dotnet/src/CecSharpTester/netcore/CecSharpCoreTester.csproj)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/dotnet/src/CecSharpTester/netfx/CecSharpTester.csproj.in
                  ${CMAKE_CURRENT_SOURCE_DIR}/src/dotnet/src/CecSharpTester/netfx/CecSharpTester.csproj)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/dotnet/src/CecSharpTester/netfx/Properties/AssemblyInfo.cs.in
+                 ${CMAKE_CURRENT_SOURCE_DIR}/src/dotnet/src/CecSharpTester/netfx/Properties/AssemblyInfo.cs)
 endif()
diff --git a/debian/changelog.in b/debian/changelog.in
@@ -1,3 +1,10 @@
+libcec (6.0.1.1~#DIST#) #DIST#; urgency=medium
+
+  * fixed:
+    * cec-tray didn't start in some cases
+
+ -- Pulse-Eight Packaging <[email protected]>  Mon, 13 Jul 2020 09:16:00 +0100
+
 libcec (6.0.0.1~#DIST#) #DIST#; urgency=medium
 
   * fixed:

diff --git a/src/dotnet b/src/dotnet
+1 −1		src/CecSharpTester/netcore/CecSharpCoreTester.csproj
+1 −1		src/CecSharpTester/netfx/CecSharpTester.csproj
+2 −2		src/CecSharpTester/netfx/Properties/AssemblyInfo.cs
+36 −0		src/CecSharpTester/netfx/Properties/AssemblyInfo.cs.in
+2 −2		src/LibCecTray/LibCECTray.csproj
+2 −2		src/LibCecTray/Properties/AssemblyInfo.cs
+35 −0		src/LibCecTray/Properties/AssemblyInfo.cs.in
+0 −1		src/LibCecTray/settings/CECSetting.cs