From 03ea89fad03bb123ae8660f15206a687a0b3f45d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Fri, 29 Sep 2023 08:57:35 -0600 Subject: [PATCH] Update submodules and specify master_jammy as remote branch --- .gitmodules | 18 ++++++++++++++++-- cosmic-applets | 2 +- cosmic-applibrary | 2 +- cosmic-comp | 2 +- cosmic-launcher | 2 +- cosmic-notifications | 2 +- cosmic-panel | 2 +- cosmic-settings | 2 +- cosmic-workspaces-epoch | 2 +- 9 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 48fd08b..1984c0b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,42 +1,56 @@ [submodule "cosmic-session"] path = cosmic-session url = https://github.com/pop-os/cosmic-session + branch = master_jammy [submodule "cosmic-comp"] path = cosmic-comp url = https://github.com/pop-os/cosmic-comp + branch = master_jammy [submodule "cosmic-panel"] path = cosmic-panel url = https://github.com/pop-os/cosmic-panel + branch = master_jammy [submodule "cosmic-applets"] path = cosmic-applets url = https://github.com/pop-os/cosmic-applets + branch = master_jammy [submodule "cosmic-applibrary"] path = cosmic-applibrary url = https://github.com/pop-os/cosmic-applibrary + branch = master_jammy [submodule "cosmic-launcher"] path = cosmic-launcher url = https://github.com/pop-os/cosmic-launcher + branch = master_jammy [submodule "simple-wrapper"] path = simple-wrapper url = https://github.com/pop-os/simple-wrapper + branch = master_jammy [submodule "cosmic-settings"] - path = cosmic-settings - url = https://github.com/pop-os/cosmic-settings + path = cosmic-settings + url = https://github.com/pop-os/cosmic-settings + branch = master_jammy [submodule "cosmic-settings-daemon"] path = cosmic-settings-daemon url = https://github.com/pop-os/cosmic-settings-daemon + branch = master_jammy [submodule "xdg-desktop-portal-cosmic"] path = xdg-desktop-portal-cosmic url = https://github.com/pop-os/xdg-desktop-portal-cosmic.git + branch = master_jammy [submodule "cosmic-osd"] path = cosmic-osd url = https://github.com/pop-os/cosmic-osd.git + branch = master_jammy [submodule "cosmic-bg"] path = cosmic-bg url = https://github.com/pop-os/cosmic-bg.git + branch = master_jammy [submodule "cosmic-workspaces-epoch"] path = cosmic-workspaces-epoch url = https://github.com/pop-os/cosmic-workspaces-epoch/ + branch = master_jammy [submodule "cosmic-notifications"] path = cosmic-notifications url = https://github.com/pop-os/cosmic-notifications + branch = master_jammy diff --git a/cosmic-applets b/cosmic-applets index 2d1b868..b71d1b0 160000 --- a/cosmic-applets +++ b/cosmic-applets @@ -1 +1 @@ -Subproject commit 2d1b8680f9389431a271da550909d43aa8779399 +Subproject commit b71d1b0e1bb5e51f9cd05740c3176f24f6b6ca62 diff --git a/cosmic-applibrary b/cosmic-applibrary index 6fb82a5..2aea013 160000 --- a/cosmic-applibrary +++ b/cosmic-applibrary @@ -1 +1 @@ -Subproject commit 6fb82a577fa2b1c57ac1d25081f2bdc9f92531f4 +Subproject commit 2aea013caaf78c2e49f62e4766f0d7eba0fe54a0 diff --git a/cosmic-comp b/cosmic-comp index f6ea7fa..db3e372 160000 --- a/cosmic-comp +++ b/cosmic-comp @@ -1 +1 @@ -Subproject commit f6ea7fa81d1befa2c74af62a1037036cbfa49f15 +Subproject commit db3e372b8f81f174513b4a9f82a876d267d0145c diff --git a/cosmic-launcher b/cosmic-launcher index 2e1412c..5c272d8 160000 --- a/cosmic-launcher +++ b/cosmic-launcher @@ -1 +1 @@ -Subproject commit 2e1412c86ec07c8c143adc3370361791f8f04983 +Subproject commit 5c272d8edcbaed19ecc3b3150fb3187dd5c6fbf6 diff --git a/cosmic-notifications b/cosmic-notifications index e42d4a0..4021bea 160000 --- a/cosmic-notifications +++ b/cosmic-notifications @@ -1 +1 @@ -Subproject commit e42d4a0e3ef00dbe2d1478d7563cbe326f6b8311 +Subproject commit 4021beac8b95e2915eba08b29b9ceb6b72309462 diff --git a/cosmic-panel b/cosmic-panel index 1d985ba..df55f44 160000 --- a/cosmic-panel +++ b/cosmic-panel @@ -1 +1 @@ -Subproject commit 1d985bac5ef8f8d18ec4f4850898c5a607445f26 +Subproject commit df55f44f504c1cee9377cb331c1fb9d95ca83967 diff --git a/cosmic-settings b/cosmic-settings index 1c6ed73..9051e07 160000 --- a/cosmic-settings +++ b/cosmic-settings @@ -1 +1 @@ -Subproject commit 1c6ed73165b4518e0625c8011633b59d9236eb91 +Subproject commit 9051e07494b1b6f36c0dc0657a9389fc1953afae diff --git a/cosmic-workspaces-epoch b/cosmic-workspaces-epoch index bbd0a1c..d8c820b 160000 --- a/cosmic-workspaces-epoch +++ b/cosmic-workspaces-epoch @@ -1 +1 @@ -Subproject commit bbd0a1c12808002470b9859f934bf3e05ad757c8 +Subproject commit d8c820b86f600b71e62338f929d8f7b7e919b498