regenerate d/control, d/configure, */Makefile.in

7 files changed, 57 insertions, 68 deletions

diff --git a/debian/Makefile.in b/debian/Makefile.in
index b70023e..e889d29 100644
--- a/debian/Makefile.in
+++ b/debian/Makefile.in
@@ -86,22 +86,18 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
 	$(top_srcdir)/build/autoconf.mk.in \
 	$(top_srcdir)/build/autoconf.pl.in \
 	$(top_srcdir)/build/autoconf.sh.in \
-	$(top_srcdir)/build/debian/changelog.sh.in \
-	$(top_srcdir)/build/debian/changelog.in \
 	$(top_srcdir)/build/update_chaos.in \
-	$(top_srcdir)/build/site.config.m4.in \
-	$(top_srcdir)/build/debian/control.m4.in \
-	$(srcdir)/libmilter.dirs.in \
+	$(top_srcdir)/build/site.config.m4.in $(srcdir)/control.m4.in \
+	$(srcdir)/libmilter.install.in \
 	$(srcdir)/libmilter.lintian-overrides.in \
-	$(srcdir)/libmilter.preinst.in $(srcdir)/libmilter-dev.dirs.in \
+	$(srcdir)/libmilter.preinst.in $(srcdir)/libmilter.symbols.in \
 	$(srcdir)/libmilter-dev.links.in \
-	$(srcdir)/libmilter-dev.preinst.in $(srcdir)/rmail.dirs.in \
-	$(srcdir)/rmail.preinst.in $(srcdir)/sendmail-base.dirs.in \
+	$(srcdir)/libmilter-dev.preinst.in $(srcdir)/rmail.preinst.in \
+	$(srcdir)/sendmail-base.dirs.in \
 	$(srcdir)/sendmail-base.postinst.in \
 	$(srcdir)/sendmail-base.postrm.in \
 	$(srcdir)/sendmail-base.preinst.in \
 	$(srcdir)/sendmail-base.prerm.in \
-	$(srcdir)/sendmail-doc.dirs.in \
 	$(srcdir)/sendmail-doc.preinst.in \
 	$(srcdir)/sendmail-cf.postrm.in \
 	$(srcdir)/sendmail-cf.preinst.in \
@@ -143,19 +139,18 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/./build/mkinstalldirs
 CONFIG_CLEAN_FILES = build/autoconf.mk build/autoconf.pl \
-	build/autoconf.sh build/debian/changelog.sh \
-	build/debian/changelog build/update_chaos build/site.config.m4 \
-	build/debian/control.m4 libmilter${sm_libmilter_version}.dirs \
+	build/autoconf.sh build/update_chaos build/site.config.m4 \
+	control.m4 libmilter${sm_libmilter_version}.install \
 	libmilter${sm_libmilter_version}.lintian-overrides \
-	libmilter${sm_libmilter_version}.preinst libmilter-dev.dirs \
-	libmilter-dev.links libmilter-dev.preinst rmail.dirs \
-	rmail.preinst sendmail-base.dirs sendmail-base.postinst \
-	sendmail-base.postrm sendmail-base.preinst sendmail-base.prerm \
-	sendmail-doc.dirs sendmail-doc.preinst sendmail-cf.postrm \
-	sendmail-cf.preinst sendmail.cron.daily sendmail-bin.dirs \
-	sendmail.init.d sendmail-bin.postinst sendmail-bin.postrm \
-	sendmail-bin.preinst sendmail-bin.prerm sendmail-bin.suid \
-	sensible-mda.preinst bug-control bug-script \
+	libmilter${sm_libmilter_version}.preinst \
+	libmilter${sm_libmilter_version}.symbols libmilter-dev.links \
+	libmilter-dev.preinst rmail.preinst sendmail-base.dirs \
+	sendmail-base.postinst sendmail-base.postrm \
+	sendmail-base.preinst sendmail-base.prerm sendmail-doc.preinst \
+	sendmail-cf.postrm sendmail-cf.preinst sendmail.cron.daily \
+	sendmail-bin.dirs sendmail.init.d sendmail-bin.postinst \
+	sendmail-bin.postrm sendmail-bin.preinst sendmail-bin.prerm \
+	sendmail-bin.suid sensible-mda.preinst bug-control bug-script \
 	cf/debian/autoconf.m4 cf/debian/sendmail.mc \
 	cf/debian/submit.mc cf/domain/debian-msp.m4 \
 	cf/domain/debian-mta.m4 cf/hack/debian_auth.m4 \
@@ -280,6 +275,7 @@ DEB_HOST_ARCH = @DEB_HOST_ARCH@
 DEB_HOST_GNU_CPU = @DEB_HOST_GNU_CPU@
 DEB_HOST_GNU_SYSTEM = @DEB_HOST_GNU_SYSTEM@
 DEB_HOST_GNU_TYPE = @DEB_HOST_GNU_TYPE@
+DEB_HOST_MULTIARCH = @DEB_HOST_MULTIARCH@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -509,30 +505,24 @@ build/autoconf.pl: $(top_builddir)/config.status $(top_srcdir)/build/autoconf.pl
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 build/autoconf.sh: $(top_builddir)/config.status $(top_srcdir)/build/autoconf.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-build/debian/changelog.sh: $(top_builddir)/config.status $(top_srcdir)/build/debian/changelog.sh.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-build/debian/changelog: $(top_builddir)/config.status $(top_srcdir)/build/debian/changelog.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 build/update_chaos: $(top_builddir)/config.status $(top_srcdir)/build/update_chaos.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 build/site.config.m4: $(top_builddir)/config.status $(top_srcdir)/build/site.config.m4.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-build/debian/control.m4: $(top_builddir)/config.status $(top_srcdir)/build/debian/control.m4.in
+control.m4: $(top_builddir)/config.status $(srcdir)/control.m4.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-libmilter${sm_libmilter_version}.dirs: $(top_builddir)/config.status $(srcdir)/libmilter.dirs.in
+libmilter${sm_libmilter_version}.install: $(top_builddir)/config.status $(srcdir)/libmilter.install.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 libmilter${sm_libmilter_version}.lintian-overrides: $(top_builddir)/config.status $(srcdir)/libmilter.lintian-overrides.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 libmilter${sm_libmilter_version}.preinst: $(top_builddir)/config.status $(srcdir)/libmilter.preinst.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-libmilter-dev.dirs: $(top_builddir)/config.status $(srcdir)/libmilter-dev.dirs.in
+libmilter${sm_libmilter_version}.symbols: $(top_builddir)/config.status $(srcdir)/libmilter.symbols.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 libmilter-dev.links: $(top_builddir)/config.status $(srcdir)/libmilter-dev.links.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 libmilter-dev.preinst: $(top_builddir)/config.status $(srcdir)/libmilter-dev.preinst.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-rmail.dirs: $(top_builddir)/config.status $(srcdir)/rmail.dirs.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 rmail.preinst: $(top_builddir)/config.status $(srcdir)/rmail.preinst.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 sendmail-base.dirs: $(top_builddir)/config.status $(srcdir)/sendmail-base.dirs.in
@@ -545,8 +535,6 @@ sendmail-base.preinst: $(top_builddir)/config.status $(srcdir)/sendmail-base.pre
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 sendmail-base.prerm: $(top_builddir)/config.status $(srcdir)/sendmail-base.prerm.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-sendmail-doc.dirs: $(top_builddir)/config.status $(srcdir)/sendmail-doc.dirs.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 sendmail-doc.preinst: $(top_builddir)/config.status $(srcdir)/sendmail-doc.preinst.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 sendmail-cf.postrm: $(top_builddir)/config.status $(srcdir)/sendmail-cf.postrm.in
diff --git a/debian/cf/Makefile.in b/debian/cf/Makefile.in
index d438e0f..3598779 100644
--- a/debian/cf/Makefile.in
+++ b/debian/cf/Makefile.in
@@ -132,6 +132,7 @@ DEB_HOST_ARCH = @DEB_HOST_ARCH@
 DEB_HOST_GNU_CPU = @DEB_HOST_GNU_CPU@
 DEB_HOST_GNU_SYSTEM = @DEB_HOST_GNU_SYSTEM@
 DEB_HOST_GNU_TYPE = @DEB_HOST_GNU_TYPE@
+DEB_HOST_MULTIARCH = @DEB_HOST_MULTIARCH@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
diff --git a/debian/configure b/debian/configure
index ccc3447..769419c 100755
--- a/debian/configure
+++ b/debian/configure
@@ -735,6 +735,7 @@ CFLAGS
 CC
 sm_host_arch
 sm_build_arch
+DEB_HOST_MULTIARCH
 DEB_HOST_GNU_TYPE
 DEB_HOST_GNU_SYSTEM
 DEB_HOST_GNU_CPU
@@ -3065,6 +3066,7 @@ END
   fi
 fi
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
@@ -3420,6 +3422,7 @@ else
 
 
 
+
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBIAN, using debhelper v$DEBIAN_DH" >&5
 $as_echo "$DEBIAN, using debhelper v$DEBIAN_DH" >&6; }
 	fi;
@@ -7429,6 +7432,7 @@ $as_echo "$as_me: WARNING: SFIO is required for SSL privacy protection!" >&2;}
 			sm_sendmail_envdef="$sm_sendmail_envdef -DSTARTTLS";
 			sm_sendmail_libs="$sm_sendmail_libs -lcrypto -lssl";
 			sm_ffr="$sm_ffr -D_FFR_TLS_1";
+			sm_ffr="$sm_ffr -D_FFR_TLS_EC";
 			sm_ffr="$sm_ffr -D_FFR_DEAL_WITH_ERROR_SSL";
 			fi;
 		v2i 8.13.0;
@@ -7494,30 +7498,24 @@ ac_config_files="$ac_config_files build/autoconf.pl"
 
 ac_config_files="$ac_config_files build/autoconf.sh"
 
-ac_config_files="$ac_config_files build/debian/changelog.sh"
-
-ac_config_files="$ac_config_files build/debian/changelog:build/debian/changelog.in"
-
 ac_config_files="$ac_config_files build/update_chaos"
 
 ac_config_files="$ac_config_files build/site.config.m4"
 
-ac_config_files="$ac_config_files build/debian/control.m4"
+ac_config_files="$ac_config_files control.m4"
 
-ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.dirs:libmilter.dirs.in"
+ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.install:libmilter.install.in"
 
 ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.lintian-overrides:libmilter.lintian-overrides.in"
 
 ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.preinst:libmilter.preinst.in"
 
-ac_config_files="$ac_config_files libmilter-dev.dirs"
+ac_config_files="$ac_config_files libmilter${sm_libmilter_version}.symbols:libmilter.symbols.in"
 
 ac_config_files="$ac_config_files libmilter-dev.links"
 
 ac_config_files="$ac_config_files libmilter-dev.preinst"
 
-ac_config_files="$ac_config_files rmail.dirs"
-
 ac_config_files="$ac_config_files rmail.preinst"
 
 ac_config_files="$ac_config_files sendmail-base.dirs"
@@ -7530,8 +7528,6 @@ ac_config_files="$ac_config_files sendmail-base.preinst"
 
 ac_config_files="$ac_config_files sendmail-base.prerm"
 
-ac_config_files="$ac_config_files sendmail-doc.dirs"
-
 ac_config_files="$ac_config_files sendmail-doc.preinst"
 
 ac_config_files="$ac_config_files sendmail-cf.postrm"
@@ -8398,25 +8394,21 @@ do
     "build/autoconf.mk") CONFIG_FILES="$CONFIG_FILES build/autoconf.mk" ;;
     "build/autoconf.pl") CONFIG_FILES="$CONFIG_FILES build/autoconf.pl" ;;
     "build/autoconf.sh") CONFIG_FILES="$CONFIG_FILES build/autoconf.sh" ;;
-    "build/debian/changelog.sh") CONFIG_FILES="$CONFIG_FILES build/debian/changelog.sh" ;;
-    "build/debian/changelog") CONFIG_FILES="$CONFIG_FILES build/debian/changelog:build/debian/changelog.in" ;;
     "build/update_chaos") CONFIG_FILES="$CONFIG_FILES build/update_chaos" ;;
     "build/site.config.m4") CONFIG_FILES="$CONFIG_FILES build/site.config.m4" ;;
-    "build/debian/control.m4") CONFIG_FILES="$CONFIG_FILES build/debian/control.m4" ;;
-    "libmilter${sm_libmilter_version}.dirs") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.dirs:libmilter.dirs.in" ;;
+    "control.m4") CONFIG_FILES="$CONFIG_FILES control.m4" ;;
+    "libmilter${sm_libmilter_version}.install") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.install:libmilter.install.in" ;;
     "libmilter${sm_libmilter_version}.lintian-overrides") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.lintian-overrides:libmilter.lintian-overrides.in" ;;
     "libmilter${sm_libmilter_version}.preinst") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.preinst:libmilter.preinst.in" ;;
-    "libmilter-dev.dirs") CONFIG_FILES="$CONFIG_FILES libmilter-dev.dirs" ;;
+    "libmilter${sm_libmilter_version}.symbols") CONFIG_FILES="$CONFIG_FILES libmilter${sm_libmilter_version}.symbols:libmilter.symbols.in" ;;
     "libmilter-dev.links") CONFIG_FILES="$CONFIG_FILES libmilter-dev.links" ;;
     "libmilter-dev.preinst") CONFIG_FILES="$CONFIG_FILES libmilter-dev.preinst" ;;
-    "rmail.dirs") CONFIG_FILES="$CONFIG_FILES rmail.dirs" ;;
     "rmail.preinst") CONFIG_FILES="$CONFIG_FILES rmail.preinst" ;;
     "sendmail-base.dirs") CONFIG_FILES="$CONFIG_FILES sendmail-base.dirs" ;;
     "sendmail-base.postinst") CONFIG_FILES="$CONFIG_FILES sendmail-base.postinst" ;;
     "sendmail-base.postrm") CONFIG_FILES="$CONFIG_FILES sendmail-base.postrm" ;;
     "sendmail-base.preinst") CONFIG_FILES="$CONFIG_FILES sendmail-base.preinst" ;;
     "sendmail-base.prerm") CONFIG_FILES="$CONFIG_FILES sendmail-base.prerm" ;;
-    "sendmail-doc.dirs") CONFIG_FILES="$CONFIG_FILES sendmail-doc.dirs" ;;
     "sendmail-doc.preinst") CONFIG_FILES="$CONFIG_FILES sendmail-doc.preinst" ;;
     "sendmail-cf.postrm") CONFIG_FILES="$CONFIG_FILES sendmail-cf.postrm" ;;
     "sendmail-cf.preinst") CONFIG_FILES="$CONFIG_FILES sendmail-cf.preinst" ;;
@@ -8991,20 +8983,21 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "build/debian/changelog.sh":F)
-		echo 'creating ./build/debian/changelog.in';
-		chmod ug+x ./build/debian/changelog.sh;
-		./build/debian/changelog.sh; ;;
-    "build/debian/changelog":F)
-		cp build/debian/changelog ./; ;;
     "build/update_chaos":F)
 		echo 'Updating Build setup';
 		chmod ug+x ./build/update_chaos;
 		(cd ../ && ./debian/build/update_chaos); ;;
-    "build/debian/control.m4":F)
-		echo 'creating ./control';
-		m4 ./build/debian/control.m4 > ./build/debian/control;
-		cp ./build/debian/control ./; ;;
+    "control.m4":F)
+		m4 control.m4 > control.new;
+		if cmp control control.new; then
+			echo "*** debian/control was up-to-date ***";
+			rm -f control.new;
+		else
+			echo "*** debian/control was updated, aborting, please restart your build ***";
+			mv control.new control;
+			exit 1;
+		fi;
+		 ;;
     "examples/dhcp/dhclient-exit-hooks.d/sendmail":F) chmod a+x ./examples/dhcp/dhclient-exit-hooks.d/sendmail ;;
     "examples/network/if-down.d/sendmail":F) chmod a+x ./examples/network/if-down.d/sendmail ;;
     "examples/network/if-up.d/sendmail":F) chmod a+x ./examples/network/if-up.d/sendmail ;;
diff --git a/debian/control b/debian/control
index 9521455..0f57840 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: sendmail
 Priority: extra
 Section: mail
-Maintainer: Jakub Safarik <jsafarik@ymail.com>
-Standards-Version: 3.8.3
+Maintainer: Debian QA Group <packages@qa.debian.org>
+Standards-Version: 3.9.5
 Build-Depends-Indep:
  groff,
  bsdmainutils,
@@ -102,6 +102,9 @@ Description: Mail Delivery Agent wrapper
 
 Package: libmilter1.0.1
 Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends}
 Section: libs
 Depends:
  ${shlibs:Depends},
@@ -117,12 +120,13 @@ Description: Sendmail Mail Filter API (Milter)
 
 Package: libmilter1.0.1-dbg
 Architecture: any
+Multi-Arch: same
 Section: debug
 Depends:
  libmilter1.0.1 (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends}
-Description: Sendmail Mail Filter API (Milter)
+Description: Sendmail Mail Filter API (Milter) (debug symbols)
  The Sendmail Mail Filter API (Milter) is designed to allow third-party
  programs access to mail messages as they are being processed in order
  to filter meta-information(headers) and content.
@@ -139,7 +143,7 @@ Depends:
  ${misc:Depends}
 Suggests:
  sendmail-doc,
-Description: Sendmail Mail Filter API (Milter)
+Description: Sendmail Mail Filter API (Milter) (development files)
  The Sendmail Mail Filter API (Milter) is designed to allow third-party
  programs access to mail messages as they are being processed in order
  to filter meta-information (headers) and content.
@@ -155,7 +159,7 @@ Architecture: all
 Section: doc
 Depends:
  ${misc:Depends}
-Description: powerful, efficient, and scalable Mail Transport Agent
+Description: powerful, efficient, and scalable Mail Transport Agent (documentation)
  Sendmail is an alternative Mail Transport Agent (MTA) for
  Debian. It is suitable for handling sophisticated mail
  configurations, although this means that its configuration
@@ -187,7 +191,7 @@ Breaks:
 Replaces:
  sendmail-tls,
  sendmail-base (<< 8.14.4-2.2~),
-Description: powerful, efficient, and scalable Mail Transport Agent
+Description: powerful, efficient, and scalable Mail Transport Agent (metapackage)
  Sendmail is an alternative Mail Transport Agent (MTA) for Debian.
  It is suitable for handling sophisticated mail configurations,
  although this means that its configuration can also be complex.
@@ -220,7 +224,7 @@ Suggests:
  logcheck,
  logrotate,
  resolvconf,
-Description: powerful, efficient, and scalable Mail Transport Agent
+Description: powerful, efficient, and scalable Mail Transport Agent (arch independent files)
  Sendmail is an alternative Mail Transport Agent (MTA) for
  Debian. It is suitable for handling sophisticated mail
  configurations, although this means that its configuration
@@ -236,7 +240,7 @@ Depends:
  ${misc:Depends}
 Suggests:
  sendmail-doc,
-Description: powerful, efficient, and scalable Mail Transport Agent
+Description: powerful, efficient, and scalable Mail Transport Agent (config macros)
  Sendmail is an alternative Mail Transport Agent (MTA) for
  Debian. It is suitable for handling sophisticated mail
  configurations, although this means that its configuration
diff --git a/debian/examples/Makefile.in b/debian/examples/Makefile.in
index c48015e..16a3c3e 100644
--- a/debian/examples/Makefile.in
+++ b/debian/examples/Makefile.in
@@ -169,6 +169,7 @@ DEB_HOST_ARCH = @DEB_HOST_ARCH@
 DEB_HOST_GNU_CPU = @DEB_HOST_GNU_CPU@
 DEB_HOST_GNU_SYSTEM = @DEB_HOST_GNU_SYSTEM@
 DEB_HOST_GNU_TYPE = @DEB_HOST_GNU_TYPE@
+DEB_HOST_MULTIARCH = @DEB_HOST_MULTIARCH@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
diff --git a/debian/local/Makefile.in b/debian/local/Makefile.in
index 360dc93..21a4f0a 100644
--- a/debian/local/Makefile.in
+++ b/debian/local/Makefile.in
@@ -181,6 +181,7 @@ DEB_HOST_ARCH = @DEB_HOST_ARCH@
 DEB_HOST_GNU_CPU = @DEB_HOST_GNU_CPU@
 DEB_HOST_GNU_SYSTEM = @DEB_HOST_GNU_SYSTEM@
 DEB_HOST_GNU_TYPE = @DEB_HOST_GNU_TYPE@
+DEB_HOST_MULTIARCH = @DEB_HOST_MULTIARCH@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
diff --git a/debian/sensible_mda/Makefile.in b/debian/sensible_mda/Makefile.in
index 075cfef..cde5f18 100644
--- a/debian/sensible_mda/Makefile.in
+++ b/debian/sensible_mda/Makefile.in
@@ -205,6 +205,7 @@ DEB_HOST_ARCH = @DEB_HOST_ARCH@
 DEB_HOST_GNU_CPU = @DEB_HOST_GNU_CPU@
 DEB_HOST_GNU_SYSTEM = @DEB_HOST_GNU_SYSTEM@
 DEB_HOST_GNU_TYPE = @DEB_HOST_GNU_TYPE@
+DEB_HOST_MULTIARCH = @DEB_HOST_MULTIARCH@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@