Import Debian version 1:1.2.8-7

diff --git a/debian/changelog b/debian/changelog
index 65dc6d37ec6247834d153c1d71cc73931b0ea0a8..a586a47c36c65e25f4e51c3aa35b47c465c8d0a7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+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@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
 nfs-utils (1:1.2.8-6) unstable; urgency=medium
 
   * Fix the sec=krb5* handling in debian/nfs-common.init to properly match

diff --git a/debian/control b/debian/control
index 021c5a6284fdda3e77d06ccde964c0c1fe6f290b..1e7ca24d8418629b2fed967bede717f2754da3c6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: standard
 Section: net
 Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
 Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Ben Hutchings <ben@decadent.org.uk>, Steve Langasek <vorlon@debian.org>
 Section: net
 Maintainer: Debian kernel team <debian-kernel@lists.debian.org>
 Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Ben Hutchings <ben@decadent.org.uk>, Steve Langasek <vorlon@debian.org>

-Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libgssglue-dev (>= 0.3), libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev, libdevmapper-dev, dh-autoreconf, libmount-dev, libsqlite3-dev
+Build-Depends: debhelper (>= 7), libwrap0-dev, libevent-dev, libnfsidmap-dev (>= 0.24), libkrb5-dev, libblkid-dev, libkeyutils-dev, pkg-config, libldap2-dev, libcap-dev, libtirpc-dev (>= 0.2.4-2~), libdevmapper-dev, dh-autoreconf, libmount-dev, libsqlite3-dev

 Standards-Version: 3.9.0
 Homepage: http://nfs.sourceforge.net/
 Vcs-Git: git://git.debian.org/kernel/nfs-utils.git
 Standards-Version: 3.9.0
 Homepage: http://nfs.sourceforge.net/
 Vcs-Git: git://git.debian.org/kernel/nfs-utils.git


@@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=kernel/nfs-utils.git
 Package: nfs-kernel-server
 Priority: optional
 Architecture: any
 Package: nfs-kernel-server
 Priority: optional
 Architecture: any

-Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (= ${binary:Version}), ucf, lsb-base (>= 1.3-9ubuntu3)
+Depends: ${shlibs:Depends}, ${misc:Depends}, nfs-common (= ${binary:Version}), ucf, lsb-base (>= 1.3-9ubuntu3), libtirpc1 (>= 0.2.4-2~)

 Provides: knfs, nfs-server
 Conflicts: knfs, nfs-server
 Replaces: knfs, nfs-server
 Provides: knfs, nfs-server
 Conflicts: knfs, nfs-server
 Replaces: knfs, nfs-server


@@ -32,7 +32,7 @@ Homepage: http://nfs.sourceforge.net/
 
 Package: nfs-common
 Architecture: any
 
 Package: nfs-common
 Architecture: any

-Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.88dsf-13.3)
+Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind (>= 0.2.1-5~), libtirpc1 (>= 0.2.4-2~), adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.88dsf-13.3)

 Recommends: python
 Suggests: open-iscsi, watchdog
 Provides: nfs-client
 Recommends: python
 Suggests: open-iscsi, watchdog
 Provides: nfs-client

diff --git a/debian/rules b/debian/rules
index 569c4160ac0e6edeca25530479a2cda48ac46883..5cff5ce2a0e59f66afb6d3230939b6a44be17085 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,6 @@ build-stamp:
                --enable-nfsv41 \
                --enable-ipv6 \
                --enable-libmount-mount \
                --enable-nfsv41 \
                --enable-ipv6 \
                --enable-libmount-mount \

-               --with-gssglue \

                --with-tcp-wrappers
        $(MAKE) $(MAKEFLAGS)
        touch build-stamp
                --with-tcp-wrappers
        $(MAKE) $(MAKEFLAGS)
        touch build-stamp

diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644 (file)
index 9b2845c..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1,3 +0,0 @@
-compression = "bzip2"
-compression-level = 9
-extend-diff-ignore = "(^|/)(config.sub|config.guess|Makefile.in|configure|config.log|aclocal.m4|ltmain.sh|aclocal/libtool.m4)$"