From 348f6860843bfec1360897fcbb7f9dc27b3ed41a Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Mon, 5 Jan 2015 20:20:04 +0100 Subject: [PATCH] 45-taranis.rules renamed to 45-companion-taranis.rules to solve the clash with the same file name from Companion9x debian package --- companion/src/CMakeLists.txt | 2 +- .../linux/{45-taranis.rules => 45-companion-taranis.rules} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename companion/targets/linux/{45-taranis.rules => 45-companion-taranis.rules} (100%) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 0ddd62de4..57ed5b036 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -380,7 +380,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") INSTALL( FILES images/linuxicons/256x256/companion.png DESTINATION /usr/share/icons/hicolor/256x256/apps ) INSTALL( FILES images/linuxicons/512x512/companion.png DESTINATION /usr/share/icons/hicolor/512x512/apps ) INSTALL( FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps ) - INSTALL( FILES ../targets/linux/45-taranis.rules DESTINATION /etc/udev/rules.d/ ) + INSTALL( FILES ../targets/linux/45-companion-taranis.rules DESTINATION /etc/udev/rules.d/ ) # Linux specific code SET(OperatingSystem "Linux") ELSE (${CMAKE_SYSTEM_NAME} MATCHES "Linux") diff --git a/companion/targets/linux/45-taranis.rules b/companion/targets/linux/45-companion-taranis.rules similarity index 100% rename from companion/targets/linux/45-taranis.rules rename to companion/targets/linux/45-companion-taranis.rules