Merge branch 'master' into l20integration

2 files changed, 5 insertions, 5 deletions

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index b00993d0f..eeb048fb8 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -16,10 +16,10 @@ pcfiles = \
        gnunetgns.pc \
        gnunethello.pc \
        gnunetidentity.pc \
+       gnunetjson.pc \
        gnunetcadet.pc \
        gnunetmessenger.pc \
        gnunetmicrophone.pc \
-       gnunetmysql.pc \
        gnunetnamestore.pc \
        gnunetnat.pc \
        gnunetnse.pc \
@@ -59,10 +59,10 @@ EXTRA_DIST = \
        gnunetgns.pc.in \
        gnunethello.pc.in \
        gnunetidentity.pc.in \
+       gnunetjson.pc.in \
        gnunetcadet.pc.in \
        gnunetmessenger.pc.in \
        gnunetmicrophone.pc.in \
-       gnunetmysql.pc.in \
        gnunetnamestore.pc.in \
        gnunetnat.pc.in \
        gnunetnse.pc.in \
diff --git a/pkgconfig/gnunetmysql.pc.in b/pkgconfig/gnunetjson.pc.in
index a3d547f06..6dbf73b67 100644
--- a/pkgconfig/gnunetmysql.pc.in
+++ b/pkgconfig/gnunetjson.pc.in
@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: GNUnet MySQL
-Description: Provides API for common interactions with libmysqlclient
+Name: GNUnet JSON library
+Description: Library for JSON de/serialization
 URL: http://gnunet.org
 Version: @VERSION@
 Requires:
-Libs: -L${libdir} -lgnunetmysql
+Libs: -L${libdir} -lgnunetjson
 Cflags: -I${includedir}