[hamradio-commits] [limesuite] 04/06: Make sure desktop files are installed on all architectures, not just Linux

[Andreas E. Bombe]

This is an automated email from the git hooks/post-receive script.

aeb pushed a commit to branch master
in repository limesuite.

commit 68481baa1a6b9a97f82f3aba6784fbb3714f2c0a
Author: Andreas Bombe <aeb at debian.org>
Date:   Fri Jan 6 04:09:30 2017 +0100

    Make sure desktop files are installed on all architectures, not just Linux
---
 debian/changelog                |  2 ++
 debian/patches/fix-icon-install | 13 ++++++++++++-
 debian/patches/series           |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1bb203a..9eea8c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ limesuite (16.8.23.819+git20161221+dfsg-2) UNRELEASED; urgency=medium
   * Link with --as-needed 
   * Make liblimesuite-dev Multi-Arch: same and limesuite-udev
     Multi-Arch: foreign
+  * Make sure desktop files are installed on all architectures, not
+    just Linux
 
  -- Andreas Bombe <aeb at debian.org>  Fri, 06 Jan 2017 02:03:29 +0100
 
diff --git a/debian/patches/fix-icon-install b/debian/patches/fix-icon-install
index 199b31e..4f8eb70 100644
--- a/debian/patches/fix-icon-install
+++ b/debian/patches/fix-icon-install
@@ -7,7 +7,18 @@ Author: Andreas Bombe <aeb at debian.org>
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Desktop/CMakeLists.txt
 +++ b/Desktop/CMakeLists.txt
-@@ -13,24 +13,11 @@
+@@ -4,33 +4,21 @@
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+     set(LINUX TRUE)
+ endif()
++set(ANY_ARCH TRUE)
+ 
+ include(FeatureSummary)
+ include(CMakeDependentOption)
+-cmake_dependent_option(ENABLE_DESKTOP "Enable LimeSuite launcher and icons" ON "LINUX" OFF)
++cmake_dependent_option(ENABLE_DESKTOP "Enable LimeSuite launcher and icons" ON "ANY_ARCH" OFF)
+ add_feature_info(LimeSuiteDesktop ENABLE_DESKTOP "LimeSuite freedesktop integration")
+ if (NOT ENABLE_DESKTOP)
      return()
  endif()
  
diff --git a/debian/patches/series b/debian/patches/series
index 897f711..3a4802f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 override-build-timestamp
 version-string
 use-system-glew
-fix-icon-install
 link-libatomic
+fix-icon-install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/limesuite.git