From 03a8f305483f59e028c71fc4826bbfbe47f09808 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Wed, 27 Oct 2021 13:59:56 -0500 Subject: [PATCH] Update packaging --- debian/changelog | 22 +++++++++++++++------- debian/control | 10 ++++------ debian/copyright | 2 +- debian/copyright-scan-patterns.yml | 1 - debian/extra/prepare-commit-package.sh | 4 ++-- debian/rules | 2 +- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3ef2d6283..5cd2b3411 100644 --- a/debian/changelog +++ b/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 Tue, 23 Feb 2021 13:42:43 -0600 + -- Ryan Pavlik 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 Thu, 15 Apr 2021 16:58:33 -0500 + -- Ryan Pavlik Tue, 26 Oct 2021 16:59:16 -0500 monado (21.0.0~dfsg1-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 9e026ee09..0245d567b 100644 --- a/debian/control +++ b/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 , + pandoc , 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/ diff --git a/debian/copyright b/debian/copyright index c68593c34..32582d215 100644 --- a/debian/copyright +++ b/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 diff --git a/debian/copyright-scan-patterns.yml b/debian/copyright-scan-patterns.yml index 1f2375f2b..4df1898bb 100644 --- a/debian/copyright-scan-patterns.yml +++ b/debian/copyright-scan-patterns.yml @@ -3,4 +3,3 @@ ignore: pattern: - .reuse/* - .gitlab-ci - diff --git a/debian/extra/prepare-commit-package.sh b/debian/extra/prepare-commit-package.sh index f5e9527bf..09d62a94e 100755 --- a/debian/extra/prepare-commit-package.sh +++ b/debian/extra/prepare-commit-package.sh @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2020, Ryan Pavlik +# SPDX-FileCopyrightText: 2020-2021, Ryan Pavlik # 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 diff --git a/debian/rules b/debian/rules index 8fe65ce08..a384fdee0 100755 --- a/debian/rules +++ b/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