From 388822510f5a4be6a14f3645ab792dbff22e8966 Mon Sep 17 00:00:00 2001 From: Simon McVittie <smcv@collabora.com> Date: Thu, 26 Mar 2020 14:56:30 +0000 Subject: [PATCH] Revert "Build as a native package" This reverts commit de9040baaffc63121a6bd57f275765d2818339a9, which caused infrastructure issues. Let's come back to this later. Signed-off-by: Simon McVittie <smcv@collabora.com> --- debian/changelog | 7 +------ debian/clean | 4 ---- debian/git-version-gen.control | 3 --- debian/source/format | 2 +- 4 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 debian/git-version-gen.control diff --git a/debian/changelog b/debian/changelog index c33af2dc3..53ef78f5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -steam-runtime-tools (0.20200317.0) UNRELEASED; urgency=medium +steam-runtime-tools (0.20200317.0-0+steamrt1.1) UNRELEASED; urgency=medium [ Ludovico de Nittis ] * Add srt_vdpau_driver_resolve_library_path, etc. methods. @@ -19,11 +19,6 @@ steam-runtime-tools (0.20200317.0) UNRELEASED; urgency=medium * Document the minimum meson version. The Steam Runtime has a backport of meson 0.49.0, originally from Debian stretch-backports, which is the oldest thing we'll even try to support. - * Build as a native package. - Now that deb-build-snapshot supports a Build-Suffix option in - debian/git-version-gen.control, we don't need to worry about whether - the version number will be less than a previous version that had a +srt - suffix added by the Open Build Service. -- Simon McVittie <smcv@collabora.com> Tue, 17 Mar 2020 17:11:42 +0000 diff --git a/debian/clean b/debian/clean index c997053d6..b5745c86c 100644 --- a/debian/clean +++ b/debian/clean @@ -1,5 +1 @@ -_build/ -build/ -builddir/ debian/version.txt -obj-*/ diff --git a/debian/git-version-gen.control b/debian/git-version-gen.control deleted file mode 100644 index 6074e7a7d..000000000 --- a/debian/git-version-gen.control +++ /dev/null @@ -1,3 +0,0 @@ -Upstream: yes -Build-Suffix: +srt -Avoid-Build-Suffix: +vcs diff --git a/debian/source/format b/debian/source/format index 89ae9db8f..163aaf8d8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (native) +3.0 (quilt) -- GitLab