Mike --
DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby mobile: +49 (1520) 1976 148 landline: +49 (4354) 8390 139 GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22 0782 9AF4 6B30 2577 1B31 mail: mike.gabr...@das-netzwerkteam.de, http://das-netzwerkteam.de
diff -Nru network-manager-applet-1.8.4/debian/changelog network-manager-applet-1.8.4/debian/changelog --- network-manager-applet-1.8.4/debian/changelog 2017-09-20 20:22:26.000000000 +0000 +++ network-manager-applet-1.8.4/debian/changelog 2017-05-22 13:40:43.000000000 +0000 @@ -1,3 +1,16 @@ +network-manager-applet (1.8.4-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/patches: + + Add Ayatana-Indicators-support.patch. Allow building against Ayatana + Indicators as an alternative to Ubuntu's indicators. + * debian/control: + + Add B-Ds: libayatana-appindicator3-dev, libdbusmenu-gtk3-dev. + * debian/rules: + + Switch on --with-ayatana-appindicator configure option. + + -- Mike Gabriel <sunwea...@debian.org> Mon, 22 May 2017 15:40:43 +0200 + network-manager-applet (1.8.4-1) unstable; urgency=medium * New upstream version 1.8.4 diff -Nru network-manager-applet-1.8.4/debian/control network-manager-applet-1.8.4/debian/control --- network-manager-applet-1.8.4/debian/control 2017-09-20 20:22:26.000000000 +0000 +++ network-manager-applet-1.8.4/debian/control 2017-05-22 13:40:43.000000000 +0000 @@ -9,6 +9,8 @@ libsecret-1-dev, libgtk-3-dev (>= 3.4), libglib2.0-dev (>= 2.38), + libayatana-appindicator3-dev, + libdbusmenu-gtk3-dev (>= 16.04.0), libnotify-dev (>= 0.7), libnm-util-dev (>= 1.8), libnm-glib-dev (>= 1.8), diff -Nru network-manager-applet-1.8.4/debian/patches/Ayatana-Indicator-support.patch network-manager-applet-1.8.4/debian/patches/Ayatana-Indicator-support.patch --- network-manager-applet-1.8.4/debian/patches/Ayatana-Indicator-support.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-1.8.4/debian/patches/Ayatana-Indicator-support.patch 2017-05-22 13:40:43.000000000 +0000 @@ -0,0 +1,57 @@ +Description: Support building against Ayatana Indicators and Ubuntu Indicators alike +Author: Mike Gabriel <mike.gabr...@das-netzwerkteam.de> + +--- a/configure.ac ++++ b/configure.ac +@@ -135,7 +135,15 @@ + if test "$with_appindicator" == "yes"; then + PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1) + PKG_CHECK_MODULES(DBUSMENU, dbusmenu-gtk3-0.4 >= 16.04.0) +- AC_DEFINE([WITH_APPINDICATOR], 1, [Enable using libappindicator]) ++ AC_DEFINE([WITH_APPINDICATOR], 1, [Enable appindicator support, use Ubuntu's libappindicator]) ++fi ++ ++AC_ARG_WITH([ayatana-appindicator], AS_HELP_STRING([--with-ayatana-appindicator|--without-ayatana-appindicator], [Build with libayatana-appindicator support instead of Ubuntu's indicators.])) ++if test "$with_ayatana_appindicator" == "yes"; then ++ PKG_CHECK_MODULES(AYATANAAPPINDICATOR, ayatana-appindicator3-0.1) ++ PKG_CHECK_MODULES(DBUSMENU, dbusmenu-gtk3-0.4 >= 16.04.0) ++ AC_DEFINE([WITH_APPINDICATOR], 1, [Enable appindicator support]) ++ AC_DEFINE([USE_AYATANA_INDICATORS], 1, [Use Ayatana Indicators]) + fi + + AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes") +--- a/src/applet.h ++++ b/src/applet.h +@@ -32,7 +32,11 @@ + #include <libnotify/notify.h> + + #ifdef WITH_APPINDICATOR +-#include <libappindicator/app-indicator.h> ++# ifdef USE_AYATANA_INDICATORS ++# include <libayatana-appindicator/app-indicator.h> ++# else ++# include <libappindicator/app-indicator.h> ++# endif + #endif + + #include <NetworkManager.h> +--- a/Makefile.am ++++ b/Makefile.am +@@ -825,7 +825,8 @@ + $(LIBSECRET_CFLAGS) \ + $(NOTIFY_CFLAGS) \ + $(MM_GLIB_CFLAGS) \ +- $(APPINDICATOR_CFLAGS) ++ $(APPINDICATOR_CFLAGS) \ ++ $(AYATANAAPPINDICATOR_CFLAGS) + + src_nm_applet_LDADD = \ + src/wireless-security/libwireless-security-libnm.la \ +@@ -836,6 +837,7 @@ + $(NOTIFY_LIBS) \ + $(MM_GLIB_LIBS) \ + $(APPINDICATOR_LIBS) \ ++ $(AYATANAAPPINDICATOR_LIBS) \ + -lm + + $(src_nm_applet_OBJECTS): $(nm_applet_h_gen) diff -Nru network-manager-applet-1.8.4/debian/patches/series network-manager-applet-1.8.4/debian/patches/series --- network-manager-applet-1.8.4/debian/patches/series 2017-09-20 20:22:26.000000000 +0000 +++ network-manager-applet-1.8.4/debian/patches/series 2017-05-22 13:40:43.000000000 +0000 @@ -1,2 +1,3 @@ Allow-to-create-connections-without-admin-privileges.patch Force-online-state-with-unmanaged-devices.patch +Ayatana-Indicator-support.patch diff -Nru network-manager-applet-1.8.4/debian/rules network-manager-applet-1.8.4/debian/rules --- network-manager-applet-1.8.4/debian/rules 2017-09-20 20:22:26.000000000 +0000 +++ network-manager-applet-1.8.4/debian/rules 2017-05-22 13:40:43.000000000 +0000 @@ -12,6 +12,7 @@ override_dh_auto_configure: dh_auto_configure -- \ + --with-ayatana-appindicator \ --libexecdir=/usr/lib/NetworkManager \ --disable-more-warnings \ --disable-static \
pgp57T1H4vzDf.pgp
Description: Digitale PGP-Signatur