packaging: Revert "packaging: fix deb version detection and rename ubuntu-26.04 to ubuntu-26.10 (#17316)" (#17339)

This reverts commit 9fc13ce.

Author: sergiocazzolato

.github/workflows/deb-builds.yaml

@@ -51,8 +51,8 @@ jobs:
                 ;;
             ubuntu-*)
                 version="${target_system#ubuntu-}"
-                if dpkg --compare-versions "$version" ge 26.10; then
-                    ln -sfn packaging/ubuntu-26.10 debian
+                if dpkg --compare-versions "$version" ge 26.04; then
+                    ln -sfn packaging/ubuntu-26.04 debian
                 else
                     ln -sfn packaging/ubuntu-16.04 debian
                 fi

RELEASE.md

@@ -418,12 +418,12 @@ sudo apt build-dep .
 ##### Steps
  
 1. Check out the `release/<version>` branch
-2. Since the `debian` symlink was removed from the source, create the `debian` folder symlink. For stonking: `ln -sfn packaging/ubuntu-26.10 debian` and for all others: `ln -sfn packaging/ubuntu-16.04 debian`
+2. Since the `debian` symlink was removed from the source, create the `debian` folder symlink. For resolute: `ln -sfn packaging/ubuntu-26.04 debian` and for all others: `ln -sfn packaging/ubuntu-16.04 debian`
 3. Commit the changes, but **do not push**.
 4. Run `gbp buildpackage -S --git-ignore-branch --git-no-purge`. The `--git-no-purge` option is important so we correctly retain the source tree. You may also need to specify `--git-ignore-new` if you have untracked files in your local git repo. You should now have a `build-area` folder one directory up.
 5. For each target release, update the changelogs in `build-area/snapd-<version>` to reflect that target, then build the package.
 	1. Check for the details of the most recent deb release https://launchpad.net/~snappy-dev/+archive/ubuntu/image/+packages?field.name_filter=snapd&field.status_filter=&field.series_filter=
-	2. In `debian/changelog` change that entry to reflect the correct version (e.g. `snapd (2.75.1) xenial` -> `snapd (2.75.1+ubuntu26.10) resolute` when building for resolute). If the latest deb package on the PPA is not present in the changelog, add it at the appropriate place. Also change all later changelog entries to reflect the correct version.
+	2. In `debian/changelog` change that entry to reflect the correct version (e.g. `snapd (2.75.1) xenial` -> `snapd (2.75.1+ubuntu26.04) resolute` when building for resolute). If the latest deb package on the PPA is not present in the changelog, add it at the appropriate place. Also change all later changelog entries to reflect the correct version.
 		- *NOTE: If you did a re-spin and are releasing multiple versions, remove the `New upstream release` line in the version that never got released*
 	3. Build the package from the directory `build-area/snapd-<version>` (`dpkg-buildpackage -S`)
 6. Create the source tarballs from the `build-area` directory: `../snapd/release-tools/repack-debian-tarball.sh ./snapd_<version>.tar.xz`

mkversion.sh

@@ -65,14 +65,7 @@ fi
 # switch to the real source dir for the changelog parsing
 : "${DPKG_PARSECHANGELOG=$(command -v dpkg-parsechangelog)}"
 if [ -n "$DPKG_PARSECHANGELOG" ]; then
-    changelog_file="packaging/ubuntu-16.04/changelog"
-    debian_path="$PKG_BUILDDIR/debian"
-    if [ -L "$debian_path" ] &&
-       debian_target=$(readlink "$debian_path") &&
-       [ "${debian_target%/}" != "packaging/ubuntu-16.04" ]; then
-        changelog_file="${debian_target%/}/changelog"
-    fi
-    version_from_changelog="$(cd "$PKG_BUILDDIR"; "$DPKG_PARSECHANGELOG" --file "$changelog_file" --show-field Version)";
+    version_from_changelog="$(cd "$PKG_BUILDDIR"; "$DPKG_PARSECHANGELOG" --file packaging/ubuntu-16.04/changelog --show-field Version)";
 fi
 
 # select version based on priority

packaging/ubuntu-26.10/.gitignore packaging/ubuntu-26.04/.gitignorepackaging/ubuntu-26.10/.gitignore renamed to packaging/ubuntu-26.04/.gitignore

@@ -1,4 +1,4 @@
-# Ubuntu 26.10 Packaging
+# Ubuntu 26.04 Packaging
 
 This directory contains packaging for the Ubuntu distribution.
 
@@ -73,7 +73,7 @@ mkdir -p .build
 ## Container Script
 
 The build script has several sections. The source tree is copied to a writable
-location, the `debian/` directory is populated from `packaging/ubuntu-26.10/`,
+location, the `debian/` directory is populated from `packaging/ubuntu-26.04/`,
 Go modules are vendored, and then `dpkg-buildpackage` is invoked.
 
 This is a native package (`3.0 (native)` format), so the version has no
@@ -101,7 +101,7 @@ DEBIAN_FRONTEND=noninteractive apt-get --yes install --no-install-recommends \
 
 # Determine the version of the package.
 # Native package: no upstream/revision split, use the full version as-is.
-version=$(dpkg-parsechangelog --file /src/packaging/ubuntu-26.10/changelog --show-field Version)
+version=$(dpkg-parsechangelog --file /src/packaging/ubuntu-26.04/changelog --show-field Version)
 
 # Copy the source tree to a temporary location, so that we can call go mod vendor.
 mkdir -p /src-rw
@@ -131,9 +131,9 @@ tar -C /src -c \
 # Unpack the source archive and install the packaging directory.
 tar -Jxf /build/snapd_"$version".no-vendor.tar.xz -C /build
 tar -Jxf /build/snapd_"$version".only-vendor.tar.xz -C /build
-# The ubuntu-26.10 directory contains .build/ which would be copied recursively, exclude it by using a glob.
+# The ubuntu-26.04 directory contains .build/ which would be copied recursively, exclude it by using a glob.
 mkdir /build/snapd-"$version"/debian
-cp -a /src/packaging/ubuntu-26.10/* /build/snapd-"$version"/debian
+cp -a /src/packaging/ubuntu-26.04/* /build/snapd-"$version"/debian
 
 # Discover and install build dependencies.
 DEBIAN_FRONTEND=noninteractive apt-get --yes build-dep /build/snapd-"$version"