From: Martin Pitt <martin@piware.de>
Date: Thu, 23 Jun 2022 03:58:04 +0000 (+0200)
Subject: ubuntu-backport-cockpit: Adjust for Ubuntu 22.04
X-Git-Url: https://piware.de/gitweb/?a=commitdiff_plain;h=9d5c15961776e288a1838c6ca2289eb96babee17;p=bin.git

ubuntu-backport-cockpit: Adjust for Ubuntu 22.04

Add a version query fallback for the first backport in a series.
---

diff --git a/ubuntu-backport-cockpit b/ubuntu-backport-cockpit
index 6346ed5..8d46bf8 100755
--- a/ubuntu-backport-cockpit
+++ b/ubuntu-backport-cockpit
@@ -1,12 +1,15 @@
 #!/bin/sh
 set -eu
 PACKAGE=${1:-cockpit}
-TARGET=${2:-impish}
+TARGET=${2:-jammy}
 POCKET="${TARGET}-backports"
 
 series_ver() {
     ver=$(wget -q -O- http://de.archive.ubuntu.com/ubuntu/dists/$1/universe/source/Sources.xz | xz -d | grep-dctrl -n -sVersion -XP $PACKAGE | sort -u | tail -n1)
     ver=${ver%~bpo*}
+    if [ -z "$ver" ]; then
+        ver=$(wget -q -O- http://de.archive.ubuntu.com/ubuntu/dists/${1%-*}/universe/source/Sources.xz | xz -d | grep-dctrl -n -sVersion -XP $PACKAGE | sort -u | tail -n1)
+    fi
 }
 
 upload() {
@@ -28,13 +31,13 @@ apt-get source $PACKAGE
 cd ${PACKAGE}-*
 
 case "$TARGET" in
+    jammy) VER=22.04 ;;
     impish) VER=21.10 ;;
     focal) VER=20.04 ;;
     *) echo "Unknown target $TARGET" >&2; exit 1 ;;
 esac
 
 series_ver "$POCKET"
-[ ! -x debian/adjust-for-release ] || debian/adjust-for-release $TARGET
 dch --local ~bpo${VER}. --distribution $POCKET --force-distribution "No-change backport to $TARGET"
 dpkg-buildpackage -S -sd -nc -v$ver
 upload