From 326ead0c757a476d429bff29300f3c7a3b734105 Mon Sep 17 00:00:00 2001 From: Rafael Laboissière Date: Sat, 6 Sep 2025 17:22:30 +0200 Subject: Centralize definition of distribution codename --- Makefile | 10 ++++++++-- repo/conf/distributions | 7 ------- repo/conf/distributions.in | 7 +++++++ www/index.html.in | 8 ++++---- 4 files changed, 19 insertions(+), 13 deletions(-) delete mode 100644 repo/conf/distributions create mode 100644 repo/conf/distributions.in diff --git a/Makefile b/Makefile index 721d7a6..adf9a40 100644 --- a/Makefile +++ b/Makefile @@ -3,11 +3,12 @@ GPGKEY = praat.gpg.key WWWDIR = /var/www/praat WWWHOST = praat.cefala.org APACHEDIR = /etc/apache2/sites-available -BUILD = www/$(INDEX) apache/praat.conf +BUILD = www/$(INDEX) apache/praat.conf repo/conf/distributions REPODATA = repo/db repo/dists repo/pool REPOHOST = www.cefala.org USER = rlaboiss TODAY = $(shell date "+%Y-%m-%d %H:%M:%S %Z") +DISTRIB = trixie build-stamp: $(BUILD) mkdir -p $(REPODATA) @@ -26,7 +27,12 @@ install-www: build-stamp sudo service apache2 restart %: %.in - sed -e 's|@WWWHOST@|$(WWWHOST)|;s|@WWWDIR@|$(WWWDIR)|;s|@INDEX@|$(INDEX)|;s|@GPGKEY@|$(GPGKEY)|;s|@TODAY@|$(TODAY)|' $< > $@ + sed -e 's|@WWWHOST@|$(WWWHOST)|;' \ + -e 's|@WWWDIR@|$(WWWDIR)|;' \ + -e 's|@INDEX@|$(INDEX)|;' \ + -e 's|@GPGKEY@|$(GPGKEY)|;' \ + -e 's|@TODAY@|$(TODAY)|;' \ + -e 's|@DISTRIB@|$(DISTRIB)|;' $< > $@ .PHONY: clean clean: diff --git a/repo/conf/distributions b/repo/conf/distributions deleted file mode 100644 index d3e72c3..0000000 --- a/repo/conf/distributions +++ /dev/null @@ -1,7 +0,0 @@ -Origin: praat.cefala.org -Label: Praat backports APT repository -Codename: bookworm -Architectures: i386 amd64 -Components: main -Description: Backports for Praat (Debian stable) -SignWith: 6137206546F57945C48AFE8D9D274E7619A4B71B diff --git a/repo/conf/distributions.in b/repo/conf/distributions.in new file mode 100644 index 0000000..1867098 --- /dev/null +++ b/repo/conf/distributions.in @@ -0,0 +1,7 @@ +Origin: praat.cefala.org +Label: Praat backports APT repository +Codename: @DISTRIB@ +Architectures: i386 amd64 +Components: main +Description: Backports for Praat (Debian stable) +SignWith: 6137206546F57945C48AFE8D9D274E7619A4B71B diff --git a/www/index.html.in b/www/index.html.in index 31decf9..8d1efeb 100644 --- a/www/index.html.in +++ b/www/index.html.in @@ -54,7 +54,7 @@ pre { doing speech analysis and synthesis is part of Debian. This website provides an APT repository with the - Debian packages for Praat that works in the stable (a.k.a “bookworm”) + Debian packages for Praat that works in the stable (a.k.a “@DISTRIB@”) distribution, for recent upstream versions and for the amd64 and i386 architectures.

@@ -71,7 +71,7 @@ pre {