Install osd_login (part of the autologin feature). - Add open-iscsi and watchdog...

  - Install osd_login (part of the autologin feature).
    - Add open-iscsi and watchdog to Recommends.

diff --git a/debian/changelog b/debian/changelog
index 8b2050b827317cd42876a360827ed9ac4823e2bf..267c5756b959fff53c3a8b40e5226f52f3247e50 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ nfs-utils (1:1.2.6-1) UNRELEASED; urgency=low
   * New upstream version
     - Remove 18-dont-use-PAGE_SIZE.patch: merged upstream.
     - Update other patches.
+    - Install osd_login (part of the autologin feature).
+      - Add open-iscsi and watchdog to Recommends.
   * Check for blank exports file (Closes: #673798).
   * Add 18-osd_login-sbindir.patch to avoid FTBFS
 

diff --git a/debian/control b/debian/control
index 54c01fc1f60fc68e92af3914d1a7b6fcfc99a0a0..d1e92c8f0c1466bb980f70d1d9bc54b63c8656c2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Homepage: http://nfs.sourceforge.net/
 Package: nfs-common
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, rpcbind, adduser, ucf, lsb-base (>= 1.3-9ubuntu3), initscripts (>= 2.88dsf-13.3)
-Recommends: python
+Recommends: python, open-iscsi, watchdog
 Provides: nfs-client
 Conflicts: nfs-client
 Replaces: nfs-client, nfs-kernel-server (<< 1:1.2.5-4), mount (<< 2.13~)

diff --git a/debian/nfs-common.install b/debian/nfs-common.install
index c07045e2735d53492785e2683306870fa5033f36..ba58883ac9b0baba5a233801089d42e5f9746c3e 100644 (file)
--- a/debian/nfs-common.install
+++ b/debian/nfs-common.install
@@ -2,6 +2,7 @@ debian/tmp/sbin/mount.nfs
 debian/tmp/sbin/mount.nfs4
 debian/tmp/sbin/umount.nfs
 debian/tmp/sbin/umount.nfs4
+debian/tmp/sbin/osd_login
 debian/tmp/usr/sbin/blkmapd
 debian/tmp/usr/sbin/rpc.statd sbin/
 debian/tmp/usr/sbin/sm-notify sbin/