From aee34fdca3cf80a6eed1e107eb1cdf6879a9ad7c Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 25 Dec 2020 12:37:18 -0400 Subject: [PATCH] debian: drop debian/patches These were originally committed by git-debrebase. Unfortunately git debrebase does not seem to like the notmuch git workflow, so giving up on it for now. --- debian/patches/debian-changes | 30 ------------------------------ debian/patches/series | 1 - 2 files changed, 31 deletions(-) delete mode 100644 debian/patches/debian-changes delete mode 100644 debian/patches/series diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes deleted file mode 100644 index 3e6eefca..00000000 --- a/debian/patches/debian-changes +++ /dev/null @@ -1,30 +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.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 ---- notmuch-0.31.2.orig/test/T360-symbol-hiding.sh -+++ notmuch-0.31.2/test/T360-symbol-hiding.sh -@@ -26,8 +26,9 @@ test_begin_subtest 'checking output' - test_expect_equal "$result" "$output" - - test_begin_subtest 'comparing existing to exported symbols' --nm -P $NOTMUCH_BUILDDIR/lib/libnotmuch.so | awk '$2 == "T" && $1 ~ "^notmuch" {print $1}' | sort | uniq > ACTUAL --sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort | uniq > EXPORTED -+readelf -Ws $NOTMUCH_BUILDDIR/lib/libnotmuch.so | \ -+ awk '$4 == "FUNC" && $5 == "GLOBAL" && $7 != "UND" {print $8}' | sort -u > ACTUAL -+sed -n 's/^\(notmuch_[a-zA-Z0-9_]*\)[[:blank:]]*(.*/\1/p' $NOTMUCH_SRCDIR/lib/notmuch.h | sort -u > EXPORTED - test_expect_equal_file EXPORTED ACTUAL - - test_done 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 -- 2.43.0