From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 12 Dec 2016 19:56:30 +0000 (+0000)
Subject: Merge branch 'sid'
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=HEAD;hp=45e5820959ae49256747cae78f0d18d0ca61bb06

Merge branch 'sid'

Conflicts:
	debian/changelog
---

diff --git a/debian/changelog b/debian/changelog
index 51b9adb..805dfbe 100644
--- 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 af5c233..d5ffef7 100644
--- 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 482dbc9..7d5a1b5 100644
--- 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