From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Tue, 23 Jul 2019 17:43:12 +0000 (+0200)
Subject: make changelog single source of version
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1e94bc8164f6c7ae3ebf0c1b080b889dc24edb55;p=pmg-docs.git

make changelog single source of version

Adapted from pve-docs respective commit [0]

[0]: https://git.proxmox.com/?p=pve-docs.git;a=commitdiff;h=76909adf48fc211e7799795fcb96eed5447e2b9a

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/Makefile b/Makefile
index 9f102af..8b125df 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+include /usr/share/dpkg/pkg-info.mk
+
 DGDIR=.
 ASCIIDOC_PMG=./asciidoc-pmg
 
@@ -6,15 +8,15 @@ DOC_PACKAGE=pmg-docs
 WEB_PACKAGE=pmg-docs-apache
 
 # also update debian/changelog
-PKGREL=3
+PKGREL=1
 
 GITVERSION:=$(shell git rev-parse HEAD)
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-GEN_DEB=${GEN_PACKAGE}_${DOCRELEASE}-${PKGREL}_${ARCH}.deb
-DOC_DEB=${DOC_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
-WEB_DEB=${WEB_PACKAGE}_${DOCRELEASE}-${PKGREL}_all.deb
+GEN_DEB=${GEN_PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_${ARCH}.deb
+DOC_DEB=${DOC_PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
+WEB_DEB=${WEB_PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb
 
 export SOURCE_DATE_EPOCH ?= $(shell dpkg-parsechangelog -STimestamp)
 SOURCE_DATE_HUMAN := $(shell date -d "@${SOURCE_DATE_EPOCH}")
@@ -34,6 +36,7 @@ ADOC_SOURCES_GUESS=$(filter-out %-synopsis.adoc %-opts.adoc %-table.adoc, $(wild
 
 pmg-doc-generator.mk: .pmg-doc-depends pmg-doc-generator.mk.in
 	cat pmg-doc-generator.mk.in .pmg-doc-depends > $@.tmp
+	sed -i "s/@RELEASE@$$/${DEB_VERSION_UPSTREAM}/" $@.tmp
 	mv $@.tmp $@
 
 -include ./pmg-doc-generator.mk
diff --git a/pmg-doc-generator.mk.in b/pmg-doc-generator.mk.in
index 591b9e2..be0a3e8 100644
--- a/pmg-doc-generator.mk.in
+++ b/pmg-doc-generator.mk.in
@@ -1,5 +1,4 @@
-# also update debian/changelog
-DOCRELEASE=5.2
+DOCRELEASE=@RELEASE@
 
 DGDIR?=/usr/share/pmg-doc-generator