diff options
| author | Dan Williams <dcbw@redhat.com> | 2008-03-04 21:59:24 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2008-03-04 21:59:24 +0000 |
| commit | 529a246913b2782290118a3b5f3ab3d8e5b7e004 (patch) | |
| tree | 8520bef4eed485685f7a7208047e3b19d94014bf | |
| parent | 4c8da03410d9b7aa04ce2ebf910f51a2c50a291a (diff) | |
| download | NetworkManager-529a246913b2782290118a3b5f3ab3d8e5b7e004.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | NetworkManager.pc.in | 2 | ||||
| -rw-r--r-- | libnm-glib/libnm_glib.pc.in | 2 | ||||
| -rw-r--r-- | libnm-util/nm-utils.h | 1 |
4 files changed, 15 insertions, 3 deletions
@@ -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 33694613d4..01bcdf36f3 100644 --- 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 04b623efc9..100126408c 100644 --- 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 c85057d348..4f3f728f4e 100644 --- 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" |