2008-03-04 Dan Williams <dcbw@redhat.com>

	Patch from Michael Biebl <biebl@debian.org>

	* NetworkManager.pc.in
		- doesn't actually depend on dbus-1

	* libnm-util/nm-utils.h
		- remove unused #include <dbus/dbus.h>

	* libnm-glib/libnm_glib.pc.in
		- depends on glib and dbus-glib

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3374 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

diff --git a/ChangeLog b/ChangeLog
index f8f9dc6..55c48b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-03-04  Dan Williams  <dcbw@redhat.com>
+
+       Patch from Michael Biebl <biebl@debian.org>
+
+       * NetworkManager.pc.in
+               - doesn't actually depend on dbus-1
+
+       * libnm-util/nm-utils.h
+               - remove unused #include <dbus/dbus.h>
+
+       * libnm-glib/libnm_glib.pc.in
+               - depends on glib and dbus-glib
+
 2008-03-02  Dan Williams  <dcbw@redhat.com>
 
        * src/NetworkManagerPolicy.c

diff --git a/NetworkManager.pc.in b/NetworkManager.pc.in
index 3369461..01bcdf3 100644 (file)
--- a/NetworkManager.pc.in
+++ b/NetworkManager.pc.in
@@ -6,6 +6,6 @@ libgnome_serverdir=@libexecdir@
 
 Name: NetworkManager
 Description: System for maintaining active network connection
-Requires: dbus-1
+Requires:
 Version: @VERSION@
 Cflags: -I${includedir}/NetworkManager

diff --git a/libnm-glib/libnm_glib.pc.in b/libnm-glib/libnm_glib.pc.in
index 04b623e..1001264 100644 (file)
--- a/libnm-glib/libnm_glib.pc.in
+++ b/libnm-glib/libnm_glib.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
 Name: libnm_glib
 Description: Convenience library for clients of NetworkManager
 Version: @VERSION@
-Requires: NetworkManager >= 0.7.0 
+Requires: NetworkManager >= 0.7.0 glib-2.0 dbus-glib-1
 Cflags: -I${includedir}/libnm-glib
 Libs: -L${libdir} -lnm_glib
 

diff --git a/libnm-util/nm-utils.h b/libnm-util/nm-utils.h
index c85057d..4f3f728 100644 (file)
--- a/libnm-util/nm-utils.h
+++ b/libnm-util/nm-utils.h
@@ -25,7 +25,6 @@
 
 #include <glib.h>
 #include <execinfo.h>
-#include <dbus/dbus.h>
 
 #include "nm-connection.h"