[Pkg-xfce-commits] r10048 - in /goodies/trunk/xfce4-indicator-plugin/debian: changelog control patches/ patches/01_ayatana.patch patches/series

Sun Sep 24 07:15:52 UTC 2017

Author: unit193-guest
Date: Sun Sep 24 07:15:52 2017
New Revision: 10048

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=10048
Log:
  - Update B-D for Ayatana.
    + libido3-0.4-dev → libayatana-ido3-0.4-dev
    + libindicator3-dev → libayatana-indicator3-dev
  - Drop recommend on indicator-messages-gtk2.
  - Recommend ayatana-indicator-application.
* d/p/01_ayatana.patch:
  - Update configure.ac and headers to look for ayatana libs.

Added:
    goodies/trunk/xfce4-indicator-plugin/debian/patches/
    goodies/trunk/xfce4-indicator-plugin/debian/patches/01_ayatana.patch
    goodies/trunk/xfce4-indicator-plugin/debian/patches/series
Modified:
    goodies/trunk/xfce4-indicator-plugin/debian/changelog
    goodies/trunk/xfce4-indicator-plugin/debian/control

Modified: goodies/trunk/xfce4-indicator-plugin/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/debian/changelog?rev=10048&op=diff
==============================================================================

--- goodies/trunk/xfce4-indicator-plugin/debian/changelog	(original)
+++ goodies/trunk/xfce4-indicator-plugin/debian/changelog	Sun Sep 24 07:15:52 2017
@@ -23,6 +23,13 @@
   * d/control:
     - B-D on gtk-doc-tools and xfce4-dev-tools for autoreconf.
     - Drop B-D on autotools-dev and versioned B-D on dpkg-dev.
+    - Update B-D for Ayatana.
+      + libido3-0.4-dev â†’ libayatana-ido3-0.4-dev
+      + libindicator3-dev â†’ libayatana-indicator3-dev
+    - Drop recommend on indicator-messages-gtk2.
+    - Recommend ayatana-indicator-application.
+  * d/p/01_ayatana.patch:
+    - Update configure.ac and headers to look for ayatana libs.
   * d/rules:
     - Drop explicit --parallel and --with autotools-dev.
     - override_dh_autoreconf to use xdt-autogen.

Modified: goodies/trunk/xfce4-indicator-plugin/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/debian/control?rev=10048&op=diff
==============================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/control	(original)
+++ goodies/trunk/xfce4-indicator-plugin/debian/control	Sun Sep 24 07:15:52 2017
@@ -8,9 +8,10 @@
 Build-Depends: debhelper (>= 10),
                gtk-doc-tools,
                intltool,
+               libayatana-ido3-0.4-dev,
+               libayatana-indicator3-dev,
                libexo-1-dev,
                libgtk-3-dev (>= 3.6),
-               libindicator3-dev (>= 12.10.1),
                libxfce4panel-2.0-dev (>= 4.11.0),
                libxfce4ui-2-dev (>= 4.11),
                libxfce4util-dev (>= 4.9),
@@ -25,7 +26,7 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: indicator-renderer
-Recommends: indicator-messages-gtk2
+Recommends: ayatana-indicator-application
 Description: plugin to display information from applications in the Xfce4 panel
  A small plugin to display information from various applications consistently
  in the Xfce4 panel as described in Ubuntus MessagingMenu design specification.

Added: goodies/trunk/xfce4-indicator-plugin/debian/patches/01_ayatana.patch
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/debian/patches/01_ayatana.patch?rev=10048&op=file
==============================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/01_ayatana.patch	(added)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/01_ayatana.patch	Sun Sep 24 07:15:52 2017
@@ -0,0 +1,118 @@
+Description: Debian doesn't have newer indicators, use the ayatana fork instead.
+Author: Unit 193 <unit193 at ubuntu.com>
+
+diff --git a/configure.ac b/configure.ac
+index 588a388..10944da 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -88,8 +88,8 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.11.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.11.0])
+ XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
+-INDICATOR_PKGNAME=indicator3-0.4
+-XDT_CHECK_PACKAGE([INDICATOR], [${INDICATOR_PKGNAME}], [12.10.1])
++INDICATOR_PKGNAME=ayatana-indicator3-0.4
++XDT_CHECK_PACKAGE([INDICATOR], [${INDICATOR_PKGNAME}], [0.5.0])
+ 
+ dnl ********************************************************************
+ dnl *** Check if libindicator has indicator-ng.h headery             ***
+@@ -97,13 +97,13 @@ dnl *** At the moment this cannot be derived from the version number ***
+ dnl ********************************************************************
+ AC_LANG_PUSH([C])
+ CPPFLAGS=`$PKG_CONFIG --cflags ${INDICATOR_PKGNAME}`
+-AC_CHECK_HEADERS([libindicator/indicator-ng.h], [HAVE_INDICATOR_NG_H=yes], [HAVE_INDICATOR_NG_H=no])
++AC_CHECK_HEADERS([libayatana-indicator/indicator-ng.h], [HAVE_INDICATOR_NG_H=yes], [HAVE_INDICATOR_NG_H=no])
+ AC_LANG_POP
+ 
+ dnl ****************************
+ dnl *** Optional IDO library ***
+ dnl ****************************
+-XDT_CHECK_OPTIONAL_PACKAGE([IDO], [libido3-0.1], [13.10.0], [ido], [IDO library])
++XDT_CHECK_OPTIONAL_PACKAGE([IDO], [libayatana-ido3-0.4], [0.4.0], [ido], [IDO library])
+ 
+ dnl ***********************************
+ dnl *** Check for debugging support ***
+diff --git a/panel-plugin/indicator-box.c b/panel-plugin/indicator-box.c
+index 66523d6..98d8549 100644
+--- a/panel-plugin/indicator-box.c
++++ b/panel-plugin/indicator-box.c
+@@ -28,7 +28,7 @@
+ #include <gtk/gtk.h>
+ //#include <exo/exo.h>
+ #include <libxfce4panel/libxfce4panel.h>
+-#include <libindicator/indicator-object.h>
++#include <libayatana-indicator/indicator-object.h>
+ 
+ #include "indicator-box.h"
+ #include "indicator-button.h"
+diff --git a/panel-plugin/indicator-box.h b/panel-plugin/indicator-box.h
+index 8647e04..b5ca139 100644
+--- a/panel-plugin/indicator-box.h
++++ b/panel-plugin/indicator-box.h
+@@ -20,7 +20,7 @@
+ 
+ #include <glib.h>
+ #include <gtk/gtk.h>
+-#include <libindicator/indicator-object.h>
++#include <libayatana-indicator/indicator-object.h>
+ #include <libxfce4panel/libxfce4panel.h>
+ #include "indicator-config.h"
+ 
+diff --git a/panel-plugin/indicator-button.c b/panel-plugin/indicator-button.c
+index aa89c41..4c26a1a 100644
+--- a/panel-plugin/indicator-button.c
++++ b/panel-plugin/indicator-button.c
+@@ -28,13 +28,13 @@
+ #include <glib.h>
+ #include <gtk/gtk.h>
+ #include <libxfce4panel/libxfce4panel.h>
+-#include <libindicator/indicator-object.h>
++#include <libayatana-indicator/indicator-object.h>
+ 
+ #include "indicator-button.h"
+ #include "indicator-button-box.h"
+ 
+ 
+-#include <libindicator/indicator-object.h>
++#include <libayatana-indicator/indicator-object.h>
+ 
+ #define ICON_SIZE 22
+ #define SPACING 2
+diff --git a/panel-plugin/indicator-button.h b/panel-plugin/indicator-button.h
+index f0f1610..aa2c808 100644
+--- a/panel-plugin/indicator-button.h
++++ b/panel-plugin/indicator-button.h
+@@ -20,7 +20,7 @@
+ 
+ #include <glib.h>
+ #include <gtk/gtk.h>
+-#include <libindicator/indicator-object.h>
++#include <libayatana-indicator/indicator-object.h>
+ 
+ #include "indicator-config.h"
+ #include "indicator-box.h"
+diff --git a/panel-plugin/indicator.c b/panel-plugin/indicator.c
+index 475e230..4b25c4d 100644
+--- a/panel-plugin/indicator.c
++++ b/panel-plugin/indicator.c
+@@ -37,9 +37,9 @@
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+ #include <libxfce4panel/xfce-panel-plugin.h>
+-#include <libindicator/indicator-object.h>
++#include <libayatana-indicator/indicator-object.h>
+ #ifdef HAVE_LIBINDICATOR_INDICATOR_NG_H
+-#include <libindicator/indicator-ng.h>
++#include <libayatana-indicator/indicator-ng.h>
+ #endif
+ 
+ #include "indicator.h"
+@@ -48,7 +48,7 @@
+ #include "indicator-dialog.h"
+ 
+ #ifdef HAVE_IDO
+-#include <libido/libido.h>
++#include <libayatana-ido/libayatana-ido.h>
+ #endif
+ 
+ /* prototypes */

Added: goodies/trunk/xfce4-indicator-plugin/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/debian/patches/series?rev=10048&op=file
==============================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/series	(added)
+++ goodies/trunk/xfce4-indicator-plugin/debian/patches/series	Sun Sep 24 07:15:52 2017
@@ -0,0 +1 @@
+01_ayatana.patch


