X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=debian%2Fpatches%2Fdebian-changes;h=55aa7de92e0336cf781811f5ffdc5275a9839155;hb=15d8067c0a209a24d757b416107d92007529f01f;hp=40ee7d00a7806899b2a424bab9eee2741bfabbac;hpb=06a629826208358dc6448986a47423124d7e0479;p=notmuch

diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index 40ee7d00..55aa7de9 100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -3,14 +3,45 @@ 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
+--- notmuch-0.31.3.orig/Makefile.global
++++ notmuch-0.31.3/Makefile.global
+@@ -36,7 +36,6 @@ endif
  endif
  
- sphinx-html: $(DOCBUILDDIR)/.html.stamp
+ UPSTREAM_TAG=$(subst ~,_,$(VERSION))
+-DEB_TAG=debian/$(UPSTREAM_TAG)-1
+ 
+ RELEASE_HOST=notmuchmail.org
+ RELEASE_DIR=/srv/notmuchmail.org/www/releases
+--- notmuch-0.31.3.orig/Makefile.local
++++ notmuch-0.31.3/Makefile.local
+@@ -73,12 +73,11 @@ release: verify-source-tree-and-version
+ 	$(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE)
+ 	ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
+ 	pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
+-	git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
+ 	mkdir -p releases
+ 	mv $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) releases
+ 	$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
+ ifeq ($(REALLY_UPLOAD),yes)
+-	git push origin $(VERSION) $(DEB_TAG) release pristine-tar
++	git push origin $(VERSION) release pristine-tar
+ 	cd releases && scp $(TAR_FILE) $(SHA256_FILE) $(DETACHED_SIG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
+ 	ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(TAR_FILE)"
+ 	rsync --verbose --delete --recursive doc/_build/html/ $(RELEASE_HOST):$(DOC_DIR)
+@@ -90,7 +89,6 @@ pre-release:
+ 	$(MAKE) VERSION=$(VERSION) clean
+ 	$(MAKE) VERSION=$(VERSION) test
+ 	git tag -s -m "$(PACKAGE) $(VERSION) release" $(UPSTREAM_TAG)
+-	git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" $(DEB_TAG)
+ 	$(MAKE) VERSION=$(VERSION) $(SHA256_FILE) $(DETACHED_SIG_FILE)
+ 	ln -sf $(TAR_FILE) $(DEB_TAR_FILE)
+ 	pristine-tar commit $(DEB_TAR_FILE) $(UPSTREAM_TAG)
+--- notmuch-0.31.3.orig/NEWS
++++ notmuch-0.31.3/NEWS
+@@ -1,4 +1,5 @@
+ Notmuch 0.31.3 (2020-12-25)
++===========================
+ 
+ Bindings
+ --------