Complete Debian packaging transition to dh 12

Complete Debian packaging transition to dh 12

[Daniel Kahn Gillmor]

This series follows the series introduced by
id:20191204084742.398298-1-dkg@fifthhorseman.net

Its goal is to move the notmuch debian packaging to dh 12.

To do this, the series accepts the conclusions about info files
reached in the thread anchored at id:87a7887akl.fsf@fifthhorseman.net,
and it also relies on dh_elpa having #946142 resolved, for example, by
merging https://salsa.debian.org/emacsen-team/dh-elpa/merge_requests/2
into that project.

What remains here is pretty simple mechanical work, which shouldn't
have an effect on anything else in notmuch other than how the debian
package itself gets assembled.

     --dkg

[PATCH 1/4] debian: record upstream files which should not be installed by the package

[Daniel Kahn Gillmor]

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
 debian/not-installed | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 debian/not-installed

diff --git a/debian/not-installed b/debian/not-installed
new file mode 100644
index 00000000..fd929459
--- /dev/null
+++ b/debian/not-installed
@@ -0,0 +1,3 @@
+usr/share/applications/mimeinfo.cache
+usr/share/info/dir
+usr/share/emacs/site-lisp/*.elc
-- 
2.24.0

[PATCH 2/4] debian: ship info files in the standard location

[Daniel Kahn Gillmor]

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
 debian/elpa-notmuch.elpa | 1 -
 debian/elpa-notmuch.info | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 debian/elpa-notmuch.info

diff --git a/debian/elpa-notmuch.elpa b/debian/elpa-notmuch.elpa
index 19e3ba51..a924468a 100644
--- a/debian/elpa-notmuch.elpa
+++ b/debian/elpa-notmuch.elpa
@@ -1,3 +1,2 @@
 emacs/*.el
 emacs/notmuch-logo.png
-debian/tmp/usr/share/info/*
diff --git a/debian/elpa-notmuch.info b/debian/elpa-notmuch.info
new file mode 100644
index 00000000..0ac0fbf6
--- /dev/null
+++ b/debian/elpa-notmuch.info
@@ -0,0 +1 @@
+usr/share/info/*.info
-- 
2.24.0

[PATCH 3/4] debian elpa-notmuch: ship elisp and .png from "make install"

[Daniel Kahn Gillmor]

Rather than ship from the source directories, ship these files from
where they're installed by "make install".

This doesn't resolve all the dh_missing warnings yet (due to #946142),
but it leaves the last bit of that problem in the hands of the dh-elpa
package, and it's not due to notmuch's packaging any longer.

Note that notmuch-pkg.el is only relevant for elpa, so it was not
installed by "make install", and has to be extracted deliberately from
the source tree.

Note also that we now don't ship make-deps.el or rstdoc.el, as these
are build tools and don't belong in the deployed package.

Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
 debian/elpa-notmuch.elpa | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/elpa-notmuch.elpa b/debian/elpa-notmuch.elpa
index a924468a..4712b73f 100644
--- a/debian/elpa-notmuch.elpa
+++ b/debian/elpa-notmuch.elpa
@@ -1,2 +1,3 @@
-emacs/*.el
-emacs/notmuch-logo.png
+debian/tmp/usr/share/emacs/site-lisp/*.el
+debian/tmp/usr/share/emacs/site-lisp/notmuch-logo.png
+emacs/notmuch-pkg.el
-- 
2.24.0

[PATCH 4/4] debian: move packaging to dh 12

[Daniel Kahn Gillmor]

---
 debian/compat  | 1 -
 debian/control | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 debian/compat

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de3947..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 1c9427b2..fb2b31c1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Conflicts:
  ruby1.8,
 Build-Depends:
  bash-completion (>=1.9.0~),
- debhelper (>= 11~),
+ debhelper-compat (= 12),
  dh-elpa (>= 1.3),
  dh-python,
  dpkg-dev (>= 1.17.14),
-- 
2.24.0

Re: Complete Debian packaging transition to dh 12

[Antoine Beaupré]

On 2019-12-09 13:49:06, Daniel Kahn Gillmor wrote:
> This series follows the series introduced by
> id:20191204084742.398298-1-dkg@fifthhorseman.net
>
> Its goal is to move the notmuch debian packaging to dh 12.
>
> To do this, the series accepts the conclusions about info files
> reached in the thread anchored at id:87a7887akl.fsf@fifthhorseman.net,
> and it also relies on dh_elpa having #946142 resolved, for example, by
> merging https://salsa.debian.org/emacsen-team/dh-elpa/merge_requests/2
> into that project.
>
> What remains here is pretty simple mechanical work, which shouldn't
> have an effect on anything else in notmuch other than how the debian
> package itself gets assembled.

I'm not very familiar with the dh-elpa and dh-missing voodoo that's
going on here, I must admit. But this otherwise seems to make sense
after a quick review, so: LGTM! :)

a.
-- 
C'est trop facile quand les guerres sont finies
D'aller gueuler que c'était la dernière
Amis bourgeois vous me faites envie
Ne voyez vous pas donc point vos cimetières?
                        - Jaques Brel

Re: Complete Debian packaging transition to dh 12

[David Bremner]

Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:

> This series follows the series introduced by
> id:20191204084742.398298-1-dkg@fifthhorseman.net
>
> Its goal is to move the notmuch debian packaging to dh 12.

pushed to master