[PATCH V2 2/2] {., man}/Makefile.local: edit/remove release-checks.sh related targets

diff --git a/61/50f5860168b38fe3a404b204fc8426685a97bb b/61/50f5860168b38fe3a404b204fc8426685a97bb
new file mode 100644 (file)
index 0000000..d89151d
--- /dev/null
+++ b/61/50f5860168b38fe3a404b204fc8426685a97bb
@@ -0,0 +1,130 @@
+Return-Path: <too@guru-group.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id F201B431FAF\r
+       for <notmuch@notmuchmail.org>; Sat,  1 Sep 2012 02:32:14 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id vN-p3ZCpIkWD for <notmuch@notmuchmail.org>;\r
+       Sat,  1 Sep 2012 02:32:13 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 9D948431FBC\r
+       for <notmuch@notmuchmail.org>; Sat,  1 Sep 2012 02:32:13 -0700 (PDT)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 99A0E100645; Sat,  1 Sep 2012 12:32:21 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH V2 2/2] {.,\r
+       man}/Makefile.local: edit/remove release-checks.sh related targets\r
+Date: Sat,  1 Sep 2012 12:32:08 +0300\r
+Message-Id: <1346491928-2356-2-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.7.1\r
+In-Reply-To: <1346491928-2356-1-git-send-email-tomi.ollila@iki.fi>\r
+References: <1346491928-2356-1-git-send-email-tomi.ollila@iki.fi>\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 01 Sep 2012 09:32:15 -0000\r
+\r
+Use new target release-checks in place of verify-version-debian,\r
+verify-version-python verify-version-manpage. This target executes\r
+devel/release-checks.sh which does all the verifications the three\r
+dropped targets did, and some more.\r
+---\r
+ Makefile.local     | 28 ++++------------------------\r
+ man/Makefile.local |  9 +--------\r
+ 2 files changed, 5 insertions(+), 32 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index de984ab..99f1e19 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -187,7 +187,7 @@ release-message:\r
+ verify-source-tree-and-version: verify-no-dirty-code\r
+ \r
+ .PHONY: verify-no-dirty-code\r
+-verify-no-dirty-code: verify-version-debian verify-version-python verify-version-manpage\r
++verify-no-dirty-code: release-checks\r
+ ifeq ($(IS_GIT),yes)\r
+       @printf "Checking that source tree is clean..."\r
+ ifneq ($(shell git ls-files -m),)\r
+@@ -204,29 +204,9 @@ else\r
+ endif\r
+ endif\r
+ \r
+-.PHONY: verify-version-debian\r
+-verify-version-debian: verify-version-components\r
+-      @echo -n "Checking that Debian package version is $(VERSION)-1..."\r
+-      @[ "$(VERSION)-1" = $$(sed '1{ s/).*//; s/.*(//; q; }' debian/changelog) ] || \\r
+-              (echo "No." && \\r
+-               echo "Please edit version and debian/changelog to have consistent versions." && false)\r
+-      @echo "Good."\r
+-\r
+-.PHONY: verify-version-python\r
+-verify-version-python: verify-version-components\r
+-      @echo -n "Checking that python bindings version is $(VERSION)..."\r
+-      @[ "$(VERSION)" = $$(python -c "execfile('$(PV_FILE)'); print __VERSION__") ] || \\r
+-              (echo "No." && \\r
+-               echo "Please edit version and $(PV_FILE) to have consistent versions." && false)\r
+-      @echo "Good."\r
+-\r
+-.PHONY: verify-version-components\r
+-verify-version-components:\r
+-      @echo -n "Checking that $(VERSION) consists only of digits and periods..."\r
+-      @echo $(VERSION) | grep -q -x '^[0-9.]*$$' || \\r
+-              (echo "No." && \\r
+-               echo "Please follow the instructions in RELEASING to choose a version" && false)\r
+-      @echo "Good."\r
++.PHONY: release-checks\r
++release-checks:\r
++      exec devel/release-checks.sh\r
+ \r
+ .PHONY: verify-newer\r
+ verify-newer:\r
+diff --git a/man/Makefile.local b/man/Makefile.local\r
+index d43a949..72e2a18 100644\r
+--- a/man/Makefile.local\r
++++ b/man/Makefile.local\r
+@@ -32,7 +32,7 @@ COMPRESSED_MAN := $(MAN1_GZ) $(MAN5_GZ) $(MAN7_GZ)\r
+ %.gz: %\r
+       gzip --stdout $^ > $@\r
+ \r
+-.PHONY: install-man update-man-versions verify-version-manpage\r
++.PHONY: install-man update-man-versions\r
+ \r
+ install-man: $(COMPRESSED_MAN)\r
+       mkdir -p "$(DESTDIR)$(mandir)/man1"\r
+@@ -43,13 +43,6 @@ install-man: $(COMPRESSED_MAN)\r
+       install -m0644 $(MAN7_GZ) $(DESTDIR)/$(mandir)/man7\r
+       cd $(DESTDIR)/$(mandir)/man1 && ln -sf notmuch.1.gz notmuch-setup.1.gz\r
+ \r
+-verify-version-manpage: verify-version-components\r
+-      @echo -n "Checking that manual page version is $(VERSION)..."\r
+-      @[ "$(VERSION)" = $$(sed -n '/^[.]TH NOTMUCH 1/{s/.*"Notmuch //;s/".*//p;}' $(MAIN_PAGE)) ] || \\r
+-              (echo "No." && \\r
+-               echo "Please edit version and notmuch.1 to have consistent versions." && false)\r
+-      @echo "Good."\r
+-\r
+ update-man-versions: $(MAN_SOURCE)\r
+       for file in $(MAN_SOURCE); do \\r
+           cp $$file $$file.bak ; \\r
+-- \r
+1.7.11.4\r
+\r