From 2e7956e8841e3f5a6b581f5fa9bc1915339ea6fe Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 7 Jul 2011 22:36:04 -0300 Subject: debian: install README.Debian files for notmuch-vim and notmuch-emacs. The notmuch-vim README.Debian in particular is quite important since it discussions the need to install the package with vim-addons --- debian/README.notmuch-emacs | 8 -------- debian/README.notmuch-vim | 8 -------- debian/notmuch-emacs.README.Debian | 8 ++++++++ debian/notmuch-vim.README.Debian | 8 ++++++++ 4 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 debian/README.notmuch-emacs delete mode 100644 debian/README.notmuch-vim create mode 100644 debian/notmuch-emacs.README.Debian create mode 100644 debian/notmuch-vim.README.Debian diff --git a/debian/README.notmuch-emacs b/debian/README.notmuch-emacs deleted file mode 100644 index 713523b4..00000000 --- a/debian/README.notmuch-emacs +++ /dev/null @@ -1,8 +0,0 @@ - -* This package currently works only with emacs 23. Users of - pre-release snapshots of emacs 24 can expect problems. - -* For help in getting started with notmuch and the emacs interface, - see /usr/share/doc/notmuch/README. - - -- David Bremner , Fri, 1 Jul 2011 11:41:26 -0300 diff --git a/debian/README.notmuch-vim b/debian/README.notmuch-vim deleted file mode 100644 index ec052eef..00000000 --- a/debian/README.notmuch-vim +++ /dev/null @@ -1,8 +0,0 @@ -notmuch for Debian -================== - -To use the vim plugin, please install it using vim-addons(1) - -See also /usr/share/doc/notmuch/README. - - -- David Bremner , Fri, 1 Jul 2011 11:34:39 -0300 diff --git a/debian/notmuch-emacs.README.Debian b/debian/notmuch-emacs.README.Debian new file mode 100644 index 00000000..713523b4 --- /dev/null +++ b/debian/notmuch-emacs.README.Debian @@ -0,0 +1,8 @@ + +* This package currently works only with emacs 23. Users of + pre-release snapshots of emacs 24 can expect problems. + +* For help in getting started with notmuch and the emacs interface, + see /usr/share/doc/notmuch/README. + + -- David Bremner , Fri, 1 Jul 2011 11:41:26 -0300 diff --git a/debian/notmuch-vim.README.Debian b/debian/notmuch-vim.README.Debian new file mode 100644 index 00000000..ec052eef --- /dev/null +++ b/debian/notmuch-vim.README.Debian @@ -0,0 +1,8 @@ +notmuch for Debian +================== + +To use the vim plugin, please install it using vim-addons(1) + +See also /usr/share/doc/notmuch/README. + + -- David Bremner , Fri, 1 Jul 2011 11:34:39 -0300 -- cgit v1.2.3 From 7e3cb13a05abc6892d709f8f5629d42dbf13bd9b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 7 Jul 2011 22:39:33 -0300 Subject: debian: start new changelog stanza for post 0.6 bugfix release The version numbering scheme of n.n.n is chosen so as not to confuse tools that rely on the presence of a dash to detect non-native packages. --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0fad868a..c17426d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +notmuch (0.6.1) unstable; urgency=low + + * Properly install README.Debian in notmuch-vim (Closes: #632992). + Thanks to Jason Woofenden for the report. + + -- David Bremner Thu, 07 Jul 2011 22:41:13 -0300 + notmuch (0.6) unstable; urgency=low * New upstream release; see /usr/share/doc/notmuch/NEWS for -- cgit v1.2.3 From f01b8d1331d099f6bb53f94f7313de0c6c188e4e Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Sat, 9 Jul 2011 21:17:09 +0200 Subject: debian: strictly depend on the same version of libnotmuch It took quite some time to debug why folder: searches didn't work for me though I had notmuch 0.6~rc1 installed. amdragon in #notmuch found out that I still had libnotmuch1 0.5+nmu3 installed. To prevent the same problem in the future let notmuch depend on the same version of libnotmuch1. Reviewed-By: David Bremner The underlying issue is that the libnotmuch interface is not entirely captured by the set of exported symbols. In particular the query syntax can change without being visible to the linker at all. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 78c9849b..03afdf44 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Dm-Upload-Allowed: yes Package: notmuch Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: libnotmuch1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Recommends: notmuch-emacs | notmuch-vim Description: thread-based email index, search and tagging Notmuch is a system for indexing, searching, reading, and tagging -- cgit v1.2.3 From 8b310a157c06c826c0ee7f677fbbf9f19e78537b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 10 Jul 2011 09:35:00 -0300 Subject: debian: update changelog for strict libnotmuch dependency --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c17426d4..bc0c67f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ notmuch (0.6.1) unstable; urgency=low * Properly install README.Debian in notmuch-vim (Closes: #632992). Thanks to Jason Woofenden for the report. + * Force notmuch to depend on the same version of libnotmuch. Thanks to + Uwe Kleine-König for the patch. - -- David Bremner Thu, 07 Jul 2011 22:41:13 -0300 + -- David Bremner Sun, 10 Jul 2011 09:34:02 -0300 notmuch (0.6) unstable; urgency=low -- cgit v1.2.3 From feb22fef2e3f6f1cf1722f00945c580e506df0df Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 16 Jul 2011 15:59:44 -0300 Subject: libnotmuch: export Xapian typeinfo symbols The lack of such exporting seems to cause problems catching exceptions, as suggested by http://gcc.gnu.org/wiki/Visibility This manifested in the symbol-hiding test failing when notmuch was compile with gcc 4.4.5. On i386, this further manifested as notmuch new failing to run (crashing with an uncaught exception on first run). --- lib/Makefile.local | 4 +--- lib/gen-version-script.sh | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 lib/gen-version-script.sh diff --git a/lib/Makefile.local b/lib/Makefile.local index 7e2bc87b..a6076ab5 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -76,9 +76,7 @@ $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym $(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/^\s*\(notmuch_[a-z_]*\)\s*(.*/\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) $@ diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh new file mode 100644 index 00000000..e753eaf5 --- /dev/null +++ b/lib/gen-version-script.sh @@ -0,0 +1,27 @@ + +# we go through a bit of work to get the unmangled names of the +# typeinfo symbols because of +# http://sourceware.org/bugzilla/show_bug.cgi?id=10326 + +if [ $# -lt 2 ]; then + echo Usage: $0 header obj1 obj2 obj3 + exit 1; +fi + +HEADER=$1 +shift + +printf '{\nglobal:\n' +nm --defined $* | awk '$3 ~ "Xapian.*Error" {print $3}' | sort | uniq | \ +while read sym; do + demangled=$(c++filt $sym) + case $demangled in + typeinfo*) + printf "\t$sym;\n" + ;; + *) + ;; + esac +done +sed -n 's/^\s*\(notmuch_[a-z_]*\)\s*(.*/\t\1;/p' $HEADER +printf "local: *;\n};\n" -- cgit v1.2.3 From 1510ba3c3a9bffb1c7f7fccf2b1941019c7488c1 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 16 Jul 2011 16:49:45 -0300 Subject: debian: add (demangled) Xapian exception typeinfo symbols to libnotmuch1.symbols These are exported (again) by the library to prevent problems with catching exceptions. --- debian/libnotmuch1.symbols | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/libnotmuch1.symbols b/debian/libnotmuch1.symbols index 8df6fec1..05d86e6d 100644 --- a/debian/libnotmuch1.symbols +++ b/debian/libnotmuch1.symbols @@ -70,3 +70,13 @@ libnotmuch.so.1 libnotmuch1 #MINVER# notmuch_threads_get@Base 0.3 notmuch_threads_move_to_next@Base 0.3 notmuch_threads_valid@Base 0.3 + (c++)"typeinfo for Xapian::LogicError@Base" 0.6.1 + (c++)"typeinfo for Xapian::RuntimeError@Base" 0.6.1 + (c++)"typeinfo for Xapian::DocNotFoundError@Base" 0.6.1 + (c++)"typeinfo for Xapian::InvalidArgumentError@Base" 0.6.1 + (c++)"typeinfo for Xapian::Error@Base" 0.6.1 + (c++)"typeinfo name for Xapian::LogicError@Base" 0.6.1 + (c++)"typeinfo name for Xapian::RuntimeError@Base" 0.6.1 + (c++)"typeinfo name for Xapian::DocNotFoundError@Base" 0.6.1 + (c++)"typeinfo name for Xapian::InvalidArgumentError@Base" 0.6.1 + (c++)"typeinfo name for Xapian::Error@Base" 0.6.1 -- cgit v1.2.3 From a77cbe3c919a4939263c2ed50125f33acf105f47 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 17 Jul 2011 10:42:53 -0300 Subject: debian: use a non-native version number. There is concensus to use non-native version number for updates that contain only Debian changes. Unfortunately changing back and forth between native and non-native packages has the potential for confusion, since the archive will end up with notmuch-0.x.tar.gz and notmuch-0.x.orig.tar.gz. So we use non-native numbering from the beginning. --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bc0c67f2..aa10a2dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -notmuch (0.6.1) unstable; urgency=low +notmuch (0.6.1-1) unstable; urgency=low * Properly install README.Debian in notmuch-vim (Closes: #632992). Thanks to Jason Woofenden for the report. -- cgit v1.2.3 From ab7de917bd9beee62c2d1d681efd900c531c3b22 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 17 Jul 2011 10:58:15 -0300 Subject: update NEWS and debian/changelog for 0.6.1 --- NEWS | 11 +++++++++++ debian/changelog | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index f3fefad1..bb58d6b7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +Notmuch 0.6.1 (2011-07-17) +========================== + +Bug-fix release. +---------------- + +Re-export Xapian exception typeinfo symbols. + + It turned out our aggressive symbol hiding caused problems for + people running gcc 4.4.5. + Notmuch 0.6 (2011-07-01) ======================= New, general features diff --git a/debian/changelog b/debian/changelog index aa10a2dc..37a228c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ notmuch (0.6.1-1) unstable; urgency=low Thanks to Jason Woofenden for the report. * Force notmuch to depend on the same version of libnotmuch. Thanks to Uwe Kleine-König for the patch. + * Export typeinfo for Xapian exceptions from libnotmuch. This fixes + certain mysterious uncaught exception problems. - -- David Bremner Sun, 10 Jul 2011 09:34:02 -0300 + -- David Bremner Sun, 17 Jul 2011 10:20:42 -0300 notmuch (0.6) unstable; urgency=low -- cgit v1.2.3 From 2b1b6df06f0818b624ef553917b03f8d9abd5135 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 17 Jul 2011 10:59:08 -0300 Subject: version: bump to 0.6.1 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 5a2a5806..ee6cdce3 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.6 +0.6.1 -- cgit v1.2.3 From 2e136988129507a6a8cbac62014122051f156072 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 3 Jul 2011 15:18:30 -0300 Subject: build-system: replace use of ssh with wget for checking the website The idea is to see if the version we are already releasing exists on the notmuch website. Using wget allows more people to run this target, and also allows people with ssh access to run it without access to their keys. --- Makefile.local | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Makefile.local b/Makefile.local index 8a8832da..41feeb37 100644 --- a/Makefile.local +++ b/Makefile.local @@ -180,11 +180,16 @@ verify-version-components: .PHONY: verify-newer verify-newer: @echo -n "Checking that no $(VERSION) release already exists..." - @ssh $(RELEASE_HOST) test ! -e $(RELEASE_DIR)/$(TAR_FILE) \ - || (echo "Ouch." && echo "Found: $(RELEASE_HOST):$(RELEASE_DIR)/$(TAR_FILE)" \ - && echo "Refusing to replace an existing release." \ - && echo "Don't forget to update \"version\" as described in RELEASING before release." && false) - @echo "Good." + @wget -q -O /dev/null $(RELEASE_URL)/$(TAR_FILE) ; \ + case $$? in \ + 8) echo "Good." ;; \ + 0) echo "Ouch."; \ + echo "Found: $(RELEASE_URL)/$(TAR_FILE)"; \ + echo "Refusing to replace an existing release."; \ + echo "Don't forget to update \"version\" as described in RELEASING before release." ; \ + false ;; \ + *) echo "An unexpected error occured"; \ + false;; esac # The user has not set any verbosity, default to quiet mode and inform the # user how to enable verbose compiles. -- cgit v1.2.3 From 9fb9fb2986741041e37c2c65108b2031272b9b0b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 17 Jul 2011 09:52:05 -0300 Subject: build-system: run make clean before testing. The reasoning is that we might have some error in the build system that causes something not to be rebuilt; this would potentially have the tests run on the wrong version of the code. --- Makefile.local | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.local b/Makefile.local index 41feeb37..7f14e099 100644 --- a/Makefile.local +++ b/Makefile.local @@ -87,6 +87,7 @@ dist: $(TAR_FILE) .PHONY: release release: verify-source-tree-and-version $(MAKE) VERSION=$(VERSION) verify-newer + $(MAKE) VERSION=$(VERSION) clean $(MAKE) VERSION=$(VERSION) test rm -rf ./debian-build git-buildpackage -- cgit v1.2.3 From 939c91b7efbde03e8f51d71aa7e6654946b2bf33 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 17 Jul 2011 09:55:50 -0300 Subject: build-system: remove use of git-buildpackage, dput. Add pristine-tar. The previous setup was dependent on the git-buildpackage configuration to find the resulting tar file, and consequently a bit fragile. We use pristine-tar instead to save a checksum-identical copy of the tar file. This will also faciliate "non-native" debian packages, if desired. dput again depends on the local configuration, and mainly is a bit too brave for me to do automatically. --- Makefile.local | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile.local b/Makefile.local index 7f14e099..9b76c305 100644 --- a/Makefile.local +++ b/Makefile.local @@ -25,6 +25,7 @@ RELEASE_HOST=notmuchmail.org RELEASE_DIR=/srv/notmuchmail.org/www/releases RELEASE_URL=http://notmuchmail.org/releases TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz +DEB_TAR_FILE=$(PACKAGE)_$(VERSION).orig.tar.gz SHA1_FILE=$(TAR_FILE).sha1 GPG_FILE=$(SHA1_FILE).asc @@ -89,17 +90,13 @@ release: verify-source-tree-and-version $(MAKE) VERSION=$(VERSION) verify-newer $(MAKE) VERSION=$(VERSION) clean $(MAKE) VERSION=$(VERSION) test - rm -rf ./debian-build - git-buildpackage - cp debian-build/notmuch_$(VERSION).tar.gz notmuch-$(VERSION).tar.gz $(MAKE) VERSION=$(VERSION) $(GPG_FILE) + ln -sf $(TAR_FILE) $(DEB_TAR_FILE) + pristine-tar commit $(DEB_TAR_FILE) $(VERSION) scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR) ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)" mkdir -p releases mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases - (cd debian-build; dput *.changes) - mv debian-build/* releases - rmdir debian-build git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION) git push origin $(VERSION) $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce -- cgit v1.2.3 From 60173feb065a4306dc91093d886bf46475c23e11 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 3 Jul 2011 17:06:05 -0300 Subject: build-system: tag earlier in the release process. If tagging fails, we really don't want to upload tarballs. --- Makefile.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.local b/Makefile.local index 9b76c305..990f8204 100644 --- a/Makefile.local +++ b/Makefile.local @@ -90,6 +90,7 @@ release: verify-source-tree-and-version $(MAKE) VERSION=$(VERSION) verify-newer $(MAKE) VERSION=$(VERSION) clean $(MAKE) VERSION=$(VERSION) test + git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION) $(MAKE) VERSION=$(VERSION) $(GPG_FILE) ln -sf $(TAR_FILE) $(DEB_TAR_FILE) pristine-tar commit $(DEB_TAR_FILE) $(VERSION) @@ -97,7 +98,6 @@ release: verify-source-tree-and-version ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)" mkdir -p releases mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases - git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION) git push origin $(VERSION) $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template." -- cgit v1.2.3 From 9b0dfd11c5d4af6dc4cd2b79f33e0d6c460d414e Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 3 Jul 2011 17:28:47 -0300 Subject: build-system: use signed tag to make tar file, if available. This as the advantage that "make VERSION=n.m dist" will work correctly even if the wrong branch happens to be checked out. --- Makefile.local | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.local b/Makefile.local index 990f8204..7fc68163 100644 --- a/Makefile.local +++ b/Makefile.local @@ -61,7 +61,13 @@ endif endif $(TAR_FILE): - git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ HEAD > $(TAR_FILE).tmp + if git tag -v $(VERSION) >/dev/null 2>&1; then \ + ref=$(VERSION); \ + else \ + ref="HEAD" ; \ + echo "Warning: No signed tag for $(VERSION)"; \ + fi ; \ + git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp echo $(VERSION) > version.tmp tar --append -f $(TAR_FILE).tmp --transform s_^_$(PACKAGE)-$(VERSION)/_ --transform 's_.tmp$$__' version.tmp rm version.tmp -- cgit v1.2.3 From 466f3b57aa9650cbed47152241813e212c965f94 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 4 Jul 2011 08:39:04 -0300 Subject: build-system: guard parts irrevokable parts of release target with REALLY_UPLOAD This supports both testing and use by non-upload privileged users. Along with previous commits in the series, this lets one do a dry run of the release process and created a tarball, signature file, and release announcement to inspect before uploading. --- Makefile.local | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.local b/Makefile.local index 7fc68163..2acc9d3a 100644 --- a/Makefile.local +++ b/Makefile.local @@ -100,12 +100,14 @@ release: verify-source-tree-and-version $(MAKE) VERSION=$(VERSION) $(GPG_FILE) ln -sf $(TAR_FILE) $(DEB_TAR_FILE) pristine-tar commit $(DEB_TAR_FILE) $(VERSION) - scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR) - ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)" mkdir -p releases mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases - git push origin $(VERSION) $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce +ifeq ($(REALLY_UPLOAD),yes) + git push origin $(VERSION) + cd releases && scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR) + ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* ; ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)" +endif @echo "Please send a release announcement using $(PACKAGE)-$(VERSION).announce as a template." .PHONY: release-message -- cgit v1.2.3 From 0897209f4d0609eb5ccd8cdf759f8d174c013566 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 17 Jul 2011 11:04:08 -0300 Subject: build-system: update version check to support non-native packages. We could be a bit more flexible about this and support optional Debian versions, but for the moment, we pick a policy and stick to it. --- Makefile.local | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.local b/Makefile.local index 2acc9d3a..e9cee27d 100644 --- a/Makefile.local +++ b/Makefile.local @@ -167,8 +167,8 @@ endif .PHONY: verify-version-debian verify-version-debian: verify-version-components - @echo -n "Checking that Debian package version is $(VERSION)..." - @if [ "$(VERSION)" != $$(dpkg-parsechangelog | grep ^Version | awk '{print $$2}') ] ; then \ + @echo -n "Checking that Debian package version is $(VERSION)-1..." + @if [ "$(VERSION)-1" != $$(dpkg-parsechangelog | grep ^Version | awk '{print $$2}') ] ; then \ (echo "No." && \ echo "Please edit version and debian/changelog to have consistent versions." && false) \ fi -- cgit v1.2.3 From b5881942d4c9e1377bbd2a681a17f3e9cdb43e6a Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 17 Jul 2011 11:11:57 -0300 Subject: debian: use 3.0 (quilt) source format. This generates a seperate notmuch-0.x.debian.tar.gz containing ./debian. In the initial release this is redundant, but for Debian only updates between releases, this allows updating the contents of ./debian, and using the rest of the release tarball. --- debian/source/format | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/source/format b/debian/source/format index 89ae9db8..163aaf8d 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) -- cgit v1.2.3 From 2d69aba586b52566f322a347d459503d53de6ce6 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 17 Jul 2011 11:18:10 -0300 Subject: build-system: tag debian-version as part of the release target This allows, e.g. gitpkg debian/0.x-1 to do the right thing. It also helps enforce the convention that Debian upload -1 is identical to the release tarball. --- Makefile.local | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.local b/Makefile.local index e9cee27d..33fdcc93 100644 --- a/Makefile.local +++ b/Makefile.local @@ -100,6 +100,7 @@ release: verify-source-tree-and-version $(MAKE) VERSION=$(VERSION) $(GPG_FILE) ln -sf $(TAR_FILE) $(DEB_TAR_FILE) pristine-tar commit $(DEB_TAR_FILE) $(VERSION) + git tag -s -m "$(PACKAGE) Debian $(VERSION)-1 upload (same as $(VERSION))" debian/$(VERSION)-1 mkdir -p releases mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce -- cgit v1.2.3