From 281f85929ba631c6ccd2959010c87f952e22292d Mon Sep 17 00:00:00 2001
From: Jan Vermaete <jan.vermaete@gmail.com>
Date: Fri, 25 Oct 2024 18:45:18 +0200
Subject: [PATCH] Ubuntu 20.04 -> 24.04

Signed-off-by: Jan Vermaete <jan.vermaete@gmail.com>
---
 .github/workflows/main.yml | 11 ++++++-----
 debian/compat              |  1 -
 debian/control             |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 debian/compat

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index efe77d1..376dc9e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,14 +3,14 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - vermaete/ubuntu2404
   workflow_dispatch:
   schedule:
     - cron: "0 2 * * 5"
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
 
     env:
       DEBFULLNAME: "Fred Hornsey"
@@ -26,6 +26,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: OpenDDS-Debian
+        ref: 'vermaete/ubuntu240.4'
 
     - name: Checkout OpenDDS
       uses: actions/checkout@v4
@@ -50,8 +51,8 @@ jobs:
         SHA=$(git rev-parse --short HEAD)
         cd ../OpenDDS-Debian
         git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-        git fetch --depth 1 origin ubuntu_20_04
-        git checkout ubuntu_20_04
+        git fetch --depth 1 origin ubuntu_24_04
+        git checkout ubuntu_24_04
         cp ../opendds.deb opendds.deb
         git add opendds.deb
         git \
@@ -64,7 +65,7 @@ jobs:
       with:
         directory: 'OpenDDS-Debian'
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        branch: 'ubuntu_20_04'
+        branch: 'ubuntu_24_04'
 
     - name: Lintian
       run: lintian --pedantic --info --display-info opendds.deb
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 7149ddd..c1dba38 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: opendds
 Priority: optional
 Maintainer: Fred Hornsey <hornseyf@objectcomputing.com>
-Build-Depends: debhelper (>= 10), perl (>= 5.26)
-Standards-Version: 4.1.2
+Build-Depends: debhelper-compat (= 13), perl (>= 5.26), build-essential
+Standards-Version: 4.7.0
 Section: libs
 Homepage: http://opendds.org