From bfb829c64d6a0ea22d17d55a7eee0bd3b8d26b4e Mon Sep 17 00:00:00 2001
From: Philip Roche <phil.roche@canonical.com>
Date: Mon, 27 May 2024 12:40:56 +0100
Subject: [PATCH] fix: Remove .idea pycharm directories and files committed in
 error as part of merge commit.

Apologies. Trying to do too many things at once
---
 .../inspectionProfiles/profiles_settings.xml  |  6 ---
 .idea.bkup/livecd-rootfs.iml                  |  8 ---
 .idea.bkup/misc.xml                           |  4 --
 .idea.bkup/modules.xml                        |  8 ---
 .idea.bkup/vcs.xml                            |  7 ---
 .idea.bkup/workspace.xml                      | 50 -------------------
 .../inspectionProfiles/profiles_settings.xml  |  6 ---
 .idea.bkup2/livecd-rootfs.iml                 |  8 ---
 .idea.bkup2/modules.xml                       |  8 ---
 .idea.bkup2/workspace.xml                     |  7 ---
 .../inspectionProfiles/profiles_settings.xml  |  6 ---
 .idea.bkup3/livecd-rootfs.iml                 |  8 ---
 .idea.bkup3/modules.xml                       |  8 ---
 .idea.bkup3/workspace.xml                     |  7 ---
 .../inspectionProfiles/profiles_settings.xml  |  6 ---
 .idea/livecd-rootfs.iml                       |  8 ---
 .idea/modules.xml                             |  8 ---
 .idea/workspace.xml                           |  7 ---
 debian/files                                  |  1 -
 live-build/genbuildinfo.py                    | 43 ----------------
 20 files changed, 214 deletions(-)
 delete mode 100644 .idea.bkup/inspectionProfiles/profiles_settings.xml
 delete mode 100644 .idea.bkup/livecd-rootfs.iml
 delete mode 100644 .idea.bkup/misc.xml
 delete mode 100644 .idea.bkup/modules.xml
 delete mode 100644 .idea.bkup/vcs.xml
 delete mode 100644 .idea.bkup/workspace.xml
 delete mode 100644 .idea.bkup2/inspectionProfiles/profiles_settings.xml
 delete mode 100644 .idea.bkup2/livecd-rootfs.iml
 delete mode 100644 .idea.bkup2/modules.xml
 delete mode 100644 .idea.bkup2/workspace.xml
 delete mode 100644 .idea.bkup3/inspectionProfiles/profiles_settings.xml
 delete mode 100644 .idea.bkup3/livecd-rootfs.iml
 delete mode 100644 .idea.bkup3/modules.xml
 delete mode 100644 .idea.bkup3/workspace.xml
 delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 .idea/livecd-rootfs.iml
 delete mode 100644 .idea/modules.xml
 delete mode 100644 .idea/workspace.xml
 delete mode 100644 debian/files
 delete mode 100755 live-build/genbuildinfo.py

diff --git a/.idea.bkup/inspectionProfiles/profiles_settings.xml b/.idea.bkup/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2da..00000000
--- a/.idea.bkup/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea.bkup/livecd-rootfs.iml b/.idea.bkup/livecd-rootfs.iml
deleted file mode 100644
index d0876a78..00000000
--- a/.idea.bkup/livecd-rootfs.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea.bkup/misc.xml b/.idea.bkup/misc.xml
deleted file mode 100644
index 02b69cde..00000000
--- a/.idea.bkup/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (cpc-sbom) (2)" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/.idea.bkup/modules.xml b/.idea.bkup/modules.xml
deleted file mode 100644
index 8f7a3b65..00000000
--- a/.idea.bkup/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/livecd-rootfs.iml" filepath="$PROJECT_DIR$/.idea/livecd-rootfs.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea.bkup/vcs.xml b/.idea.bkup/vcs.xml
deleted file mode 100644
index 1fb36172..00000000
--- a/.idea.bkup/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/livecd-rootfs" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea.bkup/workspace.xml b/.idea.bkup/workspace.xml
deleted file mode 100644
index fde7212b..00000000
--- a/.idea.bkup/workspace.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="8b53e4fe-d06b-4120-bca1-09aab0c0e0b8" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/debian/changelog" beforeDir="false" afterPath="$PROJECT_DIR$/debian/changelog" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary" beforeDir="false" afterPath="$PROJECT_DIR$/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/livecd-rootfs/debian/changelog" beforeDir="false" afterPath="$PROJECT_DIR$/livecd-rootfs/debian/changelog" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/livecd-rootfs/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary" beforeDir="false" afterPath="$PROJECT_DIR$/livecd-rootfs/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectColorInfo"><![CDATA[{
-  "associatedIndex": 3
-}]]></component>
-  <component name="ProjectId" id="2VtkQwj0NQBRHE5uOcNk4KgQ7sF" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "WebServerToolWindowFactoryState": "false",
-    "last_opened_file_path": "/home/philroche/Working/livecd-rootfs",
-    "vue.rearranger.settings.migration": "true"
-  }
-}]]></component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="8b53e4fe-d06b-4120-bca1-09aab0c0e0b8" name="Changes" comment="" />
-      <created>1695662751675</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1695662751675</updated>
-      <workItem from="1695662752677" duration="2000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea.bkup2/inspectionProfiles/profiles_settings.xml b/.idea.bkup2/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2da..00000000
--- a/.idea.bkup2/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea.bkup2/livecd-rootfs.iml b/.idea.bkup2/livecd-rootfs.iml
deleted file mode 100644
index d0876a78..00000000
--- a/.idea.bkup2/livecd-rootfs.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea.bkup2/modules.xml b/.idea.bkup2/modules.xml
deleted file mode 100644
index 8f7a3b65..00000000
--- a/.idea.bkup2/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/livecd-rootfs.iml" filepath="$PROJECT_DIR$/.idea/livecd-rootfs.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea.bkup2/workspace.xml b/.idea.bkup2/workspace.xml
deleted file mode 100644
index d12cdb62..00000000
--- a/.idea.bkup2/workspace.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea.bkup3/inspectionProfiles/profiles_settings.xml b/.idea.bkup3/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2da..00000000
--- a/.idea.bkup3/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea.bkup3/livecd-rootfs.iml b/.idea.bkup3/livecd-rootfs.iml
deleted file mode 100644
index d0876a78..00000000
--- a/.idea.bkup3/livecd-rootfs.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea.bkup3/modules.xml b/.idea.bkup3/modules.xml
deleted file mode 100644
index 8f7a3b65..00000000
--- a/.idea.bkup3/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/livecd-rootfs.iml" filepath="$PROJECT_DIR$/.idea/livecd-rootfs.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea.bkup3/workspace.xml b/.idea.bkup3/workspace.xml
deleted file mode 100644
index d12cdb62..00000000
--- a/.idea.bkup3/workspace.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2da..00000000
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/.idea/livecd-rootfs.iml b/.idea/livecd-rootfs.iml
deleted file mode 100644
index d0876a78..00000000
--- a/.idea/livecd-rootfs.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 8f7a3b65..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/livecd-rootfs.iml" filepath="$PROJECT_DIR$/.idea/livecd-rootfs.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index d12cdb62..00000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/debian/files b/debian/files
deleted file mode 100644
index 12597f08..00000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-livecd-rootfs_2.765.30_source.buildinfo devel optional
diff --git a/live-build/genbuildinfo.py b/live-build/genbuildinfo.py
deleted file mode 100755
index 25e519bd..00000000
--- a/live-build/genbuildinfo.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/python3
-import apt
-import os
-import platform
-import datetime
-from datetime import datetime, timezone
-
-# Get the current date and time in UTC timezone aware
-utc_now = datetime.now(timezone.utc)
-
-def get_system_architecture():
-    arch = platform.machine()
-    if arch == 'x86_64':
-        return 'amd64'
-    elif arch == 'aarch64':
-        return 'arm64'
-    else:
-        return f"Unknown architecture: {arch}"
-
-print("Format: 1.0")
-print("Build-Origin: Ubuntu")
-print(f"Build-Architecture: {get_system_architecture()}")
-print(f"Build-Date: {utc_now}")
-# Using python-apt to gather installed packages
-try:
-    package_cache = apt.Cache()
-
-    print("List of installed packages:")
-    for package in package_cache:
-        if package.is_installed:
-            print(f" {package.name} (= {package.installed.version}),")
-
-except Exception as e:
-    print(f"An error occurred while fetching installed packages: {e}")
-
-# Using os module to list all environment variables
-try:
-    print("\nEnvironment variables:")
-    for param, value in os.environ.items():
-        print(f" {param}={value}")
-
-except Exception as e:
-    print(f"An error occurred while fetching environment variables: {e}")