Migrate emacsen helpers to dh_elpa

Closes: #802915

debian/changelog

@@ -1,3 +1,9 @@
+cmake (3.21.2-2) UNRELEASED; urgency=medium
+
+  * Migrate emacsen helpers to dh_elpa (Closes: #802915)
+
+ -- Timo Röhling <roehling@debian.org>  Fri, 17 Sep 2021 14:42:17 +0200
+
 cmake (3.21.2-1) unstable; urgency=medium
 
   [ Debian Janitor ]

debian/clean

@@ -0,0 +1 @@
+debian/cmake-mode-pkg.el

debian/cmake-data.elpa

@@ -0,0 +1,2 @@
+debian/cmake-mode-pkg.el
+Auxiliary/cmake-mode.el

debian/cmake-data.emacsen-compat

@@ -1 +0,0 @@
-0

debian/cmake-data.emacsen-install

@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# emacsen install script for the Debian GNU/Linux cmake package
-
-FLAVOR=$1
-PACKAGE=cmake-data
-
-ELDIR=/usr/share/emacs/site-lisp/
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-ELFILE="cmake-mode.el"
-FLAGS="-batch -no-site-file -l path.el -f batch-byte-compile"
-
-if [ ${FLAVOR} != emacs ]; then
-  echo install/${PACKAGE}: Byte-compiling for ${FLAVOR}
-
-  install -m 755 -d ${ELCDIR}
-
-  # Source file symlink (emacsen policy 5C)
-  ln -s "${ELDIR}/${ELFILE}" "${ELCDIR}/${ELFILE}"
-
-  # Compile cmake-mode.el
-  cd ${ELCDIR}
-  cat << EOF > path.el
-(setq load-path (cons "." load-path) byte-compile-warnings nil)
-EOF
-  ${FLAVOR} ${FLAGS} ${ELFILE}
-  rm -f path.el
-fi

debian/cmake-data.emacsen-remove

@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-
-FLAVOR=$1
-PACKAGE=cmake-data
-ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-
-if [ ${FLAVOR} != emacs ]; then
-  echo remove/${PACKAGE}: Purging byte-compiled files for ${FLAVOR}
-  rm -rf "${ELCDIR}"
-fi

debian/cmake-data.emacsen-startup

@@ -1,15 +0,0 @@
-;; -*-emacs-lisp-*-
-;;
-;; Emacs startup file for the Debian GNU/Linux cmake package
-
-(if (file-exists-p "/usr/share/emacs/site-lisp/cmake-mode.el")
- (progn
-  (debian-pkg-add-load-path-item (concat "/usr/share/"
-                                  (symbol-name debian-emacs-flavor)
-                                  "/site-lisp/cmake-data"))
-  (autoload 'cmake-mode "cmake-mode")
-  (setq auto-mode-alist
-   (append '(("CMakeLists\\.txt\\'" . cmake-mode)
-             ("\\.cmake\\'" . cmake-mode))
-    auto-mode-alist)))
- (message "cmake-data removed but not purged, skipping setup"))

debian/cmake-data.install

@@ -1,6 +1,5 @@
 usr/share/aclocal/cmake.m4
 usr/share/cmake-*/
-usr/share/emacs/site-lisp/cmake-mode.el
 usr/share/man/man7/cmake-buildsystem.7
 usr/share/man/man7/cmake-commands.7
 usr/share/man/man7/cmake-compile-features.7

debian/cmake-data.maintscript

@@ -0,0 +1 @@
+rm_conffile /etc/emacs/site-start.d/50cmake-data.el 3.21.2-2~

debian/cmake-mode-pkg.el.in

@@ -0,0 +1,4 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "cmake-mode" "@VERSION@" "major-mode for editing CMake sources"
+	'((emacs "24.1"))
+)

debian/control

@@ -19,7 +19,8 @@ Build-Depends: debhelper-compat (= 13),
                zlib1g-dev,
                python3-sphinx,
                python3-sphinxcontrib.qthelp | python3-sphinx (<< 2.0),
-               dh-sequence-sphinxdoc
+               dh-sequence-sphinxdoc,
+               dh-elpa
 Rules-Requires-Root: no
 Standards-Version: 4.6.0
 Vcs-Git: https://salsa.debian.org/cmake-team/cmake.git
@@ -32,7 +33,8 @@ Multi-Arch: foreign
 Depends: cmake-data (= ${source:Version}),
          procps [!hurd-any],
          ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
+         ${elpa:Depends}
 Recommends: gcc, make
 Suggests: cmake-doc, ninja-build
 Description: cross-platform, open-source make system

debian/not-installed

@@ -1,3 +1,5 @@
 usr/share/doc/cmake/cmcompress/Copyright.txt
 usr/share/doc/cmake-data/Copyright.txt
 usr/share/doc/cmake-data/cmsys/Copyright.txt
+usr/share/doc/cmake-data/cmsys/Copyright.txt
+usr/share/emacs/site-lisp/cmake-mode.el

debian/rules

@@ -69,5 +69,10 @@ override_dh_installdocs-indep:
 override_dh_sphinxdoc:
 	dh_sphinxdoc -pcmake-doc
 
+export ELPA_NAME = cmake-mode
+execute_before_dh_elpa: debian/cmake-mode-pkg.el
+debian/cmake-mode-pkg.el: debian/cmake-mode-pkg.el.in
+	sed -e 's/@VERSION@/$(DEB_VERSION_UPSTREAM)/' $< > $@
+
 %:
-	dh $@ --builddirectory=Build
+	dh $@ --with elpa --builddirectory=Build