New upstream release (2.10.1)

4 files changed, 12 insertions, 44 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index fca86ef2..2077a39e 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,12 +1,12 @@
 # see git-dpm(1) from git-dpm package
-dd1bc916999aa2586510feb787da52ce2fe74ca3
-dd1bc916999aa2586510feb787da52ce2fe74ca3
-828b489c68a5a022c106656cfdff19bb9b584eec
-828b489c68a5a022c106656cfdff19bb9b584eec
-man-db_2.10.0.orig.tar.xz
-ee3bf8ae326f3e193722ba11a608097dd694bd1f
-1888196
+8729cc9a129888d81024f59510ac45a464a032c5
+8729cc9a129888d81024f59510ac45a464a032c5
+8729cc9a129888d81024f59510ac45a464a032c5
+8729cc9a129888d81024f59510ac45a464a032c5
+man-db_2.10.1.orig.tar.xz
+095dc7a6a135b4c455ff436c835faa0d9867ec40
+1890536
 debianTag="debian/%V"
 patchedTag="patched/%V"
 upstreamTag="upstream/%U"
-signature:717137ce1e2319daaab8812b3dc89cb7254055b3:833:man-db_2.10.0.orig.tar.xz.asc
+signature:940f5bf6e95fe916d10cded1ce9ef2aeab390f23:833:man-db_2.10.1.orig.tar.xz.asc
diff --git a/debian/changelog b/debian/changelog
index a2f87e30..a512a439 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-man-db (2.10.0-3) UNRELEASED; urgency=medium
+man-db (2.10.1-1) UNRELEASED; urgency=medium
 
   * Ensure that PATH in cron jobs includes sbin directories, since there are
     long-standing bugs that it doesn't always do so (closes: #209185).
+  * New upstream release:
+    - Update Simplified Chinese manual page translation (closes: #1005139).
 
- -- Colin Watson <cjwatson@debian.org>  Wed, 09 Feb 2022 00:49:47 +0000
+ -- Colin Watson <cjwatson@debian.org>  Thu, 10 Feb 2022 12:33:51 +0000
 
 man-db (2.10.0-2) unstable; urgency=medium
 
diff --git a/debian/patches/fix-mandb-symlink-target-timestamp.patch b/debian/patches/fix-mandb-symlink-target-timestamp.patch
deleted file mode 100644
index fc1cdfbe..00000000
--- a/debian/patches/fix-mandb-symlink-target-timestamp.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From dd1bc916999aa2586510feb787da52ce2fe74ca3 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@debian.org>
-Date: Fri, 4 Feb 2022 16:13:09 +0000
-Subject: Fix occasional mandb-symlink-target-timestamp test failure
-
-* src/tests/mandb-symlink-target-timestamp: Fix handling of the case
-where the nanosecond part of a timestamp starts with a zero.
-* NEWS.md: Document this.
-
-Origin: upstream, https://gitlab.com/cjwatson/man-db/-/commit/18bb0f05f161e136b78a4f184fdc044aab210ba3
-Origin: upstream, https://gitlab.com/cjwatson/man-db/-/commit/6d09e509dc281aa8a4ec2bc16a05dba622c65fc5
-Last-Update: 2022-02-04
-
-Patch-Name: fix-mandb-symlink-target-timestamp.patch
----
- src/tests/mandb-symlink-target-timestamp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/tests/mandb-symlink-target-timestamp b/src/tests/mandb-symlink-target-timestamp
-index 1c87d3da..bc1baf11 100755
---- a/src/tests/mandb-symlink-target-timestamp
-+++ b/src/tests/mandb-symlink-target-timestamp
-@@ -21,8 +21,8 @@ write_page test 1 "$tmpdir/usr/share/man/man1/test.1.gz" \
- ln -s test.1.gz "$tmpdir/usr/share/man/man1/test-link.1.gz"
- run $MANDB -C "$tmpdir/manpath.config" -u -q "$tmpdir/usr/share/man"
- cat >"$tmpdir/1.exp" <<EOF
--test -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test.1.gz" | tr . ' ') A - - gz test(1)"
--test-link -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test-link.1.gz" | tr . ' ') B - - gz test(1)"
-+test -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test.1.gz" | sed 's/\.0*\([0-9]\)/ \1/') A - - gz test(1)"
-+test-link -> "- 1 1 $(./get-mtime "$tmpdir/usr/share/man/man1/test-link.1.gz" | sed 's/\.0*\([0-9]\)/ \1/') B - - gz test(1)"
- EOF
- run $ACCESSDB "$tmpdir/usr/share/man/index$db_ext" | \
- 	grep -v '^\$' >"$tmpdir/1.out"
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 96712a4b..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-mandb-symlink-target-timestamp.patch