diff --git a/.gitignore b/.gitignore index 77ff1b7fa667ef13beb25d2548cb0082373d6079..d882d20d51cf137b3caad29e5e022250fb6fefeb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,8 @@ debian/phosh-wallpapers.substvars debian/phosh-wallpapers/ debian/plymouth-theme-phosh.postinst.debhelper debian/plymouth-theme-phosh.prerm.debhelper +debian/plymouth-theme-phosh.substvars debian/plymouth-theme-phosh/ +debian/sound-theme-phosh.substvars +debian/sound-theme-phosh/ debian/tmp/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cb235b7715b646b39103a163249407c8df8aeb3e..342988d6133bfadcf49d393fbc594f5295414a3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ default: variables: # For ci-fairy FDO_UPSTREAM_REPO: guidog/phosh-wallpapers - DEBIAN_IMAGE: $CI_REGISTRY/guidog/phosh-osk-stub/debian:v0.0.20230427 + DEBIAN_IMAGE: $CI_REGISTRY/guidog/phosh-osk-stub/debian:v0.0.2024-05-03 .prep: &prep before_script: diff --git a/README.md b/README.md index cffff29393ffb670eefa8d42c44eb1758048ff0f..bbfbc11bd5a2cd2b7e6adbea2d1585276c292b44 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ # Phosh Wallpapers -Phosh wallpapers and other artwork. See [copyright](./debian/copyright) for -artwork copyright and authors. +Phosh wallpapers and other artwork ## License -phosh-wallpapers are licensed under the GPLv3+. +See [copyright](./debian/copyright) for copyright and author information. ## Getting the source @@ -16,3 +15,17 @@ cd phosh-wallpapers The [main][] branch has the current development version. +## Installing + +This project use the meson (and thereby Ninja) build system. The quickest way +to get going is to do the following: + +```sh +meson setup _build +meson compile -C _build +meson install -C _build +``` + +which will install the files to `/usr/local` in their respective folders. + +[main]: https://gitlab.gnome.org/guidog/phosh-wallpapers/-/tree/main diff --git a/debian/control b/debian/control index c24f8179a4e5413a9b43346d65178034fe6de169..299b14ab70a2bbf0960dbaa2a8525ee7912107db 100644 --- a/debian/control +++ b/debian/control @@ -37,3 +37,16 @@ Description: boot animation, logger and I/O multiplexer - Phosh theme password prompts for encrypted file systems. . This package provides the default Phosh theme. + +Package: sound-theme-phosh +Architecture: all +Depends: + ${misc:Depends}, +Recommends: + sound-theme-freedesktop, +Description: Phosh sound theme + The default sound theme for Phosh following the XDG theming + specification. It contains sounds for phone related events + and can e.g. be used to amend the freedesktop.org sound + theme. + diff --git a/debian/copyright b/debian/copyright index 2c5921b9a6361c38c468aaf20db46b090b91553a..a0216cc3ba9d29626112f18e2d78ac1bf63771a7 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,6 +2,10 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: phosh-wallpapers Source: https://gitlab.gnome.org/guidog/phosh-wallpapers +Files: * +Copyright: 2023 Guido Günther +License: GPL-3+ + Files: wallpapers/byzantium-abstract-*.jpg Copyright: 2022 François Téchené License: CC-BY-SA-4 @@ -9,22 +13,24 @@ License: CC-BY-SA-4 Files: plymouth/* Copyright: 2020 Purism, SPC 2020 Arnaud Ferraris -License: GPL-3.0-or-later +License: GPL-3+ -Files: wallpapers/logo-*.jpg - plymouth/logo.png +Files: wallpapers/*logo* + plymouth/*logo* Copyright: 2022 Guido Günther License: CC-BY-SA-4 -Files: - debian/* - wallpapers/*.xml.in - *.doap - wallpapers/meson.build - meson.build - README.md -Copyright: 2023 Guido Günther -License: GPL-3+ +Files: sounds/stereo/message-new-*.oga +Copyright: Baptiste Gelez +License: CC0 + +Files: sounds/stereo/*-incoming-call.oga +Copyright: Feandesign +License: CC0 + +Files: sounds/stereo/system-ready.oga +Copyright: Antonio Paternina Alvarez +License: CC-BY-SA-4 License: GPL-3+ This package is free software; you can redistribute it and/or modify @@ -356,3 +362,18 @@ License: CC-BY-SA-4 limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority. + +License: CC0 + CC0 1.0 Universal + . + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/CC0-1.0". diff --git a/debian/sound-theme-phosh.install b/debian/sound-theme-phosh.install new file mode 100644 index 0000000000000000000000000000000000000000..3daf0abcf37bad4a742a3e964518218551befdf6 --- /dev/null +++ b/debian/sound-theme-phosh.install @@ -0,0 +1 @@ +/usr/share/sounds diff --git a/meson.build b/meson.build index f7832c1d83f7ded943b4a445346b9a892950110e..95d1cdb516dd626cd47b58fd144149ba80de1918 100644 --- a/meson.build +++ b/meson.build @@ -9,9 +9,11 @@ prefix = get_option('prefix') datadir = join_paths(prefix, get_option('datadir')) imagesdir = join_paths(datadir, 'phosh', 'backgrounds') +sounddir = datadir / 'sounds' / 'phosh' themedir = datadir / 'plymouth' / 'themes' / 'phosh' # So g-c-c can find them backgroundpropsdir = join_paths(datadir, 'gnome-background-properties') subdir('wallpapers') subdir('plymouth') +subdir('sounds') diff --git a/sounds/index.theme b/sounds/index.theme new file mode 100644 index 0000000000000000000000000000000000000000..a0965e90909cf959726c0cfdc39d181f825e890a --- /dev/null +++ b/sounds/index.theme @@ -0,0 +1,4 @@ +[Sound Theme] +Name=Phosh +Comment=Sound theme for Phosh +Directories=stereo diff --git a/sounds/meson.build b/sounds/meson.build new file mode 100644 index 0000000000000000000000000000000000000000..1f452f1881cccde5c36890dee0943afb3d2c5ae6 --- /dev/null +++ b/sounds/meson.build @@ -0,0 +1,7 @@ +theme = files( + 'index.theme', +) + +install_data(theme, install_dir: sounddir) + +subdir('stereo') diff --git a/sounds/stereo/meson.build b/sounds/stereo/meson.build new file mode 100644 index 0000000000000000000000000000000000000000..140d5559bc53d8c23694f7387118e2974ad892dc --- /dev/null +++ b/sounds/stereo/meson.build @@ -0,0 +1,9 @@ +theme = files( + 'message-new-email.oga', + 'message-new-instant.oga', + 'phone-incoming-call.oga', + 'system-ready.oga', + 'video-incoming-call.oga', +) + +install_data(theme, install_dir: sounddir / 'stereo') diff --git a/sounds/stereo/message-new-email.oga b/sounds/stereo/message-new-email.oga new file mode 100644 index 0000000000000000000000000000000000000000..c50f0264fa48fd36061cb3afe8e448a3920d7800 Binary files /dev/null and b/sounds/stereo/message-new-email.oga differ diff --git a/sounds/stereo/message-new-instant.oga b/sounds/stereo/message-new-instant.oga new file mode 100644 index 0000000000000000000000000000000000000000..5d2ef277277dc188711c98ee6d08998be5744012 Binary files /dev/null and b/sounds/stereo/message-new-instant.oga differ diff --git a/sounds/stereo/phone-incoming-call.oga b/sounds/stereo/phone-incoming-call.oga new file mode 100644 index 0000000000000000000000000000000000000000..069f45170f9a85576edbc38aa96b80fb4578893e Binary files /dev/null and b/sounds/stereo/phone-incoming-call.oga differ diff --git a/sounds/stereo/system-ready.oga b/sounds/stereo/system-ready.oga new file mode 100644 index 0000000000000000000000000000000000000000..6f7814e805263bba588da149e39ae66b6770810d Binary files /dev/null and b/sounds/stereo/system-ready.oga differ diff --git a/sounds/stereo/video-incoming-call.oga b/sounds/stereo/video-incoming-call.oga new file mode 100644 index 0000000000000000000000000000000000000000..2d1c7ee9189d19f11fae0c502a210f87a3e00fbb Binary files /dev/null and b/sounds/stereo/video-incoming-call.oga differ