Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 99121177E3 for ; Fri, 3 Oct 2014 17:37:52 +0000 (UTC) Received: (qmail 95564 invoked by uid 500); 3 Oct 2014 17:37:52 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 95511 invoked by uid 500); 3 Oct 2014 17:37:52 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 95355 invoked by uid 99); 3 Oct 2014 17:37:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Oct 2014 17:37:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 038B3A1F97A; Fri, 3 Oct 2014 17:37:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Fri, 03 Oct 2014 17:37:53 -0000 Message-Id: In-Reply-To: <4bbb403a894d4859a3e7db43967fbfb5@git.apache.org> References: <4bbb403a894d4859a3e7db43967fbfb5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: debian/rules Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4539237a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4539237a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4539237a Branch: refs/heads/trunk Commit: 4539237ab65b54a32d0e8b8a5f3c5bce80d8f4ee Parents: cb8dc4e 8952d6c Author: Brandon Williams Authored: Fri Oct 3 12:37:28 2014 -0500 Committer: Brandon Williams Committed: Fri Oct 3 12:37:28 2014 -0500 ---------------------------------------------------------------------- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4539237a/debian/rules ---------------------------------------------------------------------- diff --cc debian/rules index 31fd0c0,de5583f..405175d --- a/debian/rules +++ b/debian/rules @@@ -3,10 -3,8 +3,10 @@@ # Uncomment to enable verbose mode. #export DH_VERBOSE=1 +include /usr/share/dpatch/dpatch.make + ANT = /usr/bin/ant - VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \([^-]*\).*/\1/p') + VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \([^-|~|+]*\).*/\1/p') test: dh_testdir