From 62dc22173c5f5f59973145164a5a56df490cfe79 Mon Sep 17 00:00:00 2001
From: Robert Burger <robert.burger@dlr.de>
Date: Tue, 5 Aug 2025 08:00:06 +0200
Subject: [PATCH 1/2] fix: version schema

---
 .github/workflows/build-deb.yaml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-deb.yaml b/.github/workflows/build-deb.yaml
index 7ef52b4..30bd019 100644
--- a/.github/workflows/build-deb.yaml
+++ b/.github/workflows/build-deb.yaml
@@ -86,6 +86,7 @@ jobs:
           DEBEMAIL="robert.burger@dlr.de"
           DEBFULLNAME="Robert Burger"
           VERSION=$(dpkg-parsechangelog --show-field Version)
+          PRE_VERSION="pre${GITHUB_RUN_NUMBER}"
 
           # Check if version already contains codename suffix
           if [[ "$VERSION" == *"~${CODENAME}"* || "$VERSION" == *"+${CODENAME}"* ]]; then
@@ -93,9 +94,11 @@ jobs:
           else
             if [[ ! $GITHUB_REF =~ ^refs/tags/ ]]; then
               # Not a tag, so add ~pre<x>
-              dch --local ~pre${GITHUB_RUN_NUMBER}+${CODENAME} --distribution ${CODENAME} "Pre-release build"
+              FULL_VERSION="${VERSION}~${PRE_VERSION}-1~${CODENAME}"
+              dch --newversion "${FULL_VERSION}" --distribution "${CODENAME}" "Pre-release for ${CODENAME}"
             else
-              dch --local ~${CODENAME} --distribution ${CODENAME} "Build for ${CODENAME}"
+              FULL_VERSION="${VERSION}-1~${CODENAME}"
+              dch --newversion "${FULL_VERSION}" --distribution "${CODENAME}" "Pre-release for ${CODENAME}"
             fi
           fi
 

From 74e385ec1b916471ca17426322bc93d716f4b944 Mon Sep 17 00:00:00 2001
From: Robert Burger <robert.burger@dlr.de>
Date: Tue, 5 Aug 2025 08:04:24 +0200
Subject: [PATCH 2/2] fix: bash variable export, force -b for pre-releases

---
 .github/workflows/build-deb.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-deb.yaml b/.github/workflows/build-deb.yaml
index 30bd019..420f73c 100644
--- a/.github/workflows/build-deb.yaml
+++ b/.github/workflows/build-deb.yaml
@@ -82,9 +82,9 @@ jobs:
         shell: bash
         run: |
           # baue mit dpkg-buildpackage (ohne signieren)
+          export DEBEMAIL="robert.burger@dlr.de"
+          export DEBFULLNAME="Robert Burger"
           CODENAME=$(lsb_release -sc)
-          DEBEMAIL="robert.burger@dlr.de"
-          DEBFULLNAME="Robert Burger"
           VERSION=$(dpkg-parsechangelog --show-field Version)
           PRE_VERSION="pre${GITHUB_RUN_NUMBER}"
 
@@ -95,7 +95,7 @@ jobs:
             if [[ ! $GITHUB_REF =~ ^refs/tags/ ]]; then
               # Not a tag, so add ~pre<x>
               FULL_VERSION="${VERSION}~${PRE_VERSION}-1~${CODENAME}"
-              dch --newversion "${FULL_VERSION}" --distribution "${CODENAME}" "Pre-release for ${CODENAME}"
+              dch -b --newversion "${FULL_VERSION}" --distribution "${CODENAME}" "Pre-release for ${CODENAME}"
             else
               FULL_VERSION="${VERSION}-1~${CODENAME}"
               dch --newversion "${FULL_VERSION}" --distribution "${CODENAME}" "Pre-release for ${CODENAME}"