Merge branch 'sid'

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 51b9adb294874fe316b2dd2ba84906944b731d68..805dfbebcf3483c853f9a6e530ebd68d311b4e8b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nfs-utils (1:1.2.8-10) UNRELEASED; urgency=medium
+
+  [ Ben Hutchings ]
+  * Update debian/watch
+
+  [ Salvatore Bonaccorso ]
+  * Fix typo in comment for installed idmapd.conf.
+    Thanks to Ferenc Wágner (Closes: #841387)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 23 Mar 2015 16:33:59 +0000
+
 nfs-utils (1:1.2.8-9.2) unstable; urgency=medium
 
   * Non-maintainer upload.
@@ -76,6 +87,7 @@ nfs-utils (1:1.2.8-9.1) unstable; urgency=medium
   * Drop obsolete versioned initscripts dependency. (Closes: #804990)
 
  -- Andreas Henriksson <andreas@fatal.se>  Tue, 28 Jun 2016 02:05:16 +0200
+>>>>>>> sid
 
 nfs-utils (1:1.2.8-9) unstable; urgency=medium
 

diff --git a/debian/idmapd.conf b/debian/idmapd.conf
index af5c233350f47c9ba8970caf6ce33776a1b2e4da..d5ffef7ef3cdab7a56a3c0e94db090b07b70ff05 100644 (file)
--- a/debian/idmapd.conf
+++ b/debian/idmapd.conf
@@ -2,7 +2,7 @@
 
 Verbosity = 0
 Pipefs-Directory = /run/rpc_pipefs
-# set your own domain here, if id differs from FQDN minus hostname
+# set your own domain here, if it differs from FQDN minus hostname
 # Domain = localdomain
 
 [Mapping]

diff --git a/debian/watch b/debian/watch
index 482dbc9e0412b183d66a4fa2dd08775990c2e8a4..7d5a1b5a8167772a8bada6a504f3a42f8626e968 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://www.kernel.org/pub/linux/utils/nfs/nfs-utils-([\.\d]+).tar.bz2
+https://www.kernel.org/pub/linux/utils/nfs-utils/([\.\d]+)/nfs-utils-([\.\d]+).tar.xz