Merge branch 'sid'

Merge the uploaded changes and update the version for the open changelog entry.

diff --git a/debian/changelog b/debian/changelog
index c00a73597c0c8b4545b38272497b17e61de4fdf3..618d70d266de866ebaed1a1fad1a13fd1fc51567 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+nfs-utils (1:1.2.8-10) UNRELEASED; urgency=medium
+
+  * Update debian/watch
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 23 Mar 2015 16:33:59 +0000
+
 nfs-utils (1:1.2.8-9) unstable; urgency=medium
 
   * debian/patches/22-mountd-fix-segfault-in-add_name-with-newer-gcc-

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