--- /dev/null
+Return-Path: <jani@nikula.org>\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 E60F5431FD2\r
+ for <notmuch@notmuchmail.org>; Wed, 4 Dec 2013 10:36:59 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 zvvjqHUeuYKL for <notmuch@notmuchmail.org>;\r
+ Wed, 4 Dec 2013 10:36:53 -0800 (PST)\r
+Received: from mail-qa0-f49.google.com (mail-qa0-f49.google.com\r
+ [209.85.216.49]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id A412F431FD0\r
+ for <notmuch@notmuchmail.org>; Wed, 4 Dec 2013 10:36:53 -0800 (PST)\r
+Received: by mail-qa0-f49.google.com with SMTP id ii20so6967965qab.1\r
+ for <notmuch@notmuchmail.org>; Wed, 04 Dec 2013 10:36:51 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:in-reply-to:references\r
+ :user-agent:date:message-id:mime-version:content-type;\r
+ bh=D9pMdkRg5dqzwVZkHgPAvbPHeE91jBcSr20D80Mi6iM=;\r
+ b=jgFbKrv9vEaHCQwD709PsJhedIina2AfDngyCjcT4SuA67cPcEWR+pvb0BMYixy8y3\r
+ YvzMw9CDOU3VrwxYywgT5UIRwsyRsPd8FjTHJ2Qfvup19qXeVeveYCnYd4GNvAa0hv4o\r
+ YaiRZdEtu0FYUz+E2+Sdtu2KpDgv6uPuRruKVWFMs/EFH9+7cwhhG/eptDFyqcB6KpUR\r
+ VqdMKWMDTVGoCbS9G2U+Ete6FS+STzMG7c2Ts2+Mmjfs7oPtcWXudguN3eeT6CO+SISW\r
+ mCsP8d3iyo4z/5ZBv6z+cKZr1OYlxJRgTtb6aSOIDbgG6LZVAembih5oI24XhD2sHTSR\r
+ vFHQ==\r
+X-Gm-Message-State:\r
+ ALoCoQmic1Z4Oi8NNg/N3dw3IkTMNq82ESgC+SLLWCvkNlSIeFf+HZ7DFRjekfTGSMsfr7a1OE9j\r
+X-Received: by 10.49.15.227 with SMTP id a3mr111501189qed.66.1386182211832;\r
+ Wed, 04 Dec 2013 10:36:51 -0800 (PST)\r
+Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
+ by mx.google.com with ESMTPSA id b4sm43197867qai.7.2013.12.04.10.36.50\r
+ for <multiple recipients>\r
+ (version=TLSv1.1 cipher=RC4-SHA bits=128/128);\r
+ Wed, 04 Dec 2013 10:36:51 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Austin Clements <amdragon@MIT.EDU>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/3] lib: Make VERSION macros agree with soname version\r
+In-Reply-To: <1386173986-9624-1-git-send-email-amdragon@mit.edu>\r
+References: <1386173986-9624-1-git-send-email-amdragon@mit.edu>\r
+User-Agent: Notmuch/0.17~rc2+4~gd7b0a0a (http://notmuchmail.org) Emacs/23.2.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Wed, 04 Dec 2013 19:36:33 +0100\r
+Message-ID: <87txeosbta.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Wed, 04 Dec 2013 18:37:00 -0000\r
+\r
+On Wed, 04 Dec 2013, Austin Clements <amdragon@MIT.EDU> wrote:\r
+> We have two distinct "library version" numbers: the soname version and\r
+> the version macros. We need both for different reasons: the version\r
+> macros enable easy compile-time version detection (and conditional\r
+> compilation), while the soname version enables runtime version\r
+> detection (which includes the version checking done by things like the\r
+> Python bindings).\r
+>\r
+> However, currently, these two version numbers are different, which is\r
+> unnecessary and can lead to confusion (especially in things like\r
+> Debian, which include the soname version in the package name). This\r
+> patch makes them the same by bumping the version macros up to agree\r
+> with the soname version.\r
+\r
+The patches look good to me. Thanks for spotting and fixing this in the\r
+nick of time before releasing.\r
+\r
+BR,\r
+Jani.\r
+\r
+\r
+>\r
+> (We should probably keep the version number in just one place so they\r
+> can't get out of sync, but that can be done in another patch.)\r
+> ---\r
+> lib/Makefile.local | 3 +++\r
+> lib/notmuch.h | 8 ++++++--\r
+> 2 files changed, 9 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/lib/Makefile.local b/lib/Makefile.local\r
+> index 155ac02..cd2c60d 100644\r
+> --- a/lib/Makefile.local\r
+> +++ b/lib/Makefile.local\r
+> @@ -18,6 +18,9 @@ LIBNOTMUCH_VERSION_MINOR = 0\r
+> # simply compatible changes to the implementation).\r
+> LIBNOTMUCH_VERSION_RELEASE = 0\r
+> \r
+> +# Note: Don't forget to change the VERSION macros in notmuch.h when\r
+> +# any of the above change.\r
+> +\r
+> ifeq ($(PLATFORM),MACOSX)\r
+> LIBRARY_SUFFIX = dylib\r
+> # On OS X, library version numbers go before suffix.\r
+> diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+> index 7c3a30c..42188a8 100644\r
+> --- a/lib/notmuch.h\r
+> +++ b/lib/notmuch.h\r
+> @@ -41,8 +41,12 @@ NOTMUCH_BEGIN_DECLS\r
+> #define TRUE 1\r
+> #endif\r
+> \r
+> -#define NOTMUCH_MAJOR_VERSION 0\r
+> -#define NOTMUCH_MINOR_VERSION 17\r
+> +/*\r
+> + * The library version number. This must agree with the soname\r
+> + * version in Makefile.local.\r
+> + */\r
+> +#define NOTMUCH_MAJOR_VERSION 3\r
+> +#define NOTMUCH_MINOR_VERSION 0\r
+> #define NOTMUCH_MICRO_VERSION 0\r
+> \r
+> /*\r
+> -- \r
+> 1.8.4.rc3\r
projects / notmuch-archives.git / commitdiff