From 37519fe8a1b4b18e8b3c595fff6af7e8c1679522 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Thu, 22 May 2014 21:57:34 +0200 Subject: convert libmilter into a 'M-A: same' package --- debian/changelog | 1 + debian/control.m4.in | 4 ++++ debian/libmilter-dev.links.in | 2 +- debian/rules | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ac7ddaf..e8e48f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ sendmail (8.14.4-6) UNRELEASED; urgency=medium * Add support for OpenSSL options SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2 (backported from 8.14.8), thanks to David F. Skoll. (Closes: #747910) * Apply manpage corrections from Ubuntu. (Closes: #747551) + * libmilter: Convert into a 'Multi-Arch: same' package. * Remove outdated documentation and other cruft. * Don't re-generate d/changelog during build. * Abort build if debian/control got regenerated and differs. diff --git a/debian/control.m4.in b/debian/control.m4.in index 46ea6ec..c63338b 100644 --- a/debian/control.m4.in +++ b/debian/control.m4.in @@ -142,6 +142,9 @@ ifelse([[@sm_enable_milter@]], [[yes]], [[[[ Package: libmilter@sm_libmilter_version@ Architecture: any +Multi-Arch: same +Pre-Depends: + ${misc:Pre-Depends} Section: libs Depends: ${shlibs:Depends}, @@ -157,6 +160,7 @@ Description: Sendmail Mail Filter API (Milter) Package: libmilter@sm_libmilter_version@-dbg Architecture: any +Multi-Arch: same Section: debug Depends: libmilter@sm_libmilter_version@ (= ${binary:Version}), diff --git a/debian/libmilter-dev.links.in b/debian/libmilter-dev.links.in index 0af85c9..8dff152 100644 --- a/debian/libmilter-dev.links.in +++ b/debian/libmilter-dev.links.in @@ -1 +1 @@ -usr/lib/libmilter.so.@sm_libmilter_version@ usr/lib/libmilter.so +usr/lib/@DEB_HOST_MULTIARCH@/libmilter.so.@sm_libmilter_version@ usr/lib/@DEB_HOST_MULTIARCH@/libmilter.so diff --git a/debian/rules b/debian/rules index 2bb21bb..b6fdd2c 100755 --- a/debian/rules +++ b/debian/rules @@ -359,9 +359,10 @@ common-install-arch:: for subdir in ${SM_SUBDIRS}; do \ if [ -d ${DEB_SRCDIR}/$${subdir} ]; then \ if [ "$${subdir}" = 'libmilter' ]; then \ + ${INSTALL} -d debian/libmilter${sm_libmilter_version}${libdir}/${DEB_HOST_MULTIARCH}; \ (cd ${DEB_SRCDIR}/obj*/$${subdir} && \ $(INSTALL) libmilter.so.${sm_libmilter_version} \ - ../../../../debian/libmilter${sm_libmilter_version}${libdir}/; \ + ../../../../debian/libmilter${sm_libmilter_version}${libdir}/${DEB_HOST_MULTIARCH}/; \ ); \ elif [ "$${subdir}" = 'mail.local' ] \ || [ "$${subdir}" = 'rmail' ]; then \ -- cgit v1.2.3