Bug#1036832: should have update date near the title
Holger Wansing <[email protected]>
| Newsgroups | gmane.linux.debian.devel.documentation |
|---|---|
| Message-ID | <20250216114119.6415efd9d94e3032b4a08e5d__20659.2737393052$1739702736$gmane$org@mailbox.org> |
Hi Paul, Paul Gevers <[email protected]> wrote (Sun, 16 Feb 2025 06:54:24 +0100): > > I have prepared a merge request for this: > > https://salsa.debian.org/ddp-team/release-notes/-/merge_requests/217 > > > Merged. Thanks! I now find it irritating, that the PDF has an additional date value, grabbed from debian/changelog (and that is even more prominently displayed than the new english-last-changed-date one). Also, the title in PDF has "Release-Notes for Debian 13 (trixie) - Release 13.0" The release info is doubled and does not gain any additional benefit IMO. Moreover, the "13.0" might make people think, that the release-notes is outdated, when point releases are out. Playing around a bit, I managed to skip the release info completely, and set the date value in PDF currently grabbed from changelog to the new 'english-last-changed-date' value instead. Also, I removed some superfluous logic around these PACKAGE TIMESTAMP DATE VERSION values; since there is no binary package for the release-notes and as well no upstream tarball, there is no point in having that code around. Patch attached. What do you think? Holger -- Holger Wansing <[email protected]> PGP-Fingerprint: 496A C6E8 1442 4B34 8508 3529 59F1 87CA 156E B076
Makefile.diff
(text/x-diff, 1.5 KB)
diff --git a/Makefile b/Makefile
index fda06189..459f2849 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,13 @@
# Build rules for release-notes.
#
-# This build script works on the bare un-tared upstream tarball, the
-# checked-out git repository, and the patch-applied Debian source package
-# source tree.
-# Basic package information
-ifneq ("$(wildcard debian/changelog)","")
-# Patch-applied Debian source package source tree
+# Grab some values from changelog:
PACKAGE ?= $(shell dpkg-parsechangelog -SSource)
TIMESTAMP ?= $(shell dpkg-parsechangelog -STimestamp)
-DATE ?= $(shell date -u -d '@$(TIMESTAMP)' +'%Y-%m-%d')
-VERSION ?= $(shell dpkg-parsechangelog -SVersion)
-else ifneq ("$(wildcard .git)","")
-# Checked-out git repository
-PACKAGE ?= $(basename $(notdir $(shell git config --get remote.origin.url)))
-TIMESTAMP ?= $(shell git show -s --format=%ct HEAD)
-DATE ?= $(shell date -u -d '@$(TIMESTAMP)' +'%Y-%m-%d')
-VERSION ?= $(shell git describe --tags)
-# Adjust version as needed: debian/% --> %
-VERSION := $(patsubst debian/%, %, $(VERSION))
-else
-# Un-tared upstream tarball
-PACKAGE ?= $(notdir $(CURDIR))
-TIMESTAMP ?= $(shell date +%s)
-DATE ?= $(shell date -u -d '@$(TIMESTAMP)' +'%Y-%m-%d')
-VERSION ?= 0.0~$(subst -,.,$(DATE))
-endif
+# Use english-last-changed-date for DATE as well.
+DATE ?= $(shell git log --date=short source/*.rst | grep Date -m 1 | cut -c 9-20)
+# Do not set VERSION. We don't want that to be shown.
+# VERSION ?=
export PACKAGE TIMESTAMP DATE VERSION