7 files changed, 52 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index 412b9e7..7d8a654 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+mkosi (5-1) unstable; urgency=medium
+
+  * New upstream release
+  * Bump the minimum required version to python 3.6.
+    3.5 is no longer supported
+  * Ship the upstream manpage instead of using help2man
+  * Fix format error in generated manpage.
+    Man does not like emdash vs dash
+  * d/control spring cleaning.
+    1. Bump Standards-Version
+    2. Mark Rules-Requires-Root: no, as we don't need root.
+    3. Bump debhelper compat to 11
+
+ -- Felipe Sateler <fsateler@debian.org>  Sun, 07 Jul 2019 22:30:49 -0400
+
 mkosi (4-1) unstable; urgency=medium
 
   [ Felipe Sateler ]
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 9792c39..f64d611 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,17 @@ Maintainer: Debian systemd Maintainers <pkg-systemd-maintainers@lists.alioth.deb
 Uploaders: Felipe Sateler <fsateler@debian.org>
 Section: admin
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper-compat (= 11),
                dh-python,
-               help2man,
+               pandoc,
                python3-all,
                python3-setuptools
-Standards-Version: 4.0.0
-Homepage: https://github.com/systemd/mkosi
-Vcs-Git: https://salsa.debian.org/systemd-team/mkosi.git
+Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/systemd-team/mkosi
-X-Python3-Version: >= 3.5
+Vcs-Git: https://salsa.debian.org/systemd-team/mkosi.git
+Homepage: https://github.com/systemd/mkosi
+Rules-Requires-Root: no
+X-Python3-Version: >= 3.6
 
 Package: mkosi
 Architecture: all
@@ -25,7 +26,9 @@ Depends: btrfs-progs,
          fdisk | util-linux (<< 2.29.2-3~),
          ${misc:Depends},
          ${python3:Depends}
-Recommends: ovmf, debian-archive-keyring, ubuntu-archive-keyring
+Recommends: ovmf,
+            debian-archive-keyring,
+            ubuntu-archive-keyring
 Description: create legacy-free OS images
  A fancy wrapper around "dnf --installroot", "debootstrap" and
  "pacstrap", that may generate disk images with a number of
diff --git a/debian/docs b/debian/docs
index b43bf86..1e13d39 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1,2 @@
 README.md
+mkosi.md
diff --git a/debian/patches/mkosi.md-convert-emdash-into-regular-dash.patch b/debian/patches/mkosi.md-convert-emdash-into-regular-dash.patch
new file mode 100644
index 0000000..e97c700
--- /dev/null
+++ b/debian/patches/mkosi.md-convert-emdash-into-regular-dash.patch
@@ -0,0 +1,24 @@
+From: Felipe Sateler <fsateler@debian.org>
+Date: Sun, 7 Jul 2019 22:21:33 -0400
+Subject: mkosi.md: convert emdash into regular dash
+
+Otherwise pandoc emits a manpage that cannot be parsed by lexgrog
+
+Detected by lintian
+---
+ mkosi.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mkosi.md b/mkosi.md
+index 2b56a58..c2caf43 100644
+--- a/mkosi.md
++++ b/mkosi.md
+@@ -4,7 +4,7 @@
+ 
+ # NAME
+ 
+-mkosi — Build Legacy-Free OS Images
++mkosi - Build Legacy-Free OS Images
+ 
+ # SYNOPSIS
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8d3d25b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+mkosi.md-convert-emdash-into-regular-dash.patch
diff --git a/debian/rules b/debian/rules
index 1733887..7e0723b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,4 @@ export PYBUILD_NAME=mkosi
 # need explicit target to be able to mark as phony
 override_dh_auto_build:
 	dh_auto_build --buildsystem=pybuild
-	help2man --name "Create legacy-free OS images" \
-		--version-string "mkosi $(DEB_VERSION_UPSTREAM)" \
-		--no-info \
-		-o debian/mkosi.1 \
-		./mkosi
+	pandoc --standalone --to man --output debian/mkosi.1 mkosi.md