[PATCHES] pkgconfig files cleanup

[Michael Biebl <biebl debian org>]

Hi,

today I've taken a look a the pkgconfig files of NM 0.6 and 0.7,
specifically the Requires lines, and I noticed what I think are errors.
Patches for trunk and 0.6 branch are attached. See also man pkg-config.

For libnm-(glib,util), I interpreted Requires as "package that must be
installed to successfully compile a test program using this lib" (1)

0.7:
libnm-glib/libnm_glib.pc.in
The installed header files (libnm-glib/*.h) include glib and dbus-glib
headers
  -> added glib-2.0 and dbus-glib-1

libnm-util/nm-utils.h includes dbus/dbus.h
Either remove this include or add dbus-1 to libnm-utils.pc.in. As it
compiles fine withoug dbus/dbus.h, I chose the former.

NetworkManager.pc.in
The installed header files (includes/*.h) do not include any dbus headers
  -> Remove dbus-1
Note: I know that NetworkManager.pc does not really represent a library,
and this metadata could have a different purpose. If so, please clarify
that.

0.6:
NetworkManager.pc.in
The installed header files (include/*) do not include any dbus or
libnm-utils   headers
  -> Remove dbus-1 libnm-util
See my note above.

gnome/libnm_glib/libnm_glib.pc.in
The installed header files do not include any dbus for dbus-glib headers
  -> Remove dbus-1 dbus-glib1

Note: I omitted nm-vpn-ui-interface.h deliberatly, to not include any
gtk deps.

libnm-util/libnm-util.pc.in
The installed header files include dbus headers, not glib
  -> Replace glib-2.0 with dbus-1



Please review and apply


Michael

-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?

Index: NetworkManager.pc.in
===================================================================
--- NetworkManager.pc.in	(Revision 3372)
+++ NetworkManager.pc.in	(Arbeitskopie)
@@ -6,6 +6,6 @@
 
 Name: NetworkManager
 Description: System for maintaining active network connection
-Requires: dbus-1 libnm-util
+Requires:
 Version: @VERSION@
 Cflags: -I${includedir}/NetworkManager
Index: gnome/libnm_glib/libnm_glib.pc.in
===================================================================
--- gnome/libnm_glib/libnm_glib.pc.in	(Revision 3372)
+++ gnome/libnm_glib/libnm_glib.pc.in	(Arbeitskopie)
@@ -6,7 +6,7 @@
 Name: libnm_glib
 Description: Client library for determining network connection properties from NetworkManager, using glib
 Version: @VERSION@
-Requires: dbus-1 glib-2.0 dbus-glib-1
+Requires: glib-2.0
 Cflags: -DDBUS_API_SUBJECT_TO_CHANGE -I${includedir}/NetworkManager
 Libs: -L${libdir} -lnm_glib
 
Index: libnm-util/libnm-util.pc.in
===================================================================
--- libnm-util/libnm-util.pc.in	(Revision 3372)
+++ libnm-util/libnm-util.pc.in	(Arbeitskopie)
@@ -6,7 +6,7 @@
 Name: libnm_util
 Description: Convenience library for clients of NetworkManager
 Version: @VERSION@
-Requires: glib-2.0
+Requires: dbus-1
 Cflags: -I${includedir}/NetworkManager
 Libs: -L${libdir} -lnm-util
 

Index: NetworkManager.pc.in
===================================================================
--- NetworkManager.pc.in	(Revision 3372)
+++ NetworkManager.pc.in	(Arbeitskopie)
@@ -6,6 +6,6 @@
 
 Name: NetworkManager
 Description: System for maintaining active network connection
-Requires: dbus-1
+Requires:
 Version: @VERSION@
 Cflags: -I${includedir}/NetworkManager
Index: libnm-util/nm-utils.h
===================================================================
--- libnm-util/nm-utils.h	(Revision 3372)
+++ libnm-util/nm-utils.h	(Arbeitskopie)
@@ -25,7 +25,6 @@
 
 #include <glib.h>
 #include <execinfo.h>
-#include <dbus/dbus.h>
 
 #include "nm-connection.h"
 
Index: libnm-glib/libnm_glib.pc.in
===================================================================
--- libnm-glib/libnm_glib.pc.in	(Revision 3372)
+++ libnm-glib/libnm_glib.pc.in	(Arbeitskopie)
@@ -6,7 +6,7 @@
 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

Attachment: signature.asc
Description: OpenPGP digital signature