Control: tags -1 patch
Please find a debdiff attached with the necessary changes. Note that debian/exmh.install has to be executable, which is not represented in the debdiff.
diff -Nru exmh-2.9.0/debian/changelog exmh-2.9.0/debian/changelog --- exmh-2.9.0/debian/changelog 2026-04-01 09:22:41.000000000 +0200 +++ exmh-2.9.0/debian/changelog 2026-08-14 21:13:24.000000000 +0200 @@ -1,3 +1,14 @@ +exmh (1:2.9.0-9.1) unstable; urgency=medium + + * Non-maintainer upload + * convert to debhelper dh sequencer (closes: #1144418) + * rename NEWS file so that dh_installchangelogs picks it up + * drop empty exmh.docs file + * drop debian/conffiles (dh auto-detects /etc files) + * Use #DEBHELPER# token to fill menu use in maintainer scripts + + -- Bastian Germann <[email protected]> Fri, 14 Aug 2026 21:13:24 +0200 + exmh (1:2.9.0-9) unstable; urgency=medium * improved quoted-printable parsing, fixed small bug in html font setup diff -Nru exmh-2.9.0/debian/conffiles exmh-2.9.0/debian/conffiles --- exmh-2.9.0/debian/conffiles 2012-04-22 06:02:56.000000000 +0200 +++ exmh-2.9.0/debian/conffiles 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -/etc/exmh.conf diff -Nru exmh-2.9.0/debian/control exmh-2.9.0/debian/control --- exmh-2.9.0/debian/control 2024-12-08 02:11:18.000000000 +0100 +++ exmh-2.9.0/debian/control 2026-08-14 21:13:24.000000000 +0200 @@ -2,6 +2,7 @@ Section: mail Priority: optional Maintainer: Alexander Zangerl <[email protected]> +Build-Depends: debhelper-compat (= 14), dh-exec Standards-Version: 4.1.3.0 Rules-Requires-Root: binary-targets diff -Nru exmh-2.9.0/debian/exmh.docs exmh-2.9.0/debian/exmh.docs --- exmh-2.9.0/debian/exmh.docs 2013-07-17 12:35:23.000000000 +0200 +++ exmh-2.9.0/debian/exmh.docs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ - diff -Nru exmh-2.9.0/debian/exmh.install exmh-2.9.0/debian/exmh.install --- exmh-2.9.0/debian/exmh.install 1970-01-01 01:00:00.000000000 +0100 +++ exmh-2.9.0/debian/exmh.install 2026-08-14 21:13:24.000000000 +0200 @@ -0,0 +1,34 @@ +#!/usr/bin/dh-exec +exmh.MASTER => usr/bin/exmh +exmh-async.MASTER => usr/share/exmh/exmh-async +exmh-bg.MASTER => usr/share/exmh/exmh-bg +ftp.expect.MASTER => usr/share/exmh/ftp.expect +inc.expect.MASTER => usr/share/exmh/inc.expect +lib/*.tcl usr/lib/exmh/ +lib/app-defaults* usr/lib/exmh/ +lib/*.au usr/lib/exmh/ +lib/PgpDecryptExpect usr/lib/exmh/ +lib/*.exp usr/lib/exmh/ +lib/*.gif usr/share/exmh/bitmaps/ +lib/*.bitmap usr/share/exmh/bitmaps/ +lib/*.mask usr/share/exmh/bitmaps/ +lib/*.ppm usr/share/exmh/bitmaps/ +lib/bitmaps/* usr/share/exmh/bitmaps/ +lib/html/* usr/share/doc/exmh/html/ +misc/README* usr/share/doc/exmh/misc/ +misc/Par150* usr/share/doc/exmh/misc/ +misc/archiveoldmail usr/share/doc/exmh/misc/ +misc/cite* usr/share/doc/exmh/misc/ +misc/comp* usr/share/doc/exmh/misc/ +misc/exmhwrapper usr/share/doc/exmh/misc/ +misc/gbuffy* usr/share/doc/exmh/misc/ +misc/jpilot* usr/share/doc/exmh/misc/ +misc/locked* usr/share/doc/exmh/misc/ +misc/mh* usr/share/doc/exmh/misc/ +misc/netscape-remote* usr/share/doc/exmh/misc/ +misc/ns* usr/share/doc/exmh/misc/ +misc/query* usr/share/doc/exmh/misc/ +exmhcomp => usr/share/doc/exmh/examples/exmhcomp +exmh-strip.MASTER => usr/share/doc/exmh/examples/exmh-strip +exmh.l => usr/share/man/man1/exmh.1 +exmh.README => usr/share/doc/exmh/README diff -Nru exmh-2.9.0/debian/NEWS exmh-2.9.0/debian/NEWS --- exmh-2.9.0/debian/NEWS 1970-01-01 01:00:00.000000000 +0100 +++ exmh-2.9.0/debian/NEWS 2026-08-14 21:13:24.000000000 +0200 @@ -0,0 +1,29 @@ +exmh (1:2.8.0-6) unstable; urgency=low + + sound disabled in default configuration + + To make exmh provide audio feedback you will have to + set a "Play command" explicitly. Exmh will run this command + in the background. + + Earlier versions have shipped with the default sound player command + "/usr/bin/run-mailcap". + + -- Alexander Zangerl <[email protected]> Sun, 01 May 2016 12:04:34 +1000 + +exmh (1:2.8.0-5) unstable; urgency=low + + sound with sox + + If you want to use sound with exmh, using sox's /usr/bin/play as player + please ensure that you: + + - either select "/usr/bin/play -q" in your exmh preferences, + - or adjust your /etc/mailcap (via mailcap.order and update-mime) so + that /usr/bin/play gets the -q flag. + + Sox does not run in the background unless -q is present, but exmh runs the + sound player command as a background process. + + -- Alexander Zangerl <[email protected]> Sat, 06 Sep 2014 11:46:44 +1000 + diff -Nru exmh-2.9.0/debian/NEWS.Debian exmh-2.9.0/debian/NEWS.Debian --- exmh-2.9.0/debian/NEWS.Debian 2016-05-01 04:46:55.000000000 +0200 +++ exmh-2.9.0/debian/NEWS.Debian 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ -exmh (1:2.8.0-6) unstable; urgency=low - - sound disabled in default configuration - - To make exmh provide audio feedback you will have to - set a "Play command" explicitly. Exmh will run this command - in the background. - - Earlier versions have shipped with the default sound player command - "/usr/bin/run-mailcap". - - -- Alexander Zangerl <[email protected]> Sun, 01 May 2016 12:04:34 +1000 - -exmh (1:2.8.0-5) unstable; urgency=low - - sound with sox - - If you want to use sound with exmh, using sox's /usr/bin/play as player - please ensure that you: - - - either select "/usr/bin/play -q" in your exmh preferences, - - or adjust your /etc/mailcap (via mailcap.order and update-mime) so - that /usr/bin/play gets the -q flag. - - Sox does not run in the background unless -q is present, but exmh runs the - sound player command as a background process. - - -- Alexander Zangerl <[email protected]> Sat, 06 Sep 2014 11:46:44 +1000 - diff -Nru exmh-2.9.0/debian/postinst exmh-2.9.0/debian/postinst --- exmh-2.9.0/debian/postinst 2018-11-14 05:44:56.000000000 +0100 +++ exmh-2.9.0/debian/postinst 2026-08-14 21:13:24.000000000 +0200 @@ -1,8 +1,9 @@ #!/bin/sh set -e -if which update-menus >/dev/null ; then update-menus ; fi tclsh <<FOO puts "Updating tclIndex for tcl v.[info tclversion]" auto_mkindex /usr/lib/exmh *.tcl FOO + +#DEBHELPER# diff -Nru exmh-2.9.0/debian/postrm exmh-2.9.0/debian/postrm --- exmh-2.9.0/debian/postrm 2018-11-14 05:44:41.000000000 +0100 +++ exmh-2.9.0/debian/postrm 2026-08-14 21:13:24.000000000 +0200 @@ -1,4 +1,5 @@ #!/bin/sh set -e -if which update-menus >/dev/null ; then update-menus ; fi rm -f /usr/lib/exmh/tclIndex + +#DEBHELPER# diff -Nru exmh-2.9.0/debian/preinst exmh-2.9.0/debian/preinst --- exmh-2.9.0/debian/preinst 2012-04-22 06:02:56.000000000 +0200 +++ exmh-2.9.0/debian/preinst 2026-08-14 21:13:24.000000000 +0200 @@ -1,7 +1,8 @@ -#!/bin/sh -e +#!/bin/sh +set -e # cleanup of html dirs in lib area (versions prior to 2.7.0) [ -d /usr/lib/exmh/html/ ] && rm -r /usr/lib/exmh/html/ || exit 0 - +#DEBHELPER# diff -Nru exmh-2.9.0/debian/rules exmh-2.9.0/debian/rules --- exmh-2.9.0/debian/rules 2024-09-27 03:32:11.000000000 +0200 +++ exmh-2.9.0/debian/rules 2026-08-14 21:13:24.000000000 +0200 @@ -1,116 +1,18 @@ -#! /usr/bin/make -f +#!/usr/bin/make -f # # debian/exmh.conf contains configuration information taken from # exmh.install. debian/exmh.conf must be manually generated and # verified before building the exmh package and updated with each # new upstream release of exmh. -SHELL = /bin/sh +DEB_VERSION := $(shell dpkg-parsechangelog --show-field Version) -INSTALL = /usr/bin/install -INSTALL_PROGRAM = $(INSTALL) -m 755 -o root -g root -INSTALL_DATA = $(INSTALL) -m 644 -o root -g root -INSTALL_DIR = $(INSTALL) -d -m 755 -o root -g root +%: + dh $@ --buildsystem=none -# name and version number of the package -PACKAGE=exmh -VERSION=$(shell sed -n '1s/^.*(\(.*\)).*$$/\1/p' debian/changelog) +execute_before_dh_install: + mkdir -p debian/exmh/etc + sed -e s/MYVERSION/$(DEB_VERSION)/g debian/exmh.conf > debian/exmh/etc/exmh.conf -DSTDIR=debian/tmp/ - -BUILD_DATE := $(shell dpkg-parsechangelog | sed -n -e 's/^Date: //p') - - -config: - $(checkdir) - touch stamp-config - -build: - $(checkdir) - test -f stamp-config || make -f debian/rules config - touch stamp-build - -clean: - $(checkdir) - -rm -f stamp-config stamp-build - -rm -rf $(DSTDIR) debian/files* - -binary-arch: checkroot - -binary-indep: checkroot - $(checkdir) - test -f stamp-build || make -f debian/rules build - -rm -rf $(DSTDIR) - -# make all directories in one go - $(INSTALL_DIR) $(DSTDIR)/DEBIAN $(DSTDIR)/usr/bin/ $(DSTDIR)/etc/ - $(INSTALL_DIR) $(DSTDIR)/usr/share/menu $(DSTDIR)/usr/lib/exmh - $(INSTALL_DIR) $(DSTDIR)/usr/share/doc/exmh/html $(DSTDIR)/usr/share/doc/exmh/misc $(DSTDIR)/usr/share/doc/exmh/examples $(DSTDIR)/usr/share/man/man1 $(DSTDIR)/usr/share/exmh/bitmaps/ - -# the maintainer stuff first - $(INSTALL_PROGRAM) debian/preinst debian/postinst debian/postrm $(DSTDIR)/DEBIAN/ - $(INSTALL_DATA) debian/conffiles $(DSTDIR)/DEBIAN/ - -# configuration file, but vith our current version substituted - sed -e s/MYVERSION/$(VERSION)/g <debian/exmh.conf >$(DSTDIR)/etc/exmh.conf - chown root:root $(DSTDIR)/etc/exmh.conf - chmod 644 $(DSTDIR)/etc/exmh.conf - -# binaries. in upstream scheme, the install script massages .MASTER versions - $(INSTALL_PROGRAM) exmh.MASTER $(DSTDIR)/usr/bin/exmh - $(INSTALL_PROGRAM) exmh-async.MASTER $(DSTDIR)/usr/share/exmh/exmh-async - $(INSTALL_PROGRAM) exmh-bg.MASTER $(DSTDIR)/usr/share/exmh/exmh-bg - $(INSTALL_PROGRAM) ftp.expect.MASTER $(DSTDIR)/usr/share/exmh/ftp.expect - $(INSTALL_PROGRAM) inc.expect.MASTER $(DSTDIR)/usr/share/exmh/inc.expect -# libraries - $(INSTALL_DATA) debian/menu $(DSTDIR)/usr/share/menu/exmh - -# everything from lib but the docs, the images, the -# tclindex (built by postinst), and also not the mime.type (use main one in etc) - $(INSTALL_DATA) lib/*.tcl lib/app-defaults* lib/*.au lib/PgpDecryptExpect lib/*.exp $(DSTDIR)/usr/lib/exmh/ - $(INSTALL_DATA) lib/*.gif lib/*.bitmap lib/*.mask lib/*.ppm lib/bitmaps/* $(DSTDIR)/usr/share/exmh/bitmaps/ - $(INSTALL_PROGRAM) exmh-strip.MASTER $(DSTDIR)/usr/share/doc/exmh/examples/exmh-strip - $(INSTALL_PROGRAM) exmhcomp $(DSTDIR)/usr/share/doc/exmh/examples/ - - - -# man pages - $(INSTALL_DATA) exmh.l $(DSTDIR)/usr/share/man/man1/exmh.1 - -gzip -9frn $(DSTDIR)/usr/share/man/man1 - -# html documentation goes into html dir, extras go into misc subdir -# others go into main docs area - $(INSTALL_DATA) lib/html/* $(DSTDIR)/usr/share/doc/exmh/html/ - # all misc except RPM info - $(INSTALL_DATA) misc/README* misc/Par150* misc/archiveoldmail misc/cite* misc/comp* misc/exmhwrapper misc/gbuffy* misc/jpilot* misc/locked* misc/mh* misc/netscape-remote* misc/ns* misc/query* $(DSTDIR)/usr/share/doc/exmh/misc/ - - $(INSTALL_DATA) debian/copyright $(DSTDIR)/usr/share/doc/exmh/copyright - $(INSTALL_DATA) debian/changelog $(DSTDIR)/usr/share/doc/exmh/changelog.Debian - $(INSTALL_DATA) exmh.CHANGES $(DSTDIR)/usr/share/doc/exmh/changelog - - $(INSTALL_DATA) debian/README.Debian debian/NEWS.Debian $(DSTDIR)/usr/share/doc/exmh - $(INSTALL_DATA) exmh.README $(DSTDIR)/usr/share/doc/exmh/README - gzip -9n $(DSTDIR)/usr/share/doc/exmh/changelog* $(DSTDIR)/usr/share/doc/exmh/NEWS.Debian - -# build the run-time package - dpkg-gencontrol - find '$(DSTDIR)' -depth -newermt '$(BUILD_DATE)' -print0 | \ - xargs -0r touch --no-dereference --date='$(BUILD_DATE)' - - dpkg --build $(DSTDIR) .. - -define checkdir - test -f exmh.MASTER -a -f debian/rules -endef - -binary: binary-indep binary-arch - -build-arch: build - -build-indep: build - -checkroot: - $(checkdir) - test root = "`whoami`" - -.PHONY: binary binary-arch binary-indep clean +override_dh_installchangelogs: + dh_installchangelogs --no-trim exmh.CHANGES
