Update packaging

debian/changelog

@@ -1,15 +1,23 @@
-monado (21.0.0~dfsg1-1~ubuntu20.04~ppa20210223) focal; urgency=medium
+monado (21.0.0~dfsg1-2~ubuntu2004~20211027+1) focal; urgency=medium
 
-  * Rebuild for Ubuntu Focal.
-  * Re-enable -Wl,--as-needed for focal
+  * Rebuild for focal
 
- -- Ryan Pavlik <ryan@ryanpavlik.com>  Tue, 23 Feb 2021 13:42:43 -0600
+ -- Ryan Pavlik <ryan@ryanpavlik.com>  Wed, 27 Oct 2021 10:53:43 -0500
 
-monado (21.0.0~dfsg1-2) UNRELEASED; urgency=medium
+monado (21.0.0~dfsg1-2) unstable; urgency=medium
 
-  * d/control: Add Build-Depends on libbsd-dev for pidfile support when building service.
+  * d/control
+    - Add Build-Depends on libbsd-dev for pidfile support when
+      building service.
+    - Bump Standards-Version to 4.6.0, no changes required.
+    - Remove Build-Depends that we don't actually use.
+    - Exclude some dependencies on less-common arches to fix builds.
+  * d/copyright: Update
+  * Backport patch for upstream to fix FTBFS, closes: #997239
+  * Clean up/annotate patches
+  * Switch to pandoc from markdown for formatting changelog.
 
- -- Ryan Pavlik <ryan@ryanpavlik.com>  Thu, 15 Apr 2021 16:58:33 -0500
+ -- Ryan Pavlik <ryan@ryanpavlik.com>  Tue, 26 Oct 2021 16:59:16 -0500
 
 monado (21.0.0~dfsg1-1) unstable; urgency=medium
 

debian/control

@@ -5,10 +5,8 @@ Section: libs
 Priority: optional
 Build-Depends: debhelper-compat (= 12),
                cmake,
-               doxygen,
                glslang-tools,
-               graphviz,
-               libavcodec-dev,
+               libavcodec-dev [!hppa !sh4],
                libbsd-dev [linux-any],
                libcjson-dev,
                libdbus-1-dev [linux-any],
@@ -19,7 +17,7 @@ Build-Depends: debhelper-compat (= 12),
                libgstreamer1.0-dev,
                libgstreamer-plugins-base1.0-dev,
                libhidapi-dev [!hurd-i386],
-               libopencv-dev,
+               libopencv-dev [!alpha !ia64 !sparc64 !x32],
                libsystemd-dev [linux-any],
                libsdl2-dev,
                libudev-dev,
@@ -33,9 +31,9 @@ Build-Depends: debhelper-compat (= 12),
                libxcb-randr0-dev,
                libxrandr-dev,
                libxxf86vm-dev,
-               markdown <!nodoc>,
+               pandoc <!nodoc>,
                pkg-config
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
 Vcs-Browser: https://gitlab.freedesktop.org/monado/monado/-/tree/ubuntu/focal
 Vcs-Git: https://gitlab.freedesktop.org/monado/monado.git -b ubuntu/focal
 Homepage: https://monado.freedesktop.org/

debian/copyright

@@ -5,7 +5,7 @@ Copyright: 2018-2021, Collabora, Ltd.
 License: BSL-1.0
 
 Files: *
-Copyright: 2018-2020, Collabora, Ltd.
+Copyright: 2018-2021, Collabora, Ltd.
 License: BSL-1.0
 
 Files: cmake/GetGitRevisionDescription.cmake.in

debian/copyright-scan-patterns.yml

@@ -3,4 +3,3 @@ ignore:
   pattern:
   - .reuse/*
   - .gitlab-ci
-

debian/extra/prepare-commit-package.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright 2020, Ryan Pavlik <ryan@ryanpavlik.com>
+# SPDX-FileCopyrightText: 2020-2021, Ryan Pavlik <ryan@ryanpavlik.com>
 # SPDX-License-Identifier: CC0-1.0
 
 # Packages produced this way are for automated use only and shouldn't be uploaded to the Debian archive.
@@ -22,7 +22,7 @@ set -e
         PKG_REVISION=$2
         export PKG_REVISION
     else
-        PKG_REVISION=1~ubuntu20.04~ci$(date --utc "+%Y%m%d")
+        PKG_REVISION=1~ubuntu2004~ci$(date --utc "+%Y%m%d")
         export PKG_REVISION
     fi
 

debian/rules

@@ -46,7 +46,7 @@ override_dh_install:
 ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
 	mkdir -p debian/tmp/usr/share/doc/monado
 	cp doc/CHANGELOG.md debian/tmp/usr/share/doc/monado/changelog
-	markdown doc/CHANGELOG.md > debian/tmp/usr/share/doc/monado/changelog.html
+	pandoc -f markdown -t html doc/CHANGELOG.md > debian/tmp/usr/share/doc/monado/changelog.html
 endif
 ifneq (,$(findstring linux,$(DEB_HOST_ARCH_OS)))
 	sed -i "s/%N/monado/" debian/tmp/usr/lib/systemd/user/monado.service