Control: tags -1 +patch Attached is a patch to fully convert emacs-common to use dh_usrlocal, producing the expected set of directories with the expected permissions. The change is affected mostly by removing the hand-written, duplicated and not-quite-working directory creation code in postinst and prerm.
>From f3773414c9370a454c021538cc5aeef11137535d Mon Sep 17 00:00:00 2001 From: Arto Jantunen <[email protected]> Date: Sat, 4 Apr 2026 19:59:44 +0300 Subject: [PATCH] Fully convert to dh_usrlocal (Closes: #1127102) --- debian/emacs-common.postinst.in | 45 --------------------------------- debian/emacs-common.prerm.in | 13 ---------- debian/rules | 3 +-- 3 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 debian/emacs-common.postinst.in delete mode 100644 debian/emacs-common.prerm.in diff --git a/debian/emacs-common.postinst.in b/debian/emacs-common.postinst.in deleted file mode 100644 index 5cd3f7d29fa9..000000000000 --- a/debian/emacs-common.postinst.in +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -set -e - -FULL=@FULL_VERSION@ - -# Create the site-lisp dir if we're allowed - -parentdir=/usr/local/share/emacs -newdir=site-lisp - -if [ -d ${parentdir} ] -then - if mkdir ${parentdir}/${newdir} 2>/dev/null - then - chown root:staff ${parentdir}/${newdir} - chmod 2775 ${parentdir}/${newdir} - fi -fi - -parentdir=/usr/local/share/emacs -newdir=${FULL} - -if [ -d ${parentdir} ] -then - if mkdir ${parentdir}/${newdir} 2>/dev/null - then - chown root:staff ${parentdir}/${newdir} - chmod 2775 ${parentdir}/${newdir} - fi -fi - -parentdir=/usr/local/share/emacs/${FULL} -newdir=site-lisp - -if [ -d ${parentdir} ] -then - if mkdir ${parentdir}/${newdir} 2>/dev/null - then - chown root:staff ${parentdir}/${newdir} - chmod 2775 ${parentdir}/${newdir} - fi -fi - -#DEBHELPER# diff --git a/debian/emacs-common.prerm.in b/debian/emacs-common.prerm.in deleted file mode 100644 index 9df86af6a023..000000000000 --- a/debian/emacs-common.prerm.in +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -FULL=@FULL_VERSION@ - -set +e -# Only remove these directories if they're empty. -rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null -rmdir /usr/local/share/emacs/${FULL} 2>/dev/null -set -e - -#DEBHELPER# diff --git a/debian/rules b/debian/rules index 4fec1be43857..86f8074a0386 100755 --- a/debian/rules +++ b/debian/rules @@ -120,8 +120,6 @@ nonpersistent_autogen_install_files := \ debian/emacs-bin-common.postinst \ debian/emacs-bin-common.prerm \ debian/emacs-common.README.Debian \ - debian/emacs-common.postinst \ - debian/emacs-common.prerm \ debian/emacs-nox.lintian-overrides \ debian/emacs-nox.postinst \ debian/emacs-nox.prerm \ @@ -495,6 +493,7 @@ override_dh_auto_install: $(autogen_install_files) rm -f $(pkgdir_common)/usr/share/info/emacs/dir.old install -d $(pkgdir_common)/usr/local/share/emacs/site-lisp + install -d $(pkgdir_common)/usr/local/share/emacs/$(runtime_ver)/site-lisp endif ################################################## -- 2.53.0
-- Arto Jantunen
