From ed55e14dde20d717aec2f5560c4a2d1db4d524bf Mon Sep 17 00:00:00 2001
From: Simon Quigley <simon@tsimonq2.net>
Date: Fri, 20 Oct 2023 12:39:10 -0500
Subject: [PATCH] New upstream release.

---
 debian/changelog                              |  6 +++
 .../patches/0001-replace-pkexec-by-sudo.patch |  9 ++---
 debian/patches/netplan-networking.patch       | 40 -------------------
 debian/patches/series                         |  1 -
 4 files changed, 10 insertions(+), 46 deletions(-)
 delete mode 100644 debian/patches/netplan-networking.patch

diff --git a/debian/changelog b/debian/changelog
index a6a5827..a6f4ff9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+calamares (3.3.0-alpha4-0ubuntu1) noble; urgency=medium
+
+  * New upstream release.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 20 Oct 2023 12:33:39 -0500
+
 calamares (3.3.0-alpha2-0ubuntu6) mantic; urgency=medium
 
   * Add support for Netplan backends (LP: #2036999).
diff --git a/debian/patches/0001-replace-pkexec-by-sudo.patch b/debian/patches/0001-replace-pkexec-by-sudo.patch
index 279255c..f467be8 100644
--- a/debian/patches/0001-replace-pkexec-by-sudo.patch
+++ b/debian/patches/0001-replace-pkexec-by-sudo.patch
@@ -8,18 +8,17 @@ Subject: replace pkexec by sudo
 
 --- a/calamares.desktop
 +++ b/calamares.desktop
-@@ -6,13 +6,14 @@ GenericName=System Installer
- Comment=Calamares — System Installer
+@@ -5,12 +5,13 @@ Name=Install System
+ GenericName=System Installer
  Keywords=calamares;system;installer;
  TryExec=calamares
 -Exec=sh -c "pkexec calamares"
 +Exec=sh -c "sudo -E calamares -D6"
- 
- Categories=Qt;System;
+ Comment=Calamares — System Installer
  Icon=calamares
  Terminal=false
- SingleMainWindow=true
  StartupNotify=true
+ Categories=Qt;System;
 +NotShowIn=LXQt;
  X-AppStream-Ignore=true
  
diff --git a/debian/patches/netplan-networking.patch b/debian/patches/netplan-networking.patch
deleted file mode 100644
index 312e7ab..0000000
--- a/debian/patches/netplan-networking.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Add support for Netplan backends
- Ubuntu switched to using Netplan as a backend for Network Manager. Add support for those configs
-Author: Simon Quigley <tsimonq2@lubuntu.me>
-Origin: vendor
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/calamares/+bug/2036999
-Last-Update: 2023-10-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/modules/networkcfg/main.py
-+++ b/src/modules/networkcfg/main.py
-@@ -14,6 +14,7 @@
- #
- 
- import os
-+import glob
- import shutil
- 
- import libcalamares
-@@ -131,6 +132,21 @@ def run():
-             except FileExistsError:
-                 pass
- 
-+    # Also install netplan files
-+    source_netplan = "/etc/netplan"
-+    root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
-+    target_netplan = os.path.join(root_mount_point, source_netplan.lstrip('/'))
-+
-+    if os.path.exists(source_netplan) and os.path.exists(target_netplan):
-+        for cfg in glob.glob(os.path.join(source_netplan, "90-NM-*")):
-+            source_cfg = os.path.join(source_netplan, cfg)
-+            target_cfg = os.path.join(target_netplan, os.path.basename(cfg))
-+
-+            if os.path.exists(target_cfg):
-+                continue
-+
-+            shutil.copy(source_cfg, target_cfg)
-+
-     # We need to overwrite the default resolv.conf in the chroot.
-     source_resolv, target_resolv = path_pair(root_mount_point, "etc/resolv.conf")
-     if source_resolv != target_resolv and os.path.exists(source_resolv):
diff --git a/debian/patches/series b/debian/patches/series
index 62ee15f..683ca99 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-replace-pkexec-by-sudo.patch
 apport-package-hook.patch
-netplan-networking.patch