Whoopsie

Merge lp:~seb128/whoopsie/nm-build-fix into lp:whoopsie

  1. nm-build-fix
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 704
Proposed branch: lp:~seb128/whoopsie/nm-build-fix
Merge into: lp:whoopsie
Diff against target: 37 lines (+3/-3)
3 files modified
Makefile (+1/-1)
debian/control (+1/-1)
src/connectivity.c (+1/-1)
To merge this branch: bzr merge lp:~seb128/whoopsie/nm-build-fix
Reviewer Review Type Date Requested Status
Daisy Pluckers Pending
Review via email: mp+369536@code.launchpad.net

Commit message

Don't use deprecated n-m components

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2016-05-11 13:59:42 +0000
3+++ Makefile 2019-07-01 16:28:36 +0000
4@@ -10,7 +10,7 @@
5 $(shell libgcrypt-config --libs) \
6 $(LDFLAGS)
7
8-whoopsie_CFLAGS=$(shell pkg-config --cflags gio-2.0 glib-2.0 libcurl NetworkManager) \
9+whoopsie_CFLAGS=$(shell pkg-config --cflags gio-2.0 glib-2.0 libcurl libnm) \
10 $(shell libgcrypt-config --cflags) \
11 -g -Ilib -Wall -Werror -Os -DVERSION=\"$(VERSION)\" -fPIC \
12 $(CFLAGS) $(CPPFLAGS)
13
14=== modified file 'debian/control'
15--- debian/control 2018-04-06 17:48:29 +0000
16+++ debian/control 2019-07-01 16:28:36 +0000
17@@ -9,7 +9,7 @@
18 libgcrypt20-dev,
19 libcap-dev,
20 libgtk-3-dev,
21- network-manager-dev (>= 0.9.4.0-0ubuntu1),
22+ libnm-dev,
23 python3,
24 pyflakes3
25 Standards-Version: 3.9.6
26
27=== modified file 'src/connectivity.c'
28--- src/connectivity.c 2017-07-17 20:03:30 +0000
29+++ src/connectivity.c 2019-07-01 16:28:36 +0000
30@@ -21,7 +21,7 @@
31 #include <stdlib.h>
32 #include <gio/gio.h>
33 #include <glib.h>
34-#include <NetworkManager/NetworkManager.h>
35+#include <libnm/NetworkManager.h>
36 #include "connectivity.h"
37 #include "logging.h"
38

Subscribers

People subscribed via source and target branches

to status/vote changes: