Merge pull request #76 from pop-os/update

chore: update
pop-os · Feb 16, 2023 · 76b23c5 · 76b23c5
2 parents 74091a9 + 90b2b25
commit 76b23c5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/cosmic-applets b/cosmic-applets
diff --git a/cosmic-bg b/cosmic-bg
diff --git a/cosmic-comp b/cosmic-comp
diff --git a/cosmic-panel b/cosmic-panel
diff --git a/justfile b/justfile
@@ -16,7 +16,7 @@ build:
     mkdir -p build
     {{ just }} cosmic-applets/build
     {{ just }} _meson_build cosmic-applibrary
-    {{ just }} _meson_build cosmic-bg
+    {{ just }} cosmic-bg/build-release
     {{ make }} -C cosmic-comp all
     {{ just }} cosmic-launcher/build-release
     {{ make }} -C cosmic-osd all
@@ -29,7 +29,7 @@ sysext dir=`echo $(pwd)/cosmic-sysext` version=("nightly-" + `git rev-parse --sh
     mkdir -p {{dir}}/usr/lib/extension-release.d/
     {{ just }} rootdir={{dir}} cosmic-applets/install
     {{ just }} _meson_install cosmic-applibrary {{dir}}
-    {{ just }} _meson_install cosmic-bg {{dir}}
+    {{ just }} rootdir={{dir}} cosmic-bg/install
     {{ make }} -C cosmic-comp install DESTDIR={{dir}}
     {{ just }} rootdir={{dir}} cosmic-launcher/install
     {{ make }} -C cosmic-osd install DESTDIR={{dir}} prefix=/usr
@@ -50,7 +50,7 @@ _extension_release dir version:
 clean:
     rm -rf cosmic-applets/target
     rm -rf cosmic-applibrary/target
-    rm -rf cosmic-bg_build
+    rm -rf cosmic-bg/target
     rm -rf cosmic-comp/target
     rm -rf cosmic-launcher/target
     rm -rf cosmic-panel/target
+202 −0		Cargo.lock
+1 −0		Cargo.toml
+24 −0		cosmic-applet-bluetooth/Cargo.toml
+12 −0		cosmic-applet-bluetooth/data/com.system76.CosmicAppletBluetooth.desktop
+60 −0		cosmic-applet-bluetooth/data/icons/com.system76.CosmicAppletBluetooth.svg
+4 −0		cosmic-applet-bluetooth/i18n.toml
+12 −0		cosmic-applet-bluetooth/i18n/en/cosmic_applet_bluetooth.ftl
+554 −0		cosmic-applet-bluetooth/src/app.rs
+641 −0		cosmic-applet-bluetooth/src/bluetooth.rs
+3 −0		cosmic-applet-bluetooth/src/config.rs
+47 −0		cosmic-applet-bluetooth/src/localize.rs
+23 −0		cosmic-applet-bluetooth/src/main.rs
+3 −3		debian/control
+7 −0		justfile
+1 −1		data/com.system76.CosmicBackground.desktop
+0 −17		data/com.system76.CosmicBackground.gschema.xml.in
+5 −13		data/com.system76.CosmicBackground.metainfo.xml
+0 −147		data/icons/com.system76.CosmicBackground.Devel.svg
+15 −0		data/icons/justfile
+0 −10		data/icons/meson.build
+15 −0		data/justfile
+0 −76		data/meson.build
+2 −3		debian/control
+6 −0		debian/rules
+2 −6		flake.nix
+67 −0		justfile
+0 −76		meson.build
+0 −1		po/meson.build
+0 −53		src/meson.build