[pkg-remote-commits] [remmina] 01/02: debian/: use ayatana packages for appindicator feature

[Matteo F. Vescovi]

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

mfv pushed a commit to branch master
in repository remmina.

commit 101a6ef226641e1a0758d125b3160b6d6240ced0
Author: Matteo F. Vescovi <mfv at debian.org>
Date:   Mon Oct 9 23:26:58 2017 +0200

    debian/: use ayatana packages for appindicator feature
    
    Since libappindicator package is marked as orphaned (see #818019) and
    it's no more maintained actively, I opted to move to ayatana packages
    for the same feature. I really hope this is the right choice.
    
    Gbp-Dch: Short
---
 debian/control                                   |  2 +-
 debian/patches/0001-Fix_appindicator_usage.patch | 44 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 04eae39..b258f09 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Build-Depends:
  cmake (>= 3.5),
  debhelper (>= 10~),
  freerdp2-dev (>= 2.0.0~),
- libappindicator3-dev,
  libavahi-ui-gtk3-dev (>= 0.6.0),
+ libayatana-appindicator3-dev,
  libgcrypt-dev | libgcrypt20-dev,
  libgnutls28-dev,
  libgtk-3-dev,
diff --git a/debian/patches/0001-Fix_appindicator_usage.patch b/debian/patches/0001-Fix_appindicator_usage.patch
new file mode 100644
index 0000000..13a8030
--- /dev/null
+++ b/debian/patches/0001-Fix_appindicator_usage.patch
@@ -0,0 +1,44 @@
+From: "Matteo F. Vescovi" <mfv at debian.org>
+Date: Mon, 9 Oct 2017 23:17:41 +0200
+Subject: Fix_appindicator_usage
+
+---
+ cmake/FindAPPINDICATOR.cmake | 8 ++++----
+ remmina/src/remmina_icon.c   | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/FindAPPINDICATOR.cmake b/cmake/FindAPPINDICATOR.cmake
+index 9245504..7055c82 100644
+--- a/cmake/FindAPPINDICATOR.cmake
++++ b/cmake/FindAPPINDICATOR.cmake
+@@ -17,13 +17,13 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ # Boston, MA  02110-1301, USA.
+ 
+-pkg_check_modules(PC_APPINDICATOR appindicator3-0.1)
++pkg_check_modules(PC_APPINDICATOR ayatana-appindicator3-0.1)
+ 
+-find_path(APPINDICATOR_INCLUDE_DIR NAMES libappindicator/app-indicator.h
++find_path(APPINDICATOR_INCLUDE_DIR NAMES libayatana-appindicator/app-indicator.h
+ 	HINTS ${PC_APPINDICATOR_INCLUDEDIR} ${PC_APPINDICATOR_INCLUDE_DIRS}
+-	PATH_SUFFIXES libappindicator-0.1)
++	PATH_SUFFIXES libayatana-appindicator-0.1)
+ 
+-find_library(APPINDICATOR_LIBRARY NAMES appindicator3)
++find_library(APPINDICATOR_LIBRARY NAMES ayatana-appindicator3)
+ 
+ include(FindPackageHandleStandardArgs)
+ 
+diff --git a/remmina/src/remmina_icon.c b/remmina/src/remmina_icon.c
+index ab1ff2b..fa83d2a 100644
+--- a/remmina/src/remmina_icon.c
++++ b/remmina/src/remmina_icon.c
+@@ -49,7 +49,7 @@
+ #include "remmina_sysinfo.h"
+ 
+ #ifdef HAVE_LIBAPPINDICATOR
+-#include <libappindicator/app-indicator.h>
++#include <libayatana-appindicator/app-indicator.h>
+ #endif
+ 
+ typedef struct _RemminaIcon
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2b9d891
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix_appindicator_usage.patch

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