Makefile

@@ -41,7 +41,7 @@ MAKEMANLIST=$(PERL) -e ' \
 		} \
 		END { \
 			my $$recommended_compat = q{$(VERSION)}; \
-			$$recommended_compat =~ s{\..*}{}; \
+			$$recommended_compat =~ s{^\d+\K(?:\D.*|\..*)?}{}; \
 			while (<STDIN>) { \
 				s/\#LIST\#/$$list/g; \
 				s/\#LIST_DEPRECATED\#/$$list_deprecated/g; \

autoscripts/postinst-emacsen

-if [ "$1" = "configure" ] && [ -e /var/lib/emacsen-common/state/package/installed/emacsen-common -a -x /usr/lib/emacsen-common/emacs-package-install ]
-then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
+	if [ -e /var/lib/emacsen-common/state/package/installed/emacsen-common -a -x /usr/lib/emacsen-common/emacs-package-install ] ; then
 		/usr/lib/emacsen-common/emacs-package-install --postinst #PACKAGE#
 	fi
+fi

autoscripts/postinst-icons

+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
 	if which update-icon-caches >/dev/null 2>&1 ; then
 		update-icon-caches #DIRLIST#
 	fi
+fi

autoscripts/postinst-init

-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
 	if [ -x "/etc/init.d/#SCRIPT#" ]; then
 		update-rc.d #SCRIPT# #INITPARMS# >/dev/null
 		invoke-rc.d #SCRIPT# start || #ERROR_HANDLER#

autoscripts/postinst-init-nostart

-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
 	if [ -x "/etc/init.d/#SCRIPT#" ]; then
 		update-rc.d #SCRIPT# #INITPARMS# >/dev/null || #ERROR_HANDLER#
 	fi

autoscripts/postinst-init-restart

-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
 	if [ -x "/etc/init.d/#SCRIPT#" ]; then
 		update-rc.d #SCRIPT# #INITPARMS# >/dev/null
 		if [ -n "$2" ]; then

autoscripts/postinst-init-tmpfiles

-if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
 	# In case this system is running systemd, we need to ensure that all
 	# necessary tmpfiles (if any) are created before starting.
 	if [ -d /run/systemd/system ] ; then

autoscripts/postinst-modules

-if [ "$1" = "configure" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
 	if [ -e /boot/System.map-#KVERS# ]; then
 		depmod -a -F /boot/System.map-#KVERS# #KVERS# || true
 	fi

autoscripts/postinst-systemd-dont-enable

+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
 	if deb-systemd-helper debian-installed #UNITFILE#; then
 		# This will only remove masks created by d-s-h on package removal.
 		deb-systemd-helper unmask #UNITFILE# >/dev/null || true
@@ -11,3 +12,4 @@ fi
 	# Update the statefile to add new symlinks (if any), which need to be cleaned
 	# up on purge. Also remove old symlinks.
 	deb-systemd-helper update-state #UNITFILE# >/dev/null || true
+fi

autoscripts/postinst-systemd-enable

+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
 	# This will only remove masks created by d-s-h on package removal.
 	deb-systemd-helper unmask #UNITFILE# >/dev/null || true
 
@@ -11,3 +12,4 @@ else
 		# cleaned up on purge. Also remove old symlinks.
 		deb-systemd-helper update-state #UNITFILE# >/dev/null || true
 	fi
+fi

autoscripts/postinst-systemd-restart

+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
 	if [ -d /run/systemd/system ]; then
 		systemctl --system daemon-reload >/dev/null || true
 		if [ -n "$2" ]; then
@@ -7,3 +8,4 @@ if [ -d /run/systemd/system ]; then
 		fi
 		deb-systemd-invoke $_dh_action #UNITFILES# >/dev/null || true
 	fi
+fi

autoscripts/postinst-systemd-restartnostart

+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
 	if [ -d /run/systemd/system ]; then
 		systemctl --system daemon-reload >/dev/null || true
 		if [ -n "$2" ]; then
 			deb-systemd-invoke try-restart #UNITFILES# >/dev/null || true
 		fi
 	fi
+fi

autoscripts/postinst-systemd-start

+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
 	if [ -d /run/systemd/system ]; then
 		systemctl --system daemon-reload >/dev/null || true
 		deb-systemd-invoke start #UNITFILES# >/dev/null || true
 	fi
+fi

autoscripts/postinst-ucf

-if [ "$1" = "configure" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
 	ucf "#UCFSRC#" "#UCFDEST#"
 	ucfr #PACKAGE# "#UCFDEST#"
 fi

autoscripts/postinst-usrlocal

-if [ "$1" = configure ]; then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ]; then
 (
 	while read line; do
 		set -- $line

autoscripts/postinst-wm

-if [ "$1" = "configure" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ]; then
 	update-alternatives --install /usr/bin/x-window-manager \
 		x-window-manager #WM# #PRIORITY# \
 		--slave /usr/share/man/man1/x-window-manager.1.gz \

autoscripts/postinst-wm-noman

-if [ "$1" = "configure" ]; then
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
 	update-alternatives --install /usr/bin/x-window-manager \
 		x-window-manager #WM# #PRIORITY#
 fi

autoscripts/postrm-systemd

 if [ "$1" = "remove" ]; then
 	if [ -x "/usr/bin/deb-systemd-helper" ]; then
-		deb-systemd-helper mask #UNITFILES# >/dev/null
+		deb-systemd-helper mask #UNITFILES# >/dev/null || true
 	fi
 fi
 
 if [ "$1" = "purge" ]; then
 	if [ -x "/usr/bin/deb-systemd-helper" ]; then
-		deb-systemd-helper purge #UNITFILES# >/dev/null
-		deb-systemd-helper unmask #UNITFILES# >/dev/null
+		deb-systemd-helper purge #UNITFILES# >/dev/null || true
+		deb-systemd-helper unmask #UNITFILES# >/dev/null || true
 	fi
 fi

autoscripts/prerm-systemd

 if [ -d /run/systemd/system ]; then
-	deb-systemd-invoke stop #UNITFILES# >/dev/null
+	deb-systemd-invoke stop #UNITFILES# >/dev/null || true
 fi

autoscripts/prerm-systemd-restart

 if [ -d /run/systemd/system ] && [ "$1" = remove ]; then
-	deb-systemd-invoke stop #UNITFILES# >/dev/null
+	deb-systemd-invoke stop #UNITFILES# >/dev/null || true
 fi