Hi,
While preparing the previous, I ran lintian, which found (amongst other
things) 3 more problems of this form:
E: git-doc: doc-base-file-references-missing-file
/usr/share/doc/git-doc/technical/pack-format.txt
[usr/share/doc-base/git-doc.git-pack-format:9]
E: git-doc: doc-base-file-references-missing-file
/usr/share/doc/git-doc/technical/pack-protocol.txt
[usr/share/doc-base/git-doc.git-protocol:12]
E: git-doc: doc-base-file-references-missing-file
/usr/share/doc/git-doc/technical/protocol-*.txt
[usr/share/doc-base/git-doc.git-protocol:12]
I think they didn't result in separate bug reports because in each case
the file contains a working link as well as a non-working one.
I've attached revised patches, which I'll upload shortly.
I hope NMUing this is OK, my rationale is that:
* it's rapidly approaching the last day for uploads to get into bookworm
without release team intervention
* no code changes are made
* bug fix is uncontroversial (it's simply reflecting changed paths in
the package)
Regards,
Matthew
From 298f793c6d5b456302d93ce84c404fac5b856c7b Mon Sep 17 00:00:00 2001
From: Matthew Vernon <[email protected]>
Date: Mon, 27 Feb 2023 20:13:22 +0000
Subject: [PATCH 1/2] Correct paths in doc-base control files (Closes:
#1023255)
As well as the path highlighted by the error in the bug report, also
fix three more paths that lintian picks up (that didn't result in an
error as there were other correct paths in those control files).
---
debian/git-doc.doc-base.git-index-format | 2 +-
debian/git-doc.doc-base.git-pack-format | 2 +-
debian/git-doc.doc-base.git-protocol | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/debian/git-doc.doc-base.git-index-format b/debian/git-doc.doc-base.git-index-format
index 245a1b5..00f9871 100644
--- a/debian/git-doc.doc-base.git-index-format
+++ b/debian/git-doc.doc-base.git-index-format
@@ -6,4 +6,4 @@ Abstract: The on-disk format of Git's staging area, merging area,
Section: File Management
Format: Text
-Files: /usr/share/doc/git-doc/technical/index-format.txt
+Files: /usr/share/doc/git-doc/gitformat-index.txt
diff --git a/debian/git-doc.doc-base.git-pack-format b/debian/git-doc.doc-base.git-pack-format
index e7c728b..8e2cb9b 100644
--- a/debian/git-doc.doc-base.git-pack-format
+++ b/debian/git-doc.doc-base.git-pack-format
@@ -5,5 +5,5 @@ Abstract: Git's packed data format.
Section: File Management
Format: Text
-Files: /usr/share/doc/git-doc/technical/pack-format.txt
+Files: /usr/share/doc/git-doc/gitformat-pack.txt
/usr/share/doc/git-doc/technical/pack-heuristics.txt
diff --git a/debian/git-doc.doc-base.git-protocol b/debian/git-doc.doc-base.git-protocol
index 4495708..a3a81d7 100644
--- a/debian/git-doc.doc-base.git-protocol
+++ b/debian/git-doc.doc-base.git-protocol
@@ -7,6 +7,6 @@ Abstract: Reference documentation for the upload-pack and
Section: File Management
Format: Text
-Files: /usr/share/doc/git-doc/technical/pack-protocol.txt
- /usr/share/doc/git-doc/technical/protocol-*.txt
+Files: /usr/share/doc/git-doc/gitprotocol-pack.txt
+ /usr/share/doc/git-doc/gitprotocol-*.txt
/usr/share/doc/git-doc/technical/send-pack-pipeline.txt
--
2.39.2
From e5b072e6a2e19e473c1897fb1d2a2ce258ee19c2 Mon Sep 17 00:00:00 2001
From: Matthew Vernon <[email protected]>
Date: Mon, 27 Feb 2023 20:13:37 +0000
Subject: [PATCH 2/2] Changelog for 1:2.39.2-1.1
---
debian/changelog | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index a55b587..d4dbf36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git (1:2.39.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload (only changes to git-doc).
+ * Correct paths in git-doc doc-base control files (Closes: #1023255)
+
+ -- Matthew Vernon <[email protected]> Tue, 28 Feb 2023 09:25:32 +0000
+
git (1:2.39.2-1) unstable; urgency=medium
* new upstream point release (see RelNotes/2.39.2.txt). Addresses
--
2.39.2
