diff -Nru plotnetcfg-0.4.1/debian/changelog plotnetcfg-0.4.1/debian/changelog --- plotnetcfg-0.4.1/debian/changelog 2018-05-16 23:12:20.000000000 +0000 +++ plotnetcfg-0.4.1/debian/changelog 2019-09-06 20:44:12.000000000 +0000 @@ -1,3 +1,14 @@ +plotnetcfg (0.4.1-4) unstable; urgency=medium + + * Fix the build to allow cross-building. Thanks to Helmut Grohne for the + patch! Closes: #939611. + * Set “Rules-Requires-Root: no”. + * Switch to debhelper compatibility level 12. + * Fix a spelling mistake flagged by Lintian. + * Standards-Version 4.4.0, no further change required. + + -- Stephen Kitt Fri, 06 Sep 2019 22:44:12 +0200 + plotnetcfg (0.4.1-3) unstable; urgency=medium * Migrate to Salsa. diff -Nru plotnetcfg-0.4.1/debian/compat plotnetcfg-0.4.1/debian/compat --- plotnetcfg-0.4.1/debian/compat 2018-05-15 13:32:07.000000000 +0000 +++ plotnetcfg-0.4.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru plotnetcfg-0.4.1/debian/control plotnetcfg-0.4.1/debian/control --- plotnetcfg-0.4.1/debian/control 2018-05-16 23:11:51.000000000 +0000 +++ plotnetcfg-0.4.1/debian/control 2019-09-06 20:42:45.000000000 +0000 @@ -2,13 +2,14 @@ Maintainer: Stephen Kitt Section: net Priority: optional -Build-Depends: debhelper (>= 11~), +Build-Depends: debhelper-compat (= 12), libjansson-dev, pkg-config -Standards-Version: 4.1.4 +Standards-Version: 4.4.0 Vcs-Browser: https://salsa.debian.org/debian/plotnetcfg Vcs-Git: https://salsa.debian.org/debian/plotnetcfg.git Homepage: https://github.com/jbenc/plotnetcfg +Rules-Requires-Root: no Package: plotnetcfg Architecture: linux-any diff -Nru plotnetcfg-0.4.1/debian/patches/cross.patch plotnetcfg-0.4.1/debian/patches/cross.patch --- plotnetcfg-0.4.1/debian/patches/cross.patch 1970-01-01 00:00:00.000000000 +0000 +++ plotnetcfg-0.4.1/debian/patches/cross.patch 2019-09-06 20:39:21.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Allow overriding pkg-config and gcc +Author: Helmut Grohne +Bug-Debian: https://bugs.debian.org/939611 + +This allows the package to be cross-built. + +--- plotnetcfg-0.4.1.orig/Makefile ++++ plotnetcfg-0.4.1/Makefile +@@ -1,5 +1,6 @@ ++PKG_CONFIG?=pkg-config + ifeq ($(jansson),) +-libs=$(shell pkg-config --libs jansson) ++libs=$(shell $(PKG_CONFIG) --libs jansson) + else + libs=$(jansson)/src/.libs/libjansson.a + INCLUDE=-I$(jansson)/src +@@ -13,7 +14,7 @@ + handlers/bridge.o handlers/master.o handlers/openvswitch.o handlers/veth.o \ + handlers/vlan.o \ + frontends/dot.o frontends/json.o +- gcc $(LDFLAGS) -o $@ $+ $(libs) ++ $(CC) $(LDFLAGS) -o $@ $+ $(libs) + + args.o: args.c args.h + ethtool.o: ethtool.c ethtool.h diff -Nru plotnetcfg-0.4.1/debian/patches/series plotnetcfg-0.4.1/debian/patches/series --- plotnetcfg-0.4.1/debian/patches/series 2015-09-20 17:42:59.000000000 +0000 +++ plotnetcfg-0.4.1/debian/patches/series 2019-09-06 20:41:29.000000000 +0000 @@ -1 +1,3 @@ use-flags.patch +cross.patch +spelling.patch diff -Nru plotnetcfg-0.4.1/debian/patches/spelling.patch plotnetcfg-0.4.1/debian/patches/spelling.patch --- plotnetcfg-0.4.1/debian/patches/spelling.patch 1970-01-01 00:00:00.000000000 +0000 +++ plotnetcfg-0.4.1/debian/patches/spelling.patch 2019-09-06 20:42:00.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Spelling fixes +Author: Stephen Kitt + +--- a/plotnetcfg-json.5 ++++ b/plotnetcfg-json.5 +@@ -177,7 +177,7 @@ + peer + .I (object) + If present, the peer address corresponding to this address. It's of the +-address object type but cannot contain futher peer field. ++address object type but cannot contain further peer field. + + .SH SEE ALSO + .BR plotnetcfg (8)