diff --git a/debian/changelog b/debian/changelog index 6801f548f..55af5bf6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +monado (21.0.0~dfsg1-2~ubuntu2110~20211027+1) impish; urgency=medium + + * Create branch for backport, updating + - d/control + - d/gbp.conf + - d/rules + - d/extra/prepare-commit-package.sh + * Rebuild for impish + + -- Ryan Pavlik Wed, 27 Oct 2021 10:39:24 -0500 + monado (21.0.0~dfsg1-2) unstable; urgency=medium * d/control diff --git a/debian/control b/debian/control index fc6f175a1..b03276f06 100644 --- a/debian/control +++ b/debian/control @@ -34,8 +34,8 @@ Build-Depends: debhelper-compat (= 12), pandoc , pkg-config Standards-Version: 4.6.0 -Vcs-Browser: https://gitlab.freedesktop.org/monado/monado/-/tree/debian/sid -Vcs-Git: https://gitlab.freedesktop.org/monado/monado.git -b debian/sid +Vcs-Browser: https://gitlab.freedesktop.org/monado/monado/-/tree/ubuntu/impish +Vcs-Git: https://gitlab.freedesktop.org/monado/monado.git -b ubuntu/impish Homepage: https://monado.freedesktop.org/ Rules-Requires-Root: no diff --git a/debian/extra/prepare-commit-package.sh b/debian/extra/prepare-commit-package.sh index cd4bcfe25..96b6ca02b 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~ci$(date --utc "+%Y%m%d") + PKG_REVISION=1~ubuntu2110~ci$(date --utc "+%Y%m%d") export PKG_REVISION fi diff --git a/debian/gbp.conf b/debian/gbp.conf index b3be6c1d8..cb782cc71 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,4 +1,4 @@ [DEFAULT] -debian-branch = debian/sid +debian-branch = ubuntu/impish pristine-tar = True upstream-branch = master diff --git a/debian/rules b/debian/rules index bef546558..a384fdee0 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all reproducible=+all # see ENVIRONMENT in dpkg-buildflags(1) # package maintainers to append LDFLAGS # Not needed on Bullseye and newer -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed include /usr/share/dpkg/architecture.mk