From: David Bremner <david@tethera.net>
Date: Thu, 18 Feb 2021 11:53:00 +0000 (-0400)
Subject: debian: drop patches
X-Git-Tag: archive/debian/0.31.4-1^0
X-Git-Url: https://git.cworth.org/git?p=notmuch;a=commitdiff_plain;h=3a3208bb7b8bfca1c0bcaa5b45b6ef71aa768612

debian: drop patches

we should by synced up with the tarball again
---

diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
deleted file mode 100644
index 55aa7de9..00000000
--- a/debian/patches/debian-changes
+++ /dev/null
@@ -1,47 +0,0 @@
-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.3.orig/Makefile.global
-+++ notmuch-0.31.3/Makefile.global
-@@ -36,7 +36,6 @@ endif
- endif
- 
- 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
- --------
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7bb82529..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-debian-changes