From 0bbd2b2a671de32afc5766e8d8a7e4f400b88709 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Mon, 21 Nov 2011 18:34:24 +0200 Subject: [PATCH] [PATCH] make release: use sed to check debian version --- 89/23c3619e81f97b0aa7d555b3c8cb33ab04d8d7 | 76 +++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 89/23c3619e81f97b0aa7d555b3c8cb33ab04d8d7 diff --git a/89/23c3619e81f97b0aa7d555b3c8cb33ab04d8d7 b/89/23c3619e81f97b0aa7d555b3c8cb33ab04d8d7 new file mode 100644 index 000000000..e0318d62b --- /dev/null +++ b/89/23c3619e81f97b0aa7d555b3c8cb33ab04d8d7 @@ -0,0 +1,76 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 74048429E21 + for ; Mon, 21 Nov 2011 08:34:26 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id 6ohzUAoSNfSv for ; + Mon, 21 Nov 2011 08:34:26 -0800 (PST) +Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id D3EFB431FD0 + for ; Mon, 21 Nov 2011 08:34:25 -0800 (PST) +Received: from taco2.nixu.fi (taco2.nixu.fi [194.197.118.31]) + by taco2.nixu.fi (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id + pALGYOAQ009373 + for ; Mon, 21 Nov 2011 18:34:24 +0200 +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH] make release: use sed to check debian version +In-Reply-To: +References: +User-Agent: Notmuch/0.10~rc1+16~gc832dad (http://notmuchmail.org) Emacs/23.3.1 + (i686-pc-linux-gnu) +X-Face: HhBM'cA~ +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 21 Nov 2011 16:34:26 -0000 + +Use common sed tool instead of dpkg-parsechangelog (which is usually +available on debian systems only) to verify that debian version +information is consistent with version file. +--- + Makefile.local | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.local b/Makefile.local +index 02afdd0..c94402b 100644 +--- a/Makefile.local ++++ b/Makefile.local +@@ -207,7 +207,7 @@ endif + .PHONY: verify-version-debian + verify-version-debian: verify-version-components + @echo -n "Checking that Debian package version is $(VERSION)-1..." +- @[ "$(VERSION)-1" = $$(dpkg-parsechangelog | grep ^Version | awk '{print $$2}') ] || \ ++ @[ "$(VERSION)-1" = $$(sed '1{ s/).*//; s/.*(//; q; }' debian/changelog) ] || \ + (echo "No." && \ + echo "Please edit version and debian/changelog to have consistent versions." && false) + @echo "Good." +-- +1.7.7.3 + -- 2.26.2