about summary refs log tree commit diff
path: root/debian
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-03-01 17:59:12 +0100
committerMichael Biebl <biebl@debian.org>2016-03-01 17:59:14 +0100
commitad981ea4868554cd5df980abaad743dd2a2078b9 (patch)
tree52128879d213ee88de76623db6b2473d4b1bff16 /debian
parent6a034187a5999cf2e557c8e88b4d4fa49d001a6b (diff)
Ship /etc/NetworkManager/dnsmasq.d/ directory
which can be used to extend the dnsmasq local caching nameserver config.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/network-manager.dirs1
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 41c2176b..e3b535ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ network-manager (1.1.91-1) UNRELEASED; urgency=medium
   * New upstream release (1.2 beta2).
   * Rebase patches.
   * Update symbols file for libnm0.
+  * Ship /etc/NetworkManager/dnsmasq.d/ directory which can be used to extend
+    the dnsmasq local caching nameserver config.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 01 Mar 2016 16:56:21 +0100
 
diff --git a/debian/network-manager.dirs b/debian/network-manager.dirs
index 934e6231..40637cd3 100644
--- a/debian/network-manager.dirs
+++ b/debian/network-manager.dirs
@@ -1,4 +1,5 @@
 var/lib/NetworkManager/
 etc/NetworkManager/conf.d/
+etc/NetworkManager/dnsmasq.d/
 etc/NetworkManager/system-connections/
 etc/NetworkManager/VPN/