mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-12-23 01:44:52 +01:00
Merge branch 'release'
This commit is contained in:
commit
06a6298262
4 changed files with 25 additions and 1 deletions
7
debian/changelog
vendored
7
debian/changelog
vendored
|
@ -1,3 +1,10 @@
|
||||||
|
notmuch (0.31.2-4) unstable; urgency=medium
|
||||||
|
|
||||||
|
* Move prerequisite to file targets from phony ones. Thanks to
|
||||||
|
Lucas Nussbaum for the report. (Closes: #976934).
|
||||||
|
|
||||||
|
-- David Bremner <bremner@debian.org> Thu, 10 Dec 2020 21:02:20 -0400
|
||||||
|
|
||||||
notmuch (0.31.2-3) unstable; urgency=medium
|
notmuch (0.31.2-3) unstable; urgency=medium
|
||||||
|
|
||||||
* Switch to debhelper compat level 13
|
* Switch to debhelper compat level 13
|
||||||
|
|
16
debian/patches/debian-changes
vendored
Normal file
16
debian/patches/debian-changes
vendored
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
This is an autogenerated patch header for a single-debian-patch file. The
|
||||||
|
delta against upstream is either kept as a single patch, or maintained
|
||||||
|
in some VCS, and exported as a single patch instead of more manageable
|
||||||
|
atomic patches.
|
||||||
|
|
||||||
|
--- notmuch-0.31.2.orig/doc/Makefile.local
|
||||||
|
+++ notmuch-0.31.2/doc/Makefile.local
|
||||||
|
@@ -43,7 +43,7 @@ INFO_INFO_FILES := $(INFO_TEXI_FILES:.te
|
||||||
|
rm -f $@ && gzip --no-name --stdout $^ > $@
|
||||||
|
|
||||||
|
ifeq ($(WITH_EMACS),1)
|
||||||
|
-$(DOCBUILDDIR)/.roff.stamp sphinx-html sphinx-texinfo: docstring.stamp
|
||||||
|
+$(DOCBUILDDIR)/.roff.stamp $(DOCBUILDDIR)/.html.stamp $(DOCBUILDDIR)/.texi.stamp : docstring.stamp
|
||||||
|
endif
|
||||||
|
|
||||||
|
sphinx-html: $(DOCBUILDDIR)/.html.stamp
|
1
debian/patches/series
vendored
Normal file
1
debian/patches/series
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
debian-changes
|
|
@ -43,7 +43,7 @@ INFO_INFO_FILES := $(INFO_TEXI_FILES:.texi=.info)
|
||||||
rm -f $@ && gzip --no-name --stdout $^ > $@
|
rm -f $@ && gzip --no-name --stdout $^ > $@
|
||||||
|
|
||||||
ifeq ($(WITH_EMACS),1)
|
ifeq ($(WITH_EMACS),1)
|
||||||
$(DOCBUILDDIR)/.roff.stamp sphinx-html sphinx-texinfo: docstring.stamp
|
$(DOCBUILDDIR)/.roff.stamp $(DOCBUILDDIR)/.html.stamp $(DOCBUILDDIR)/.texi.stamp : docstring.stamp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
sphinx-html: $(DOCBUILDDIR)/.html.stamp
|
sphinx-html: $(DOCBUILDDIR)/.html.stamp
|
||||||
|
|
Loading…
Reference in a new issue