do stupid shenanigans for ubuntu .deb

Author: henderkes

.github/workflows/build-gcc-deb-packages.yml

@@ -153,15 +153,8 @@ jobs:
                     echo "SignWith: ${FPR}" >> "${REPO_ROOT}/conf/distributions"
 
                     shopt -s nullglob globstar
-
-                    jammy_debs=(
-                      collected/jammy/amd64/**/*.deb collected/jammy/amd64/*.deb
-                      collected/jammy/arm64/**/*_arm64.deb collected/jammy/arm64/*_arm64.deb
-                    )
-                    noble_debs=(
-                      collected/noble/amd64/**/*.deb collected/noble/amd64/*.deb
-                      collected/noble/arm64/**/*_arm64.deb collected/noble/arm64/*_arm64.deb
-                    )
+                    jammy_debs=( collected/jammy/**/*.deb )
+                    noble_debs=( collected/noble/**/*.deb )
 
                     if [ ${#jammy_debs[@]} -gt 0 ]; then
                       reprepro -b "${REPO_ROOT}" includedeb jammy "${jammy_debs[@]}"

src/step/CreatePackages.php

@@ -311,21 +311,32 @@ private static function createRpmPackage(string $name, array $config, string $ph
         }
     }
 
-    private static function createDebPackage(string $name, array $config, string $phpVersion, string $architecture, string $iteration, array $extraArgs = []): void
-    {
+    private static function createDebPackage(
+        string $name,
+        array $config,
+        string $phpVersion,
+        string $architecture,
+        string $iteration,
+        array $extraArgs = [],
+    ): void {
         echo "Creating DEB package for {$name}...\n";
 
         $phpVersion = preg_replace('/_\d+$/', '', $phpVersion);
 
+        $osRelease = parse_ini_file('/etc/os-release');
+        $distroCodename = $osRelease['VERSION_CODENAME'] ?? null;
+        $debIteration = $distroCodename !== '' ? "{$iteration}~{$distroCodename}" : $iteration;
+        $fullVersion = "{$phpVersion}-{$debIteration}";
+
         $fpmArgs = [
             'fpm',
             '-s', 'dir',
             '-t', 'deb',
             '-p', DIST_DEB_PATH,
             '--name', $name,
-            '--version', $phpVersion,
+            '--version', $phpVersion,          // upstream version
             '--architecture', $architecture,
-            '--iteration', $iteration,
+            '--iteration', $debIteration,       // Debian revision (includes distro)
             '--description', "Static PHP Package for {$name}",
             '--license', 'MIT',
             '--maintainer', 'Static PHP <info@static-php.dev>'
@@ -334,14 +345,14 @@ private static function createDebPackage(string $name, array $config, string $ph
         if (isset($config['provides']) && is_array($config['provides'])) {
             foreach ($config['provides'] as $provide) {
                 $fpmArgs[] = '--provides';
-                $fpmArgs[] = "$provide (= $phpVersion)";
+                $fpmArgs[] = "{$provide} (= {$fullVersion})";
             }
         }
 
         if (isset($config['replaces']) && is_array($config['replaces'])) {
             foreach ($config['replaces'] as $replace) {
                 $fpmArgs[] = '--replaces';
-                $fpmArgs[] = "$replace < {$phpVersion}-{$iteration})";
+                $fpmArgs[] = "{$replace} (< {$fullVersion})";
             }
         }
 
@@ -350,7 +361,7 @@ private static function createDebPackage(string $name, array $config, string $ph
             $lib = preg_replace('/_\D+/', '', $lib);
             $numericVersion = preg_replace('/[^0-9.]/', '', $version);
             $fpmArgs[] = '--depends';
-            $fpmArgs[] = "$lib (>= {$numericVersion})";
+            $fpmArgs[] = "{$lib} (>= {$numericVersion})";
         }
         if (isset($config['depends']) && is_array($config['depends'])) {
             foreach ($config['depends'] as $depend) {
@@ -378,16 +389,15 @@ private static function createDebPackage(string $name, array $config, string $ph
             foreach ($config['files'] as $source => $dest) {
                 if (file_exists($source)) {
                     $fpmArgs[] = $source . '=' . $dest;
-                }
-                else {
+                } else {
                     echo "Warning: Source file not found: {$source}\n";
                 }
             }
         }
 
         if (isset($config['empty_directories']) && is_array($config['empty_directories'])) {
             $emptyDir = TEMP_DIR . '/spp_empty';
-            if (!file_exists($emptyDir) && !mkdir($emptyDir, 0755,true) && !is_dir($emptyDir)) {
+            if (!file_exists($emptyDir) && !mkdir($emptyDir, 0755, true) && !is_dir($emptyDir)) {
                 throw new \RuntimeException(sprintf('Directory "%s" was not created', $emptyDir));
             }
             if (is_dir($emptyDir)) {
@@ -407,7 +417,7 @@ private static function createDebPackage(string $name, array $config, string $ph
             echo $buffer;
         });
 
-        echo "DEB package created: " . DIST_DEB_PATH . "/{$name}_{$phpVersion}-{$iteration}_{$architecture}.deb\n";
+        echo "DEB package created: " . DIST_DEB_PATH . "/{$name}_{$phpVersion}-{$debIteration}_{$architecture}.deb\n";
     }
 
     private static function getPhpVersionAndArchitecture(): array
@@ -417,7 +427,6 @@ private static function getPhpVersionAndArchitecture(): array
         }
         $basePhpVersion = SPP_PHP_VERSION;
         $phpBinary = BUILD_BIN_PATH . '/php';
-        $fullPhpVersion = null; // Default to base version if binary check fails
 
         if (!file_exists($phpBinary)) {
             throw new RuntimeException("Warning: PHP binary not found at {$phpBinary}, using base PHP version: {$basePhpVersion}");