[nfs-utils] 04/04: Merge branch 'sid'

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository nfs-utils.

commit e91a83f4642143f9506c929faaba99e41d835c76
Merge: 5e8078a 25546ca
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Mar 11 04:06:00 2016 +0000

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

 debian/changelog                                   | 30 ++++++++++-
 debian/control                                     |  6 +--
 ...segfault-in-add_name-with-newer-gcc-compi.patch | 63 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  1 -
 5 files changed, 96 insertions(+), 5 deletions(-)

diff --cc debian/changelog
index 812d78f,c00a735..618d70d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,31 +1,37 @@@
- nfs-utils (1:1.2.8-7) UNRELEASED; urgency=medium
++nfs-utils (1:1.2.8-10) UNRELEASED; urgency=medium
 +
 +  * Update debian/watch
 +
 + -- Ben Hutchings <ben at 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-
+     compi.patch: cherry-pick fix from upstream for a segfault in 
+     add_name with newer gcc compilers.  Closes: #757835, LP: #1355829.
+ 
+  -- Steve Langasek <vorlon at debian.org>  Tue, 12 Aug 2014 17:12:38 -0700
+ 
+ nfs-utils (1:1.2.8-8) unstable; urgency=medium
+ 
+   * Upload to unstable where this belongs.
+   * libtirpc versioning against 0.2.4, not 0.2.4-2.
+   * Drop versioned dependency on rpcbind; nothing in the rpcbind relationship
+     requires this.
+ 
+  -- Steve Langasek <vorlon at debian.org>  Mon, 11 Aug 2014 00:20:32 -0700
+ 
+ nfs-utils (1:1.2.8-7) experimental; urgency=medium
+ 
+   * Get rid of libgssglue1.
+     Don't pass "--with-gssglue" to ./configure.
+     Build-depend on libtirpc-dev (>= 0.2.4-2~).
+     Depend on libtirpc1 (>= 0.2.4-2~).
+     Depend on rpcbind (>= 0.2.1-5~).
+   * Remove debian/source/options.
+ 
+  -- Anibal Monsalve Salazar <anibal at debian.org>  Sat, 02 Aug 2014 12:25:47 +0100
+ 
  nfs-utils (1:1.2.8-6) unstable; urgency=medium
  
    * Fix the sec=krb5* handling in debian/nfs-common.init to properly match

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/nfs-utils.git