summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorAndreas Beckmann <anbe@debian.org>2014-05-23 17:02:01 +0200
committerAndreas Beckmann <anbe@debian.org>2014-05-23 17:02:01 +0200
commitfc368946b99ffb9d5d8b0988bb4ece86332a7bca (patch)
tree1e9aee1a15639d736ef714335b35ebf21eb01a4d /debian
parentb49f3132ec3b94f74c8a4931f9fbc3f89c332779 (diff)
downloadsendmail-fc368946b99ffb9d5d8b0988bb4ece86332a7bca.tar.gz
install rmail via debian/tmp and dh_install
Diffstat (limited to 'debian')
-rw-r--r--debian/configure.ac1
-rw-r--r--debian/rmail.dirs.in2
-rw-r--r--debian/rmail.install2
-rw-r--r--debian/rmail.manpages1
-rwxr-xr-xdebian/rules4
5 files changed, 3 insertions, 7 deletions
diff --git a/debian/configure.ac b/debian/configure.ac
index a89444c..bc3ab9e 100644
--- a/debian/configure.ac
+++ b/debian/configure.ac
@@ -1689,7 +1689,6 @@ AC_CONFIG_FILES([libmilter${sm_libmilter_version}.preinst:libmilter.preinst.in])
AC_CONFIG_FILES([libmilter${sm_libmilter_version}.symbols:libmilter.symbols.in])
AC_CONFIG_FILES([libmilter-dev.links])
AC_CONFIG_FILES([libmilter-dev.preinst])
-AC_CONFIG_FILES([rmail.dirs])
AC_CONFIG_FILES([rmail.preinst])
AC_CONFIG_FILES([sendmail-base.dirs])
AC_CONFIG_FILES([sendmail-base.postinst])
diff --git a/debian/rmail.dirs.in b/debian/rmail.dirs.in
deleted file mode 100644
index b82ff47..0000000
--- a/debian/rmail.dirs.in
+++ /dev/null
@@ -1,2 +0,0 @@
-.@sbindir@
-.@mandir@/man8
diff --git a/debian/rmail.install b/debian/rmail.install
new file mode 100644
index 0000000..9d9f4bf
--- /dev/null
+++ b/debian/rmail.install
@@ -0,0 +1,2 @@
+# FHS says that rmail belongs in ${sbindir}
+usr/lib/sm.bin/rmail usr/sbin/
diff --git a/debian/rmail.manpages b/debian/rmail.manpages
new file mode 100644
index 0000000..622a7f7
--- /dev/null
+++ b/debian/rmail.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/share/man/man8/rmail.8
diff --git a/debian/rules b/debian/rules
index 7880d0f..9d7f1e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -369,10 +369,6 @@ common-install-arch::
fi; \
fi; \
done;
- # FHS says that rmail belongs in \${sbindir} - and we now put
- # it there, but in the rmail package !
- mv ${PKG_DIR}${libexecdir}/rmail debian/rmail${sbindir}/;
- mv ${PKG_DIR}${mandir}/man8/rmail.8 debian/rmail${mandir}/man8/;
# Sendmail alias handling...
# NOTE: whilst smptd is a valid alias for sendmail, we don't create
# one so that we can co-exists with smtpd (a firewall frontend)