From 5af2f5885d1152218ffa81995e6b25ee3dc8f71a Mon Sep 17 00:00:00 2001
From: Luk Claes <luk@debian.org>
Date: Fri, 25 May 2012 20:38:12 +0200
Subject: [PATCH] Install osd_login (part of the autologin feature). - Add
open-iscsi and watchdog to Recommends.
- Install osd_login (part of the autologin feature).
- Add open-iscsi and watchdog to Recommends.
---
debian/changelog | 2 ++
debian/control | 2 +-
debian/nfs-common.install | 1 +
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 8b2050b..267c575 100644
--- 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 54c01fc..d1e92c8 100644
--- 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 c07045e..ba58883 100644
--- 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/
--
2.39.5