Get the version information from debian/changelog instead of gitdebian/0.13.2+git20190214-1

3 files changed, 25 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 49f06ac..04825e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-vmdb2 (0.13.2+git-1) UNRELEASED; urgency=medium
+vmdb2 (0.13.2+git20190214-1) unstable; urgency=medium
 
   * New upstream version.
   * Add dependency and build-dependency on qemu-utils, for qemu-img.
@@ -9,6 +9,8 @@ vmdb2 (0.13.2+git-1) UNRELEASED; urgency=medium
   * Taking over maintainership, as upstream author retired from Debian,
     orphaning vmdb2 (Closes: #914027)
   * Bumping up standards-version 3.9.8 → 4.3.0, dh compat level 9 → 12
+  * Get the version information from debian/changelog instead of git,
+    fixing potential (not reported) FTBFS
 
  -- Gunnar Wolf <gwolf@debian.org>  Tue, 12 Feb 2019 09:17:52 -0600
 
diff --git a/debian/patches/get_version_from_changelog b/debian/patches/get_version_from_changelog
new file mode 100644
index 0000000..5eb31cd
--- /dev/null
+++ b/debian/patches/get_version_from_changelog
@@ -0,0 +1,21 @@
+Author: Gunnar Wolf <gwolf@debian.org
+Last-update: 2019-02-14
+Forwarded-upstream: not-needed
+Description: Get the version from the Debian changelog, not Git
+ The version was used when building the package, causing a FTBFS if
+ the source was not git-controlled.
+ .
+ Upstream author is not adding this patch, but was notified.
+Index: vmdb2/format.sh
+===================================================================
+--- vmdb2.orig/format.sh
++++ vmdb2/format.sh
+@@ -10,7 +10,7 @@ cleanup()
+ tmp="$(mktemp -d)"
+ trap cleanup EXIT
+ 
+-version="$(git describe)"
++version="$(dpkg-parsechangelog -SVersion)"
+ sed "s/^date: .*/date: $version/" vmdb2.mdwn > "$tmp/prelude.mdwn"
+ 
+ pandoc \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1fafef3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+get_version_from_changelog