* [PATCH 1/5] debian: return an error if debian snapshot build fails
2019-12-04 8:47 More debian packaging cleanup Daniel Kahn Gillmor
@ 2019-12-04 8:47 ` Daniel Kahn Gillmor
2019-12-04 8:47 ` [PATCH 2/5] debian: ship notmuch-emacs-mua.desktop from "make install" copy Daniel Kahn Gillmor
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Daniel Kahn Gillmor @ 2019-12-04 8:47 UTC (permalink / raw)
To: Notmuch Mail
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
Makefile.local | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/Makefile.local b/Makefile.local
index 7c12612d..586cdf75 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -97,14 +97,16 @@ pre-release:
.PHONY: debian-snapshot
debian-snapshot:
make VERSION=$(VERSION) clean
- TMPFILE=$$(mktemp /tmp/notmuch.XXXXXX); \
- cp debian/changelog $${TMPFILE}; \
- EDITOR=/bin/true dch -b -v $(VERSION)+1 \
- -D UNRELEASED 'test build, not for upload'; \
- echo '3.0 (native)' > debian/source/format; \
- debuild -us -uc; \
- mv -f $${TMPFILE} debian/changelog; \
- echo '3.0 (quilt)' > debian/source/format
+ RETVAL=0 && \
+ TMPFILE=$$(mktemp /tmp/notmuch.XXXXXX) && \
+ cp debian/changelog $${TMPFILE} && \
+ (EDITOR=/bin/true dch -b -v $(VERSION)+1 \
+ -D UNRELEASED 'test build, not for upload' && \
+ echo '3.0 (native)' > debian/source/format && \
+ debuild -us -uc); RETVAL=$$? \
+ mv -f $${TMPFILE} debian/changelog; \
+ echo '3.0 (quilt)' > debian/source/format; \
+ exit $$RETVAL
.PHONY: release-message
release-message:
--
2.24.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/5] debian: ship notmuch-emacs-mua.desktop from "make install" copy
2019-12-04 8:47 More debian packaging cleanup Daniel Kahn Gillmor
2019-12-04 8:47 ` [PATCH 1/5] debian: return an error if debian snapshot build fails Daniel Kahn Gillmor
@ 2019-12-04 8:47 ` Daniel Kahn Gillmor
2019-12-04 8:47 ` [PATCH 3/5] debian: install notmuch(3) manpage in libnotmuch-dev Daniel Kahn Gillmor
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Daniel Kahn Gillmor @ 2019-12-04 8:47 UTC (permalink / raw)
To: Notmuch Mail
This helps dh_missing know what's going on.
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
debian/notmuch.install | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/notmuch.install b/debian/notmuch.install
index b4847fe5..60f09712 100644
--- a/debian/notmuch.install
+++ b/debian/notmuch.install
@@ -1,5 +1,5 @@
-emacs/notmuch-emacs-mua.desktop usr/share/applications
usr/bin/notmuch
usr/bin/notmuch-emacs-mua
+usr/share/applications/notmuch-emacs-mua.desktop
usr/share/bash-completion
usr/share/zsh/vendor-completions
--
2.24.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/5] debian: install notmuch(3) manpage in libnotmuch-dev
2019-12-04 8:47 More debian packaging cleanup Daniel Kahn Gillmor
2019-12-04 8:47 ` [PATCH 1/5] debian: return an error if debian snapshot build fails Daniel Kahn Gillmor
2019-12-04 8:47 ` [PATCH 2/5] debian: ship notmuch-emacs-mua.desktop from "make install" copy Daniel Kahn Gillmor
@ 2019-12-04 8:47 ` Daniel Kahn Gillmor
2019-12-04 8:47 ` [PATCH 4/5] debian: ship notmuch-setup(1) as a copy of notmuch(1) Daniel Kahn Gillmor
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Daniel Kahn Gillmor @ 2019-12-04 8:47 UTC (permalink / raw)
To: Notmuch Mail
dh_missing noticed that we are building this manpage but not shipping
it in debian.
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
debian/libnotmuch-dev.manpages | 1 +
1 file changed, 1 insertion(+)
create mode 100644 debian/libnotmuch-dev.manpages
diff --git a/debian/libnotmuch-dev.manpages b/debian/libnotmuch-dev.manpages
new file mode 100644
index 00000000..9c4bd5d3
--- /dev/null
+++ b/debian/libnotmuch-dev.manpages
@@ -0,0 +1 @@
+usr/share/man/man3/notmuch.3.gz
--
2.24.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/5] debian: ship notmuch-setup(1) as a copy of notmuch(1)
2019-12-04 8:47 More debian packaging cleanup Daniel Kahn Gillmor
` (2 preceding siblings ...)
2019-12-04 8:47 ` [PATCH 3/5] debian: install notmuch(3) manpage in libnotmuch-dev Daniel Kahn Gillmor
@ 2019-12-04 8:47 ` Daniel Kahn Gillmor
2019-12-04 8:47 ` [PATCH 5/5] debian: Remove python2 detritus Daniel Kahn Gillmor
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Daniel Kahn Gillmor @ 2019-12-04 8:47 UTC (permalink / raw)
To: Notmuch Mail
This was being shipped by "make install", but we weren't shipping it
in the debian package. Thanks to dh_missing for noticing!
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
debian/notmuch.manpages | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/notmuch.manpages b/debian/notmuch.manpages
index da91fc00..3ac2ff5b 100644
--- a/debian/notmuch.manpages
+++ b/debian/notmuch.manpages
@@ -10,6 +10,7 @@ usr/share/man/man1/notmuch-reindex.1.gz
usr/share/man/man1/notmuch-reply.1.gz
usr/share/man/man1/notmuch-restore.1.gz
usr/share/man/man1/notmuch-search.1.gz
+usr/share/man/man1/notmuch-setup.1.gz
usr/share/man/man1/notmuch-show.1.gz
usr/share/man/man1/notmuch-tag.1.gz
usr/share/man/man1/notmuch.1.gz
--
2.24.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/5] debian: Remove python2 detritus
2019-12-04 8:47 More debian packaging cleanup Daniel Kahn Gillmor
` (3 preceding siblings ...)
2019-12-04 8:47 ` [PATCH 4/5] debian: ship notmuch-setup(1) as a copy of notmuch(1) Daniel Kahn Gillmor
@ 2019-12-04 8:47 ` Daniel Kahn Gillmor
2019-12-09 21:00 ` More debian packaging cleanup Tomi Ollila
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: Daniel Kahn Gillmor @ 2019-12-04 8:47 UTC (permalink / raw)
To: Notmuch Mail
Since we removed python-notmuch, we do not need to retain this file
any longer.
Signed-off-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
debian/python-notmuch.install | 1 -
1 file changed, 1 deletion(-)
delete mode 100644 debian/python-notmuch.install
diff --git a/debian/python-notmuch.install b/debian/python-notmuch.install
deleted file mode 100644
index b2cc1360..00000000
--- a/debian/python-notmuch.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/python2*
--
2.24.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: More debian packaging cleanup
2019-12-04 8:47 More debian packaging cleanup Daniel Kahn Gillmor
` (4 preceding siblings ...)
2019-12-04 8:47 ` [PATCH 5/5] debian: Remove python2 detritus Daniel Kahn Gillmor
@ 2019-12-09 21:00 ` Tomi Ollila
2019-12-20 18:07 ` Antoine Beaupré
2019-12-21 0:14 ` David Bremner
7 siblings, 0 replies; 9+ messages in thread
From: Tomi Ollila @ 2019-12-09 21:00 UTC (permalink / raw)
To: Notmuch Mail
On Wed, Dec 04 2019, Daniel Kahn Gillmor wrote:
> This series should apply after "wrap-and-sort -ast" v2 is applied
> (id:20191110173748.25792-5-dkg@fifthhorseman.net).
>
> In this series, i clean up a few things that i noticed from applying
> dh_missing to the debian packaging. In particular, we were failing to
> ship notmuch(3) (programmer's manual for libnotmuch) and
> notmuch-setup(1) (a symlink or copy of notmuch(1) that is referenced
> in notmuch-config(1)).
>
> This doesn't get us to the point of enabling dh 12 cleanly yet (more
> elpa-notmuch cleanup might be blocked on #946142 and answers to the
> questions i raised in id:87a7887akl.fsf@fifthhorseman.net), but it's
> a lot of the way there.
>
> Comments and feedback welcome!
As far as I understand this series looks good to me.
Tomi
>
> --dkg
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: More debian packaging cleanup
2019-12-04 8:47 More debian packaging cleanup Daniel Kahn Gillmor
` (5 preceding siblings ...)
2019-12-09 21:00 ` More debian packaging cleanup Tomi Ollila
@ 2019-12-20 18:07 ` Antoine Beaupré
2019-12-21 0:14 ` David Bremner
7 siblings, 0 replies; 9+ messages in thread
From: Antoine Beaupré @ 2019-12-20 18:07 UTC (permalink / raw)
To: Daniel Kahn Gillmor, Notmuch Mail
On 2019-12-04 03:47:37, Daniel Kahn Gillmor wrote:
> This series should apply after "wrap-and-sort -ast" v2 is applied
> (id:20191110173748.25792-5-dkg@fifthhorseman.net).
>
> In this series, i clean up a few things that i noticed from applying
> dh_missing to the debian packaging. In particular, we were failing to
> ship notmuch(3) (programmer's manual for libnotmuch) and
> notmuch-setup(1) (a symlink or copy of notmuch(1) that is referenced
> in notmuch-config(1)).
>
> This doesn't get us to the point of enabling dh 12 cleanly yet (more
> elpa-notmuch cleanup might be blocked on #946142 and answers to the
> questions i raised in id:87a7887akl.fsf@fifthhorseman.net), but it's
> a lot of the way there.
Wow, that's great work! I can't believe we weren't shipping those
manpages! :)
LGTM...
a.
--
If we do not do the impossible, we shall be faced with the unthinkable.
- Murray Bookchin
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: More debian packaging cleanup
2019-12-04 8:47 More debian packaging cleanup Daniel Kahn Gillmor
` (6 preceding siblings ...)
2019-12-20 18:07 ` Antoine Beaupré
@ 2019-12-21 0:14 ` David Bremner
7 siblings, 0 replies; 9+ messages in thread
From: David Bremner @ 2019-12-21 0:14 UTC (permalink / raw)
To: Daniel Kahn Gillmor, Notmuch Mail
Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
> This series should apply after "wrap-and-sort -ast" v2 is applied
> (id:20191110173748.25792-5-dkg@fifthhorseman.net).
>
pushed to master
d
^ permalink raw reply [flat|nested] 9+ messages in thread