aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-12-08 09:28:35 -0600
committerTed Gould <ted@gould.cx>2010-12-08 09:28:35 -0600
commitd3278d7ab921ef971a02da4ce7bc005bcadac2b6 (patch)
treeb46a3da03dcbd2c75ff07ee85f0497fd5b7eb80b
parent59eb3099efa8d7d8f4be86a626a79da16a5c2899 (diff)
parent1a73825600508b5d7f027641b05a682a8ac81f5e (diff)
downloadlibdbusmenu-d3278d7ab921ef971a02da4ce7bc005bcadac2b6.tar.gz
libdbusmenu-d3278d7ab921ef971a02da4ce7bc005bcadac2b6.tar.bz2
libdbusmenu-d3278d7ab921ef971a02da4ce7bc005bcadac2b6.zip
* Upstream Merge
* Fixing the pc files
-rw-r--r--debian/changelog7
-rw-r--r--libdbusmenu-glib/dbusmenu-glib-0.4.pc.in2
-rw-r--r--libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in2
-rw-r--r--libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in2
-rw-r--r--tests/dbusmenu-jsonloader-0.4.pc.in2
5 files changed, 11 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index e25b513..b22d110 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus2) UNRELEASED; urgency=low
+
+ * Upstream Merge
+ * Fixing the pc files
+
+ -- Ted Gould <ted@ubuntu.com> Wed, 08 Dec 2010 09:28:08 -0600
+
libdbusmenu (0.3.90-0ubuntu2~ppa1~gdbus1) natty; urgency=low
* Upstream Merge
diff --git a/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in b/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in
index 3f31664..31a1eac 100644
--- a/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in
+++ b/libdbusmenu-glib/dbusmenu-glib-0.4.pc.in
@@ -5,7 +5,7 @@ bindir=@bindir@
includedir=@includedir@
Cflags: -I${includedir}/libdbusmenu-0.4
-Requires: dbus-glib-1
+Requires:
Libs: -L${libdir} -ldbusmenu-glib
Name: libdbusmenu-glib
diff --git a/libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in b/libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in
index f35c621..8784556 100644
--- a/libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in
+++ b/libdbusmenu-gtk/dbusmenu-gtk-0.4.pc.in
@@ -5,7 +5,7 @@ bindir=@bindir@
includedir=@includedir@
Cflags: -I${includedir}/libdbusmenu-0.4
-Requires: dbus-glib-1 dbusmenu-glib
+Requires: dbusmenu-glib-0.4
Libs: -L${libdir} -ldbusmenu-gtk
Name: libdbusmenu-gtk
diff --git a/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in b/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in
index 033c390..804b13e 100644
--- a/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in
+++ b/libdbusmenu-gtk/dbusmenu-gtk3-0.4.pc.in
@@ -5,7 +5,7 @@ bindir=@bindir@
includedir=@includedir@
Cflags: -I${includedir}/libdbusmenu-0.4
-Requires: dbus-glib-1 dbusmenu-glib
+Requires: dbusmenu-glib-0.4
Libs: -L${libdir} -ldbusmenu-gtk3
Name: libdbusmenu-gtk3
diff --git a/tests/dbusmenu-jsonloader-0.4.pc.in b/tests/dbusmenu-jsonloader-0.4.pc.in
index d042132..62bfeb2 100644
--- a/tests/dbusmenu-jsonloader-0.4.pc.in
+++ b/tests/dbusmenu-jsonloader-0.4.pc.in
@@ -5,7 +5,7 @@ bindir=@bindir@
includedir=@includedir@
Cflags: -I${includedir}/libdbusmenu-0.1
-Requires: dbus-glib-1,dbusmenu-glib,json-glib-1.0
+Requires: dbusmenu-glib-0.4 json-glib-1.0
Libs: -L${libdir} -ldbusmenu-jsonloader
Name: libdbusmenu-jsonloader