[Pkg-utopia-maintainers] Bug#882968: network-manager: Build with support for dhcpcanon

[ju xor]

Package: network-manager
Version: 1.10.0-1
Severity: wishlist
Tags: patch

Dear Maintainer,

It would be great to revert support for dhcpcanon [1], as it is not used anyway unless manually added in the configuration. That way it would be easier to test it and eventually not be experimental.
It was requested to be marked as experimental for the Fedora build [2], it doesn't have to be the same in Debian, unless there're reasons for it.

Thanks.


[1] https://anonscm.debian.org/git/pkg-utopia/network-manager.git/commit/?id=5f0d2fd81ab4bf574dba5046cd92dc7107acfeb8
[2] https://github.com/NetworkManager/NetworkManager/pull/31#issuecomment-337881457
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 66bcc12f..54fa99b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-network-manager (1.10.0-1.1) UNRELEASED; urgency=medium
-
-  * Non-maintainer upload.
-  * add support for dhcpcanon
-
- -- ju xor <ju at riseup.net>  Fri, 24 Nov 2017 10:04:26 +0000
-
 network-manager (1.10.0-1) unstable; urgency=medium
 
   * New upstream version 1.10.0
diff --git a/debian/control b/debian/control
index f92180a9..0913ff66 100644
--- a/debian/control
+++ b/debian/control
@@ -64,7 +64,6 @@ Depends: ${shlibs:Depends},
          libpam-systemd,
          policykit-1
 Recommends: ppp,
-            dhcpcanon,
             dnsmasq-base,
             iptables,
             modemmanager,
diff --git a/debian/rules b/debian/rules
index 0675f950..a224a16a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ override_dh_auto_configure:
 		--with-nmcli \
 		--with-selinux \
 		--with-libaudit \
-		--with_dhcpcanon=/sbin/dhcpcanon \
+		--without-dhcpcanon \
 		--enable-polkit \
 		--enable-polkit-agent \
 		--enable-ppp \