Merge lp:~ted/whoopsie/ftbfs-network-manager into lp:whoopsie

[Ted Gould]

* Ensure that Whoopsie picks up NetworkManager include paths to fix build
* Add dependency in dev package to gcrypt which is needed

Fixin' the Whoopsie!

[Martin Pitt (pitti)]

This looks inconsistent:

 - whoopsie currently depends on network-manager-dev, which is (only) needed for compiling NM plugins such as VPN. I don't think that whoopsie actually needs that.
 - Your Makefile now adds a dependency to libnm-glib which does not get reflected in the Build-Depends. Note that network-manager-dev does *not* pull in libnm-glib-dev (and should not).
 - Why does this add a dep to libgcrypt20-dev? This seems completely unrelated; if libnm-glib-dev needs the gcrypt headers, that should depend on them, not libwhoopsie-dev. If this is necessary for an unrelated reason, then the commit log should explain.

Thanks!

review: Needs Fixing

[lp:~ted/whoopsie/ftbfs-network-manager]

680. By Ted Gould on 2016-05-11

Switch from libnm-glib to NetworkManager

[Ted Gould (ted)]

On Wed, 2016-05-11 at 06:13 +0000, Martin Pitt wrote:
> - whoopsie currently depends on network-manager-dev, which is (only)
> needed for compiling NM plugins such as VPN. I don't think that
> whoopsie actually needs that. - Your Makefile now adds a dependency
> to libnm-glib which does not get reflected in the Build-Depends. Note
> that network-manager-dev does *not* pull in libnm-glib-dev (and
> should not).
My goal here wasn't to fix Whoopsie :-)  Whoopsie uses the NM headers
to get a bunch of #defines for checking connectivity. I think it should
really probably just use the lib. But eh. Switched to the
NetworkManager.pc which is in that package but sets up the includes
correctly.
> - Why does this add a dep to libgcrypt20-dev? This seems completely
> unrelated; if libnm-glib-dev needs the gcrypt headers, that should
> depend on them, not libwhoopsie-dev. If this is necessary for an
> unrelated reason, then the commit log should explain.
It turns out the pkgconfig file for libwhoopsie does a "-lgcrypt" which
makes it break if you just pull it whoopsie and aren't using gcrypt.
Adding to description.

[Martin Pitt (pitti)]

Thanks! This looks good and consistent now. Merging/uploading to yakkety.

review: Approve

=== modified file 'Makefile'
--- Makefile	2016-01-28 15:53:25 +0000
+++ Makefile	2016-05-11 14:24:43 +0000
@@ -10,7 +10,7 @@
 				 $(shell libgcrypt-config --libs) \
 				 $(LDFLAGS)
 
-whoopsie_CFLAGS=$(shell pkg-config --cflags gio-2.0 glib-2.0 libcurl) \
+whoopsie_CFLAGS=$(shell pkg-config --cflags gio-2.0 glib-2.0 libcurl NetworkManager) \
 	   $(shell libgcrypt-config --cflags) \
 	   -g -Ilib -Wall -Werror -Os -DVERSION=\"$(VERSION)\" -fPIC \
 	   $(CFLAGS) $(CPPFLAGS)

=== modified file 'debian/control'
--- debian/control	2016-03-17 21:13:58 +0000
+++ debian/control	2016-05-11 14:24:43 +0000
@@ -42,7 +42,7 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libwhoopsie0 (= ${binary:Version}), ${misc:Depends}
+Depends: libwhoopsie0 (= ${binary:Version}), ${misc:Depends}, libgcrypt20-dev
 Description: Ubuntu error tracker submission - library development files
  This library provides methods to generate an identifier for use with the
  Ubuntu error tracker