Fixed includes in public headers.

Updated and fixed the pkg-config file.

14 files changed, 26 insertions, 26 deletions

diff --git a/.gitignore b/.gitignore
index 53f23272..1ad42d18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,7 @@ version.xml
 .libs
 po/POTFILES
 config.status.lineno
-gdata.pc
+libgdata.pc
 gdata/gdata-marshal.c
 gdata/gdata-marshal.h
 gdata/gdata-enums.c
diff --git a/Makefile.am b/Makefile.am
index a17a4c8a..38fa689a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,6 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
 		 gnome-doc-utils.make gtk-doc.make
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gdata.pc
+pkgconfig_DATA = libgdata.pc
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc
diff --git a/configure.in b/configure.in
index c405be97..93cfd55c 100644
--- a/configure.in
+++ b/configure.in
@@ -69,7 +69,7 @@ GTK_DOC_CHECK(1.0)
 
 AC_OUTPUT([
 Makefile
-gdata.pc
+libgdata.pc
 gdata/Makefile
 gdata/services/Makefile
 gdata/services/calendar/Makefile
diff --git a/gdata/gdata-entry.h b/gdata/gdata-entry.h
index 2764774f..e1426e55 100644
--- a/gdata/gdata-entry.h
+++ b/gdata/gdata-entry.h
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 #include <libxml/parser.h>
 
-#include "gdata-atom.h"
+#include <gdata/gdata-atom.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdata/gdata-feed.h b/gdata/gdata-feed.h
index dee15ee1..db11cda3 100644
--- a/gdata/gdata-feed.h
+++ b/gdata/gdata-feed.h
@@ -23,8 +23,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "gdata-entry.h"
-#include "gdata-atom.h"
+#include <gdata/gdata-entry.h>
+#include <gdata/gdata-atom.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdata/gdata-private.h b/gdata/gdata-private.h
index 93fa99dc..16c85278 100644
--- a/gdata/gdata-private.h
+++ b/gdata/gdata-private.h
@@ -20,7 +20,7 @@
 #include <glib.h>
 #include <libxml/parser.h>
 
-#include "gdata-service.h"
+#include <gdata/gdata-service.h>
 
 #ifndef GDATA_PRIVATE_H
 #define GDATA_PRIVATE_H
diff --git a/gdata/gdata-service.h b/gdata/gdata-service.h
index b889a7a8..5019bf2e 100644
--- a/gdata/gdata-service.h
+++ b/gdata/gdata-service.h
@@ -25,7 +25,7 @@
 #include <libsoup/soup.h>
 #include <libxml/parser.h>
 
-#include "gdata-feed.h"
+#include <gdata/gdata-feed.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdata/services/calendar/gdata-calendar-calendar.h b/gdata/services/calendar/gdata-calendar-calendar.h
index 18ac4238..395d94db 100644
--- a/gdata/services/calendar/gdata-calendar-calendar.h
+++ b/gdata/services/calendar/gdata-calendar-calendar.h
@@ -23,9 +23,9 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "gdata-entry.h"
-#include "gdata-gdata.h"
-#include "gdata-types.h"
+#include <gdata/gdata-entry.h>
+#include <gdata/gdata-gdata.h>
+#include <gdata/gdata-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdata/services/calendar/gdata-calendar-event.h b/gdata/services/calendar/gdata-calendar-event.h
index 78b96715..9f3f06aa 100644
--- a/gdata/services/calendar/gdata-calendar-event.h
+++ b/gdata/services/calendar/gdata-calendar-event.h
@@ -23,9 +23,9 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "gdata-entry.h"
-#include "gdata-gdata.h"
-#include "gdata-types.h"
+#include <gdata/gdata-entry.h>
+#include <gdata/gdata-gdata.h>
+#include <gdata/gdata-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdata/services/calendar/gdata-calendar-query.h b/gdata/services/calendar/gdata-calendar-query.h
index b8c941e6..d28c2354 100644
--- a/gdata/services/calendar/gdata-calendar-query.h
+++ b/gdata/services/calendar/gdata-calendar-query.h
@@ -23,9 +23,9 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "gdata-query.h"
-#include "gdata-calendar-service.h"
-#include "gdata-types.h"
+#include <gdata/gdata-query.h>
+#include <gdata/services/calendar/gdata-calendar-service.h>
+#include <gdata/gdata-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdata/services/calendar/gdata-calendar-service.h b/gdata/services/calendar/gdata-calendar-service.h
index 21bba50c..c2191128 100644
--- a/gdata/services/calendar/gdata-calendar-service.h
+++ b/gdata/services/calendar/gdata-calendar-service.h
@@ -23,8 +23,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "gdata-service.h"
-#include "gdata-calendar-calendar.h"
+#include <gdata/gdata-service.h>
+#include <gdata/services/calendar/gdata-calendar-calendar.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdata/services/youtube/gdata-youtube-service.h b/gdata/services/youtube/gdata-youtube-service.h
index e1f44bfa..3cb3e70c 100644
--- a/gdata/services/youtube/gdata-youtube-service.h
+++ b/gdata/services/youtube/gdata-youtube-service.h
@@ -24,8 +24,8 @@
 #include <glib-object.h>
 #include <libsoup/soup.h>
 
-#include "gdata-service.h"
-#include "gdata-youtube-video.h"
+#include <gdata/gdata-service.h>
+#include <gdata/services/youtube/gdata-youtube-video.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdata/services/youtube/gdata-youtube-video.h b/gdata/services/youtube/gdata-youtube-video.h
index 33378551..28a086b0 100644
--- a/gdata/services/youtube/gdata-youtube-video.h
+++ b/gdata/services/youtube/gdata-youtube-video.h
@@ -23,9 +23,9 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include "gdata-entry.h"
-#include "gdata-gdata.h"
-#include "gdata-media-rss.h"
+#include <gdata/gdata-entry.h>
+#include <gdata/gdata-gdata.h>
+#include <gdata/gdata-media-rss.h>
 
 G_BEGIN_DECLS
 
diff --git a/gdata.pc.in b/libgdata.pc.in
index 0e3b4c7a..1ffb6284 100644
--- a/gdata.pc.in
+++ b/libgdata.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: gdata
+Name: libgdata
 Description: GData client library
 Version: @VERSION@
-Requires: soup-2.4 libxml-2.0
+Requires: libsoup-2.4 libxml-2.0
 Libs: -L${libdir} -lgdata
 Cflags: -I${includedir}/libgdata