diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1883ffc4bc674951fdeb425c22cf855aa4fd321f..f6205e237445009d5e71cfb78844bbd59124bf68 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,7 +39,7 @@ workflow: variables: # For ci-fairy FDO_UPSTREAM_REPO: World/Phosh/stevia - DEBIAN_IMAGE: $CI_REGISTRY/world/phosh/stevia/debian:v0.0.2025-09-18 + DEBIAN_IMAGE: $CI_REGISTRY/world/phosh/stevia/debian:v0.0.2025-11-14 XVFB_RUN: xvfb-run -a -s -noreset COMMON_BUILD_OPTS: --werror -Db_coverage=true -Dprefix=/usr ALPINE_EDGE_DEPS: alpine-sdk feedbackd-dev git glib-dev gnome-desktop-dev @@ -47,12 +47,12 @@ variables: elogind-dev wayland-dev wayland-protocols ttf-dejavu presage-dev gmobile-dev -.trixie_vars: &trixie_vars +.forky_vars: &forky_vars variables: - DIST: trixie + DIST: forky BUILD_OPTS: ${COMMON_BUILD_OPTS} -.trixie_prep: &trixie_prep +.forky_prep: &forky_prep before_script: - apt-get -y update - apt-get -y build-dep . @@ -105,11 +105,11 @@ sanity: rules: - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME' -build:native-debian-trixie: +build:native-debian-forky: stage: build image: ${DEBIAN_IMAGE} - <<: *trixie_prep - <<: *trixie_vars + <<: *forky_prep + <<: *forky_vars <<: *build_step artifacts: paths: @@ -118,13 +118,13 @@ build:native-debian-trixie: variables: - $PKG_ONLY == "1" -test:native-debian-trixie: +test:native-debian-forky: stage: test+docs image: ${DEBIAN_IMAGE} - <<: *trixie_prep + <<: *forky_prep needs: - - build:native-debian-trixie - <<: *trixie_vars + - build:native-debian-forky + <<: *forky_vars <<: *test_step coverage: '/^lines:\s+([\d.]+\%)\s+/' artifacts: @@ -138,7 +138,7 @@ test:native-debian-trixie: doc: stage: test+docs image: ${DEBIAN_IMAGE} - <<: *trixie_prep + <<: *forky_prep needs: [] variables: BUILD_OPTS: >- @@ -163,7 +163,7 @@ test-layouts: phosh-wallpapers dbus-x11 fonts-noto-core needs: - - build:native-debian-trixie + - build:native-debian-forky script: - !reference [.phosh-prepare-apt] - XDG_RUNTIME_DIR=$PWD diff --git a/.gitlab-ci/debian.Dockerfile b/.gitlab-ci/debian.Dockerfile index 12b26954481754aa3150465d614a8f534b3b0842..91df74a44600782ca05435ce1e3479167ea9b8ce 100644 --- a/.gitlab-ci/debian.Dockerfile +++ b/.gitlab-ci/debian.Dockerfile @@ -1,4 +1,4 @@ -FROM debian:trixie-slim +FROM debian:forky-slim RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -y update \ diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh index a220a6947e6f855537a91fe6cb427783374dcdaf..e67595859bfce2fde8384b650a0f85e64c8127b7 100755 --- a/.gitlab-ci/run-docker.sh +++ b/.gitlab-ci/run-docker.sh @@ -99,7 +99,7 @@ else fi REGISTRY="registry.gitlab.gnome.org" -REPO="world/phosh" +REPO="world/phosh/stevia" TAG="${REGISTRY}/${REPO}/${base}:${base_version}" if [ $build == 1 ]; then diff --git a/NEWS b/NEWS index ba6608d08983b6dc5e59178aa10651fe3d9a1452..e6caed762871ce118fac8d15133535413c026172 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,5 @@ -phosh-osk-stevia 0.51~rc1 -------------------------- +phosh-osk-stevia 0.51.0 +----------------------- Released November 2025 * Give up when we fail to claim the DBus name on startup * Don't spawn two instances with gnome-session-bin < 49 diff --git a/data/mobi.phosh.Stevia.metainfo.xml.in b/data/mobi.phosh.Stevia.metainfo.xml.in index 6f6255e2925708c3a5107acdf054ad6b8e365adf..00301888b6a8a8f9aa8fcdfde62f04cda38cb8aa 100644 --- a/data/mobi.phosh.Stevia.metainfo.xml.in +++ b/data/mobi.phosh.Stevia.metainfo.xml.in @@ -64,6 +64,14 @@ + + +
    +
  • Give up when we fail to claim the DBus name on startup
  • +
  • Don't spawn two instances with gnome-session-bin < 49
  • +
+
+
    diff --git a/debian/changelog b/debian/changelog index d9c3de3ce125b42e596b9916885d4a80c2bcd4ce..34414a5b83d9280a5de556336fcc1f463df3bfe6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +phosh-osk-stevia (0.51.0) experimental; urgency=medium + + * doc: Fix default keyboard mention. + Most distros ship stevia as default so it can be confusing if + we say something else in the docs. + + -- Guido Günther Fri, 14 Nov 2025 17:13:29 +0100 + phosh-osk-stevia (0.51~rc1) experimental; urgency=medium * input-surface: Don't trigger key repeat when deleting in emoji layout. diff --git a/meson.build b/meson.build index 8a5e11a4c4ff5ec71faaa4d98fb68bcd3e04dc61..c0c6d9fc4c998c5dcc28d4e974c9364989a33679 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'phosh-osk-stevia', 'c', - version: '0.51.rc1', + version: '0.51.0', license: 'GPLv3+', meson_version: '>= 1.1', default_options: ['warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11'],