diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-08-05 19:56:44 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2013-08-05 19:56:44 -0500 |
| commit | 6f6674a851fcce75e1808dd6bec7e36ee319085c (patch) | |
| tree | 02d8b57593115b738f8d45709ca446683fdcc5af | |
| parent | 90a5d3f5b933320ba6426bbd18198e4c54bb465e (diff) | |
| download | ayatana-indicator-bluetooth-6f6674a851fcce75e1808dd6bec7e36ee319085c.tar.gz ayatana-indicator-bluetooth-6f6674a851fcce75e1808dd6bec7e36ee319085c.tar.bz2 ayatana-indicator-bluetooth-6f6674a851fcce75e1808dd6bec7e36ee319085c.zip | |
Remove dbusmenu, gtk, indicator dependencies. Only require gnome-bluetooth on the desktop.
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 8 |
3 files changed, 9 insertions, 13 deletions
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))) \ |