From 83c6f5eadad62551a723221a7b07eaf036a2b63e Mon Sep 17 00:00:00 2001
From: Daniel Cerna <cernadaniel32@gmail.com>
Date: Tue, 27 Jun 2023 11:04:37 -0400
Subject: [PATCH] Migrating 4th layer to debian 12

---
 .../base/04-shared-libs/dependencies.txt      | 67 +++++++++++++++++--
 1 file changed, 63 insertions(+), 4 deletions(-)

diff --git a/software-modules/base/04-shared-libs/dependencies.txt b/software-modules/base/04-shared-libs/dependencies.txt
index 67b65664..3c1860be 100644
--- a/software-modules/base/04-shared-libs/dependencies.txt
+++ b/software-modules/base/04-shared-libs/dependencies.txt
@@ -2,10 +2,19 @@ antlr3
 binutils
 binutils-common
 binutils-x86-64-linux-gnu
-ca-certificates-java
-cpp
-cpp-10
-dirmngr
+chromium-common
+codeblocks-common
+emacs-bin-common
+emacs-el
+emacs-gtk
+gawk
+geany-common
+gedit-common
+gettext-base
+gir1.2-adw-1
+gir1.2-graphene-1.0
+gir1.2-gstreamer-1.0
+gir1.2-gtk-4.0
 gir1.2-gtksource-4
 git
 gnupg
@@ -318,9 +327,16 @@ libvisualvm-jni
 libvlc5
 libvlccore9
 libvterm0
+<<<<<<< dest:   bbacbb3d49e5 - cernadaniel32: Migrating 2nd and 3rd layer to ...
 libwxbase3.0-0v5
 libwxgtk3.0-gtk3-0v5
 libx11-xcb1
+||||||| base
+libwxbase3.2-1
+=======
+libwxbase3.2-1
+libwxgtk3.2-1
+>>>>>>> source: c304d2530895 - cernadaniel32: Migrating 4th layer to debian 12
 libxcb-composite0
 libxcb-damage0
 libxcb-dri3-0
@@ -347,9 +363,44 @@ pinentry-curses
 plasma-framework
 pypy3-lib
 python3-cairo
+<<<<<<< dest:   bbacbb3d49e5 - cernadaniel32: Migrating 2nd and 3rd layer to ...
 python3-gi
 python3-gi-cairo
 qml-module-org-kde-bluezqt
+||||||| base
+python3-certifi
+python3-chardet
+python3-charset-normalizer
+python3-click
+python3-colorama
+python3-dbus
+python3-gtts
+python3-gtts-token
+python3-idna
+python3-langdetect
+python3-newt
+python3-requests
+python3-six
+python3-soupsieve
+python3-urllib3
+=======
+python3-certifi
+python3-chardet
+python3-charset-normalizer
+python3-click
+python3-colorama
+python3-dbus
+python3-gi-cairo
+python3-gtts
+python3-gtts-token
+python3-idna
+python3-langdetect
+python3-newt
+python3-requests
+python3-six
+python3-soupsieve
+python3-urllib3
+>>>>>>> source: c304d2530895 - cernadaniel32: Migrating 4th layer to debian 12
 qml-module-org-kde-kconfig
 qml-module-org-kde-kquickcontrols
 qml-module-org-kde-kquickcontrolsaddons
@@ -368,7 +419,15 @@ qml-module-qtquick-window2
 qml-module-qtquick-xmllistmodel
 qml-module-qtquick2
 qml-module-qtwebkit
+<<<<<<< dest:   bbacbb3d49e5 - cernadaniel32: Migrating 2nd and 3rd layer to ...
 ruby-minitest
+||||||| base
+rake
+ruby
+=======
+rake
+rpcsvc-proto
+>>>>>>> source: c304d2530895 - cernadaniel32: Migrating 4th layer to debian 12
 ruby-net-telnet
 ruby-power-assert
 ruby-test-unit