let dh_link handle the symlink creation

3 files changed, 26 insertions, 23 deletions

diff --git a/debian/libmilter-dev.links.in b/debian/libmilter-dev.links.in
index 43a454e..0af85c9 100644
--- a/debian/libmilter-dev.links.in
+++ b/debian/libmilter-dev.links.in
@@ -1,2 +1 @@
-usr/lib/libmilter.so.@sm_libmilter_version@ usr/lib/libmilter/libmilter.so.@sm_libmilter_version@
-usr/lib/libmilter/libmilter.so.@sm_libmilter_version@ usr/lib/libmilter/libmilter.so
+usr/lib/libmilter.so.@sm_libmilter_version@ usr/lib/libmilter.so
diff --git a/debian/rules b/debian/rules
index 8c9b03c..59a50d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -479,11 +479,6 @@ common-install-arch::
 	#		yeah, yeah, I know... these can be done with -b<flag>!
 	(cd ${PKG_DIR}${bindir} && \
 		$(RM) hoststat mailq newaliases purgestat smtpd;)
-	(cd ${PKG_DIR}${sbindir} && for file in \
-		newaliases hoststat purgestat \
-		; do \
-			ln -sf sendmail-mta $$file; \
-			done;);
 	# Handle man pages for these aliases
 	mv ${PKG_DIR}${mandir}/man5/aliases.5 \
 		${PKG_DIR}${mandir}/man5/aliases.sendmail.5;
@@ -491,22 +486,6 @@ common-install-arch::
 		${PKG_DIR}${mandir}/man1/mailq.sendmail.1;
 	mv ${PKG_DIR}${mandir}/man1/newaliases.1 \
 		${PKG_DIR}${mandir}/man8/newaliases.sendmail.8;
-	(cd ${PKG_DIR}${mandir}/man8 && \
-		for file in hoststat.8.gz purgestat.8.gz \
-		; do \
-			ln -sf sendmail-mta.8.gz $$file; \
-			done;);
-	# Place those removed aliases in ${libexecdir} (mostly for me)
-	(cd ${PKG_DIR}${libexecdir} && for file in \
-		hoststat mailq newaliases purgestat smtpd; do \
-		ln -sf sendmail $$file; \
-		done;);
-	# NOTE: with the MSP/MTA split, we'll provide our own mailstats (keep orig)
-	ln -s ../share/sendmail/mailstats ${PKG_DIR}${sbindir}/mailstats;
-	ln -s ../share/sendmail/mailq ${PKG_DIR}${bindir}/mailq;
-	ln -s ../lib/sm.bin/editmap ${PKG_DIR}${sbindir}/editmap;
-	ln -s ../lib/sm.bin/makemap ${PKG_DIR}${sbindir}/makemap;
-	ln -s ../lib/sm.bin/praliases ${PKG_DIR}${sbindir}/praliases;
 	# Special handling of vacation - Debian has a seperate package
 	# with a different version (sigh) keep our copy just in case...
 	mv ${PKG_DIR}${libexecdir}/vacation \
diff --git a/debian/sendmail-bin.links b/debian/sendmail-bin.links
new file mode 100644
index 0000000..d14fe6b
--- /dev/null
+++ b/debian/sendmail-bin.links
@@ -0,0 +1,25 @@
+# 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)
+# NOTE: newscache package also contains ${sbindir}/hoststat
+# NOTE: newalias, purgestat, etc. aren't for the general user..
+#		yeah, yeah, I know... these can be done with -b<flag>!
+usr/sbin/sendmail-mta			usr/sbin/newaliases
+usr/sbin/sendmail-mta			usr/sbin/hoststat
+usr/sbin/sendmail-mta			usr/sbin/purgestat
+usr/share/man/man8/sendmail-mta.8.gz	usr/share/man/man8/hoststat.8.gz
+usr/share/man/man8/sendmail-mta.8.gz	usr/share/man/man8/purgestat.8.gz
+
+# Place those removed aliases in ${libexecdir} (mostly for me)
+usr/lib/sm.bin/sendmail			usr/lib/sm.bin/hoststat
+usr/lib/sm.bin/sendmail			usr/lib/sm.bin/mailq
+usr/lib/sm.bin/sendmail			usr/lib/sm.bin/newaliases
+usr/lib/sm.bin/sendmail			usr/lib/sm.bin/purgestat
+usr/lib/sm.bin/sendmail			usr/lib/sm.bin/smtpd
+
+# NOTE: with the MSP/MTA split, we'll provide our own mailstats (keep orig)
+usr/share/sendmail/mailstats		usr/sbin/mailstats
+usr/share/sendmail/mailq		usr/bin/mailq
+usr/lib/sm.bin/editmap			usr/sbin/editmap
+usr/lib/sm.bin/makemap			usr/sbin/makemap
+usr/lib/sm.bin/praliases		usr/sbin/praliases