From cf894302767d5ec483b5f8002bb796a284895bbf Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 1 Aug 2013 18:21:05 -0500 Subject: add a bluetooth backend to track bluetooth being enabled, being hard/soft blocked, and its devices. --- debian/control | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 07bc74d..a08015d 100644 --- a/debian/control +++ b/debian/control @@ -8,9 +8,7 @@ Build-Depends: debhelper (>= 9.0), gnome-common, libdbusmenu-gtk3-dev, libglib2.0-dev, - libgnome-bluetooth-dev, libgtk-3-dev, - libido3-0.1-dev, libindicator3-dev, valac (>=0.18), Standards-Version: 3.9.4 -- cgit v1.2.3 From 6f6674a851fcce75e1808dd6bec7e36ee319085c Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 5 Aug 2013 19:56:44 -0500 Subject: Remove dbusmenu, gtk, indicator dependencies. Only require gnome-bluetooth on the desktop. --- configure.ac | 11 +++++------ debian/control | 3 --- src/Makefile.am | 8 ++++---- 3 files changed, 9 insertions(+), 13 deletions(-) (limited to 'debian/control') diff --git a/configure.ac b/configure.ac index 15f09ef..f047bd9 100644 --- a/configure.ac +++ b/configure.ac @@ -14,12 +14,11 @@ dnl ########################################################################### dnl Dependencies dnl ########################################################################### -PKG_CHECK_MODULES(INDICATOR_BLUETOOTH_SERVICE, [ - glib-2.0 - gnome-bluetooth-1.0 - indicator3-0.4 - dbusmenu-gtk3-0.4 -]) +GLIB_REQUIRED_VERSION=2.36 +GIO_REQUIRED_VERSION=2.36 + +PKG_CHECK_MODULES(SERVICE_DEPS, [glib-2.0 >= $GLIB_REQUIRED_VERSION + gio-unix-2.0 >= $GIO_REQUIRED_VERSION]) dnl ############################## dnl # Custom Junk diff --git a/debian/control b/debian/control index a08015d..1be3e37 100644 --- a/debian/control +++ b/debian/control @@ -6,10 +6,7 @@ Build-Depends: debhelper (>= 9.0), dh-autoreconf, dh-translations, gnome-common, - libdbusmenu-gtk3-dev, libglib2.0-dev, - libgtk-3-dev, - libindicator3-dev, valac (>=0.18), Standards-Version: 3.9.4 Homepage: https://launchpad.net/indicator-bluetooth diff --git a/src/Makefile.am b/src/Makefile.am index 87f4231..2fc41bb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,17 +20,17 @@ indicator_bluetooth_service_VALAFLAGS = \ --pkg rfkill \ --pkg posix \ --pkg glib-2.0 \ - --pkg gtk+-3.0 + --pkg gio-2.0 # -w to disable warnings for vala-generated code indicator_bluetooth_service_CFLAGS = \ -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \ -DLOCALE_DIR=\"$(datadir)/locale\" \ - -w \ - $(INDICATOR_BLUETOOTH_SERVICE_CFLAGS) + -w \ + $(SERVICE_DEPS_CFLAGS) indicator_bluetooth_service_LDADD = \ - $(INDICATOR_BLUETOOTH_SERVICE_LIBS) + $(SERVICE_DEPS_LIBS) CLEANFILES = \ $(patsubst %.vala,%.c,$(filter %.vala, $(SOURCES))) \ -- cgit v1.2.3 From f77ffbd3c9f2392f582cfbc72de5607c6eed9ca7 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 8 Aug 2013 14:12:06 -0500 Subject: change control s.t. either ubuntu-system-settings, or (gnome-control-center && gnome-bluetooth), are a Dependency --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 1be3e37..624a064 100644 --- a/debian/control +++ b/debian/control @@ -20,7 +20,8 @@ Package: indicator-bluetooth Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, - gnome-bluetooth, + ubuntu-system-settings | gnome-control-center, + ubuntu-system-settings | gnome-bluetooth, Replaces: gnome-bluetooth (<< 3.6.1-0ubuntu2) Breaks: gnome-bluetooth (<< 3.6.1-0ubuntu2) Description: System bluetooth indicator. -- cgit v1.2.3 From a6092a4c224480c3873a612d312eb6a14a57a577 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 8 Aug 2013 14:23:08 -0500 Subject: in debian/control, make the bluez dependency explicit --- debian/control | 1 + 1 file changed, 1 insertion(+) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 624a064..baffbf4 100644 --- a/debian/control +++ b/debian/control @@ -20,6 +20,7 @@ Package: indicator-bluetooth Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, + bluez (>= 4.36), ubuntu-system-settings | gnome-control-center, ubuntu-system-settings | gnome-bluetooth, Replaces: gnome-bluetooth (<< 3.6.1-0ubuntu2) -- cgit v1.2.3