Merge tag 'debian/0.38.3-1'

notmuch release 0.38.3-1 for unstable (sid) [dgit]

[dgit distro=debian no-split --quilt=linear]

9 files changed, 40 insertions, 11 deletions

diff --git a/NEWS b/NEWS
index 315f4136..a064671f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+Notmuch 0.38.3 (2024-03-09)
+===========================
+
+CLI
+---
+
+Fix a bug in configuration code that caused the notmuch command to
+erroneously report "Error: could not locate database" under some
+circumstances.
+
 Notmuch 0.38.2 (2023-12-01)
 ===========================
 
diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index f4fd171d..fd4152ee 100644
--- a/bindings/python/notmuch/version.py
+++ b/bindings/python/notmuch/version.py
@@ -1,3 +1,3 @@
 # this file should be kept in sync with ../../../version
-__VERSION__ = '0.38.2'
+__VERSION__ = '0.38.3'
 SOVERSION = '5'
diff --git a/debian/changelog b/debian/changelog
index 75765b6f..1177f085 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+notmuch (0.38.3-1) unstable; urgency=medium
+
+  * New upstream bugfix release
+  * Bug fix: "Recommends transitional package gnupg-agent instead of
+    gpg-agent", thanks to Andreas Metzler (Closes: #1064114).
+
+ -- David Bremner <bremner@debian.org>  Sat, 09 Mar 2024 23:13:07 -0400
+
+notmuch (0.38.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.  Closes: #1063205
+
+ -- Benjamin Drung <bdrung@debian.org>  Wed, 28 Feb 2024 23:56:48 +0000
+
 notmuch (0.38.2-1) unstable; urgency=medium
 
   * New upstream bugfix release
diff --git a/debian/control b/debian/control
index 135eb7ce..4fded909 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Conflicts:
  gdb [ia64 mips mips64el hppa],
  gdb-minimal,
  ruby1.8,
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  bash-completion (>=1.9.0~),
  debhelper-compat (= 13),
  dh-elpa (>= 1.3),
@@ -50,12 +50,12 @@ Rules-Requires-Root: no
 Package: notmuch
 Architecture: any
 Depends:
- libnotmuch5 (= ${binary:Version}),
+ libnotmuch5t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
  elpa-notmuch | notmuch-vim | notmuch-mutt | alot,
- gnupg-agent,
+ gpg-agent,
  gpgsm,
 Suggests:
  mailscripts,
@@ -99,7 +99,10 @@ Description: thread-based email index, search and tagging
  .
  This package contains the HTML documentation
 
-Package: libnotmuch5
+Package: libnotmuch5t64
+Provides: ${t64:Provides}
+Replaces: libnotmuch5
+Breaks: libnotmuch5 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends:
@@ -120,7 +123,7 @@ Package: libnotmuch-dev
 Section: libdevel
 Architecture: any
 Depends:
- libnotmuch5 (= ${binary:Version}),
+ libnotmuch5t64 (= ${binary:Version}),
  ${misc:Depends},
 Description: thread-based email index, search and tagging (development)
  Notmuch is a system for indexing, searching, reading, and tagging
@@ -135,7 +138,7 @@ Package: python3-notmuch
 Architecture: all
 Section: python
 Depends:
- libnotmuch5 (>= ${source:Version}),
+ libnotmuch5t64 (>= ${source:Version}),
  ${misc:Depends},
  ${python3:Depends},
 Description: Python 3 legacy interface to the notmuch mail search and index library
@@ -153,7 +156,7 @@ Package: python3-notmuch2
 Architecture: any
 Section: python
 Depends:
- libnotmuch5 (>= ${source:Version}),
+ libnotmuch5t64 (>= ${source:Version}),
  ${misc:Depends},
  ${python3:Depends},
  ${shlibs:Depends},
diff --git a/debian/libnotmuch5.install b/debian/libnotmuch5t64.install
index a513b475..a513b475 100644
--- a/debian/libnotmuch5.install
+++ b/debian/libnotmuch5t64.install
diff --git a/debian/libnotmuch5t64.lintian-overrides b/debian/libnotmuch5t64.lintian-overrides
new file mode 100644
index 00000000..affb63b4
--- /dev/null
+++ b/debian/libnotmuch5t64.lintian-overrides
@@ -0,0 +1 @@
+libnotmuch5t64: package-name-doesnt-match-sonames libnotmuch5
diff --git a/debian/libnotmuch5.symbols b/debian/libnotmuch5t64.symbols
index e6d2b7c9..5715dec0 100644
--- a/debian/libnotmuch5.symbols
+++ b/debian/libnotmuch5t64.symbols
@@ -1,4 +1,4 @@
-libnotmuch.so.5 libnotmuch5 #MINVER#
+libnotmuch.so.5 libnotmuch5t64 #MINVER#
 * Build-Depends-Package: libnotmuch-dev
  notmuch_built_with@Base 0.23~rc0
  notmuch_config_get@Base 0.32~rc0
diff --git a/doc/conf.py b/doc/conf.py
index 7ac13a5d..ee1b336a 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -16,7 +16,7 @@ master_doc = 'index'
 
 # General information about the project.
 project = u'notmuch'
-copyright = u'2009-2023, Carl Worth and many others'
+copyright = u'2009-2024, Carl Worth and many others'
 
 location = os.path.dirname(__file__)
 
diff --git a/version.txt b/version.txt
index f2e78d49..f2687f32 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.38.2
+0.38.3