From: David Bremner <bremner@debian.org>
Date: Mon, 18 Jul 2011 01:18:58 +0000 (-0300)
Subject: Merge commit '0.6.1'
X-Git-Tag: 0.7_rc1~5
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=a900ddaba661d693764d1a5f58f8b946bb788c4a;hp=-c

Merge commit '0.6.1'

Conflicts:
	lib/Makefile.local

The conflicts are from three kinds of commits not merged into release:
    - typo fixes
    - removal of debug output
    - fix for CLEAN rule

That were never merged into the release branch.
---

a900ddaba661d693764d1a5f58f8b946bb788c4a
diff --combined lib/Makefile.local
index 88d8debc,a6076ab5..9210f0e5
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@@ -72,12 -72,11 +72,10 @@@ $(dir)/libnotmuch.a: $(libnotmuch_modul
  	$(call quiet,AR) rcs $@ $^
  
  $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym
 -	echo $(libnotmuch_modules)
  	$(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@
  
  notmuch.sym: lib/notmuch.h
- 	printf "{\nglobal:\n" > notmuch.sym
- 	sed  -n 's/^[[:space:]]*\(notmuch_[a-z_]*\)[[:space:]]*(.*/'"`printf "\t"`"'\1;/p' $< >> notmuch.sym
- 	printf "local: *;\n};\n" >> notmuch.sym
+ 	sh lib/gen-version-script.sh $< $(libnotmuch_modules) > $@
  
  $(dir)/$(SONAME): $(dir)/$(LIBNAME)
  	ln -sf $(LIBNAME) $@
@@@ -87,7 -86,7 +85,7 @@@ $(dir)/$(LINKER_NAME): $(dir)/$(SONAME
  
  install: install-$(dir)
  
 -# The (often-reused) $dir works fine within targets/pre-requisites,
 +# The (often-reused) $dir works fine within targets/prerequisites,
  # but cannot be used reliably within commands, so copy its value to a
  # variable that is not reused.
  lib := $(dir)
@@@ -101,6 -100,4 +99,6 @@@ install-$(dir): $(dir)/$(LIBNAME
  	$(LIBRARY_INSTALL_POST_COMMAND)
  
  SRCS  := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)
 -CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME) $(dir)$(LIBNAME) libnotmuch.a notmuch.sym
 +CLEAN += $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME)
 +CLEAN += $(dir)/$(LIBNAME) $(dir)/libnotmuch.a notmuch.sym
 +CLEAN += $(dir)/notmuch.h.gch