summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2015-01-23 21:21:24 +0100
committerMichael Biebl <biebl@debian.org>2015-01-23 22:03:51 +0100
commit9af85cda488278d5c9bfa71ba58292618858de8b (patch)
tree4f931c2fe891383c24bd290bc6f64baf8957928f
parent2612d7d6f6d1386139efab2d63a8e22543659d31 (diff)
Fix incorrect dependencies in libnm.pc.
-rw-r--r--debian/changelog1
-rw-r--r--debian/control3
-rw-r--r--debian/patches/0008-Fix-dependencies-in-libnm.pc.patch23
-rw-r--r--debian/patches/series1
4 files changed, 26 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 61552afdf..1c4fbf318 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ network-manager (1.0.0-1) UNRELEASED; urgency=medium
* Add libnm0 and libnm-dev packages for libnm, a new GObject-based client
library for NetworkManager which is supposed to replace libnm-util and
libnm-glib.
+ * Fix incorrect dependencies in libnm.pc.
-- Michael Biebl <biebl@debian.org> Thu, 22 Jan 2015 00:30:26 +0100
diff --git a/debian/control b/debian/control
index e39102920..390e1328c 100644
--- a/debian/control
+++ b/debian/control
@@ -231,8 +231,7 @@ Architecture: linux-any
Multi-Arch: same
Depends: ${misc:Depends},
gir1.2-networkmanager-1.0 (= ${binary:Version}),
- libglib2.0-dev,
- libdbus-glib-1-dev
+ libglib2.0-dev
Description: GObject-based client library for NetworkManager (development files)
NetworkManager is a system network service that manages your network devices
and connections, attempting to keep active network connectivity when
diff --git a/debian/patches/0008-Fix-dependencies-in-libnm.pc.patch b/debian/patches/0008-Fix-dependencies-in-libnm.pc.patch
new file mode 100644
index 000000000..8c7b0aa7e
--- /dev/null
+++ b/debian/patches/0008-Fix-dependencies-in-libnm.pc.patch
@@ -0,0 +1,23 @@
+From: Michael Biebl <biebl@debian.org>
+Date: Fri, 23 Jan 2015 21:19:55 +0100
+Subject: Fix dependencies in libnm.pc
+
+The new libnm library doesn't use libdbus-glib, so drop that from
+Requires.
+---
+ libnm/libnm.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libnm/libnm.pc.in b/libnm/libnm.pc.in
+index 6392799..5fe26b6 100644
+--- a/libnm/libnm.pc.in
++++ b/libnm/libnm.pc.in
+@@ -6,7 +6,7 @@ includedir=@includedir@
+ Name: libnm
+ Description: Convenience library for clients of NetworkManager
+ Version: @VERSION@
+-Requires: gio-2.0 dbus-glib-1
++Requires: gio-2.0
+ Cflags: -I${includedir}/libnm
+ Libs: -L${libdir} -lnm
+
diff --git a/debian/patches/series b/debian/patches/series
index 3cd40cf4d..5e7d55be9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0005-Mark-virtual-ethernet-interfaces-as-unmanaged.patch
0006-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch
0007-fix-arping-path.patch
+0008-Fix-dependencies-in-libnm.pc.patch