removed dbus dependency

https://bugzilla.gnome.org/show_bug.cgi?id=610231

6 files changed, 1 insertions, 21 deletions

diff --git a/capplet/Makefile.am b/capplet/Makefile.am
index f9203f6..dfe73ad 100644
--- a/capplet/Makefile.am
+++ b/capplet/Makefile.am
@@ -32,7 +32,6 @@ gkbd_indicator_plugins_capplet_SOURCES = gkbd-indicator-plugins-capplet.c \
 gkbd_indicator_plugins_capplet_LDFLAGS = -export-dynamic
 
 gkbd_indicator_plugins_capplet_LDADD = \
-            	$(DBUS_LIBS) 	\
             	$(GCONF_LIBS) 	\
             	$(GTK_LIBS) 	\
             	$(LIBXKLAVIER_LIBS)	\
diff --git a/configure.in b/configure.in
index 81c8d3b..4a6b185 100644
--- a/configure.in
+++ b/configure.in
@@ -16,15 +16,11 @@ dnl ***************************************************************************
 dnl *** Minimum library versions for libgnomekbd                            ***
 dnl ***************************************************************************
 GLIB_REQUIRED=2.16
-DBUS_REQUIRED=0.92
-DBUS_GLIB_REQUIRED=0.34
 GCONF_REQUIRED=2.14.0
 GDK_REQUIRED=2.13
 GTK_REQUIRED=2.13
 LIBXKLAVIER_REQUIRED=5.0
 
-AC_SUBST([DBUS_REQUIRED])
-AC_SUBST([DBUS_GLIB_REQUIRED])
 AC_SUBST([GCONF_REQUIRED])
 AC_SUBST([GDK_REQUIRED])
 AC_SUBST([GTK_REQUIRED])
@@ -61,11 +57,6 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-PKG_CHECK_MODULES(DBUS, dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED)
-
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
-
 PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED)
 
 AC_SUBST(GCONF_CFLAGS)
diff --git a/debian/control b/debian/control
index 2f5d217..9d85206 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,6 @@ Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.o
 Build-Depends: debhelper (>= 5),
         autotools-dev,
         cdbs,
-        libdbus-1-dev (>= 0.92),
-        libdbus-glib-1-dev (>= 0.34),
         libglib2.0-dev (>= 2.16),
         libgconf2-dev (>= 2.14.0),
         libgtk2.0-dev (>= 2.13),
@@ -28,8 +26,6 @@ Depends: libgnomekbd4 (= ${binary:Version}),
         libgconf2-dev,
         libx11-dev,
         libgtk2.0-dev,
-        libdbus-1-dev (>= 0.92),
-        libdbus-glib-1-dev (>= 0.34),
         libxklavier-dev
 Description: GNOME library to manage keyboard configuration - development files
  libgnomekbd offers an API to manage the keyboard in GNOME applications.
diff --git a/debian/control.in b/debian/control.in
index 87c81f5..0a9b72c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,8 +6,6 @@ Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5),
         autotools-dev,
         cdbs,
-        libdbus-1-dev (>= 0.92),
-        libdbus-glib-1-dev (>= 0.34),
         libglib2.0-dev (>= 2.16),
         libgconf2-dev (>= 2.14.0),
         libgtk2.0-dev (>= 2.13),
@@ -28,8 +26,6 @@ Depends: libgnomekbd4 (= ${binary:Version}),
         libgconf2-dev,
         libx11-dev,
         libgtk2.0-dev,
-        libdbus-1-dev (>= 0.92),
-        libdbus-glib-1-dev (>= 0.34),
         libxklavier-dev
 Description: GNOME library to manage keyboard configuration - development files
  libgnomekbd offers an API to manage the keyboard in GNOME applications.
diff --git a/libgnomekbd.pc.in b/libgnomekbd.pc.in
index d331ba2..096534b 100644
--- a/libgnomekbd.pc.in
+++ b/libgnomekbd.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
 Name: libgnomekbd
 Description: GNOME keyboard shared library
 Version: @VERSION@
-Requires: gmodule-export-2.0 gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@ dbus-1 >= @DBUS_REQUIRED@ dbus-glib-1 >= @DBUS_GLIB_REQUIRED@
+Requires: gmodule-export-2.0 gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@
 Libs: -L${libdir} -lgnomekbd
 Cflags: -I${includedir}
diff --git a/libgnomekbd/Makefile.am b/libgnomekbd/Makefile.am
index 45f2376..a45286e 100644
--- a/libgnomekbd/Makefile.am
+++ b/libgnomekbd/Makefile.am
@@ -3,7 +3,6 @@ lib_LTLIBRARIES = libgnomekbd.la libgnomekbdui.la
 common_CFLAGS = \
 	-I$(top_srcdir) -Wall 			\
 	$(GDK_CFLAGS)					\
-	$(DBUS_CFLAGS)					\
 	$(GCONF_CFLAGS)					\
 	$(LIBXKLAVIER_CFLAGS)				\
 	$(XLIB_CFLAGS)					\
@@ -22,7 +21,6 @@ libgnomekbdui_la_CFLAGS = $(common_CFLAGS)		\
 common_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
 
 common_LIBADD = \
-		$(DBUS_LIBS) \
 		$(GDK_LIBS) \
 		$(GCONF_LIBS) \
 		$(LIBXKLAVIER_LIBS) \