diff --git a/distro/scripts/ppa-build.sh b/distro/scripts/ppa-build.sh index f735cfe0..dc64a1a5 100755 --- a/distro/scripts/ppa-build.sh +++ b/distro/scripts/ppa-build.sh @@ -3,10 +3,10 @@ # Usage: ./create-source.sh [ubuntu-series] # # Example: -# ./create-source.sh ../dms questing # Ubuntu 25.10 (default series in ppa-upload) -# ./create-source.sh ../dms resolute # Ubuntu 26.04 LTS -# ./create-source.sh ../dms-git questing +# ./create-source.sh ../dms resolute # Ubuntu 26.04 LTS (default series in ppa-upload) +# ./create-source.sh ../dms stonking # Ubuntu 26.10 # ./create-source.sh ../dms-git resolute +# ./create-source.sh ../dms-git stonking set -e @@ -27,13 +27,13 @@ if [ $# -lt 1 ]; then echo "Arguments:" echo " package-dir : Path to package directory (e.g., ../dms)" echo " ubuntu-series : Ubuntu series (optional, default: noble)" - echo " Options: noble, jammy, oracular, mantic, questing, resolute" + echo " Options: noble, jammy, oracular, mantic, resolute, stonking" echo echo "Examples:" - echo " $0 ../dms questing" echo " $0 ../dms resolute" - echo " $0 ../dms-git questing" + echo " $0 ../dms stonking" echo " $0 ../dms-git resolute" + echo " $0 ../dms-git stonking" exit 1 fi @@ -135,7 +135,7 @@ check_ppa_version_exists() { local CHECK_MODE="${4:-commit}" local DISTRO_SERIES="${5:-}" - # Query Launchpad API (optionally scoped to one Ubuntu series so the same version can ship to questing and resolute) + # Query Launchpad API (optionally scoped to one Ubuntu series so the same version can ship to resolute and stonking) local API_URL="https://api.launchpad.net/1.0/~avengemedia/+archive/ubuntu/$PPA_NAME?ws.op=getPublishedSources&source_name=$SOURCE_NAME&status=Published" if [[ -n "$DISTRO_SERIES" ]]; then API_URL+="&distro_series=https://api.launchpad.net/1.0/ubuntu/${DISTRO_SERIES}" diff --git a/distro/scripts/ppa-status.sh b/distro/scripts/ppa-status.sh index ac566d71..711b65a1 100755 --- a/distro/scripts/ppa-status.sh +++ b/distro/scripts/ppa-status.sh @@ -10,8 +10,8 @@ PPA_OWNER="avengemedia" LAUNCHPAD_API="https://api.launchpad.net/1.0" -# Supported Ubuntu series for PPA builds (25.10 questing + 26.04 LTS resolute) -DISTRO_SERIES_LIST=(questing resolute) +# Supported Ubuntu series for PPA builds (26.04 LTS resolute + 26.10 stonking) +DISTRO_SERIES_LIST=(resolute stonking) # Define packages (sync with ppa-upload.sh) ALL_PACKAGES=(dms dms-git dms-greeter) diff --git a/distro/scripts/ppa-sync-plan.sh b/distro/scripts/ppa-sync-plan.sh index a38a931f..2c6dcc71 100755 --- a/distro/scripts/ppa-sync-plan.sh +++ b/distro/scripts/ppa-sync-plan.sh @@ -5,7 +5,7 @@ set -euo pipefail PPA_OWNER="avengemedia" LAUNCHPAD_API="https://api.launchpad.net/1.0" -SERIES_LIST=(questing resolute) +SERIES_LIST=(resolute stonking) PACKAGE_FILTER="dms-git" REBUILD_RELEASE="" JSON=false @@ -72,12 +72,12 @@ embedded_commit() { target_ppa() { local series="$1" if [[ -n "$REBUILD_RELEASE" ]]; then - if [[ "$series" == "resolute" ]]; then + if [[ "$series" == "stonking" ]]; then echo $((REBUILD_RELEASE + 1)) else echo "$REBUILD_RELEASE" fi - elif [[ "$series" == "resolute" ]]; then + elif [[ "$series" == "stonking" ]]; then echo "2" else echo "1" diff --git a/distro/scripts/ppa-upload.sh b/distro/scripts/ppa-upload.sh index d265bea7..7b1ace7e 100755 --- a/distro/scripts/ppa-upload.sh +++ b/distro/scripts/ppa-upload.sh @@ -3,13 +3,13 @@ # Usage: ./ppa-upload.sh [package-name] [ppa-name] [ubuntu-series] [rebuild-number] [--keep-builds] [--rebuild=N] # # Examples: -# ./ppa-upload.sh dms # Upload to questing + resolute (default) -# ./ppa-upload.sh dms 2 # Native: questing ppa2, resolute ppa3 (auto +1 on second series) +# ./ppa-upload.sh dms # Upload to resolute + stonking (default) +# ./ppa-upload.sh dms 2 # Native: resolute ppa2, stonking ppa3 (auto +1 on second series) # ./ppa-upload.sh dms --rebuild=2 # Rebuild with ppa2 (flag syntax) # ./ppa-upload.sh dms-git # Single package (both series) # ./ppa-upload.sh all # All packages (each to both series) # ./ppa-upload.sh dms resolute # 26.04 LTS only (same as "dms dms resolute") -# ./ppa-upload.sh dms questing # 25.10 only +# ./ppa-upload.sh dms stonking # 26.10 only # ./ppa-upload.sh dms dms resolute # Explicit PPA name + one series (optional form) # ./ppa-upload.sh dms dms resolute 2 # One series + rebuild number # ./ppa-upload.sh distro/ubuntu/dms dms # Path-style (backward compatible) @@ -70,8 +70,8 @@ if [[ ${#POSITIONAL_ARGS[@]} -gt 0 ]]; then fi fi -# Shorthand: "dms resolute" / "dms questing" (package + series; PPA inferred — no need for "dms dms resolute") -if [[ ${#POSITIONAL_ARGS[@]} -eq 2 ]] && [[ "${POSITIONAL_ARGS[1]}" == "questing" || "${POSITIONAL_ARGS[1]}" == "resolute" ]]; then +# Shorthand: "dms resolute" / "dms stonking" (package + series; PPA inferred — no need for "dms dms resolute") +if [[ ${#POSITIONAL_ARGS[@]} -eq 2 ]] && [[ "${POSITIONAL_ARGS[1]}" == "resolute" || "${POSITIONAL_ARGS[1]}" == "stonking" ]]; then PACKAGE_INPUT="${POSITIONAL_ARGS[0]}" PPA_NAME_INPUT="" UBUNTU_SERIES_RAW="${POSITIONAL_ARGS[1]}" @@ -79,11 +79,11 @@ fi SERIES_LIST=() if [[ -z "$UBUNTU_SERIES_RAW" ]]; then - SERIES_LIST=(questing resolute) -elif [[ "$UBUNTU_SERIES_RAW" == "questing" || "$UBUNTU_SERIES_RAW" == "resolute" ]]; then + SERIES_LIST=(resolute stonking) +elif [[ "$UBUNTU_SERIES_RAW" == "resolute" || "$UBUNTU_SERIES_RAW" == "stonking" ]]; then SERIES_LIST=("$UBUNTU_SERIES_RAW") else - error "Invalid Ubuntu series: $UBUNTU_SERIES_RAW (use questing, resolute, or omit for both)" + error "Invalid Ubuntu series: $UBUNTU_SERIES_RAW (use resolute, stonking, or omit for both)" exit 1 fi diff --git a/distro/ubuntu/dms-greeter/debian/rules b/distro/ubuntu/dms-greeter/debian/rules index 0fe92a49..09c62fa0 100755 --- a/distro/ubuntu/dms-greeter/debian/rules +++ b/distro/ubuntu/dms-greeter/debian/rules @@ -40,10 +40,17 @@ override_dh_auto_install: install -Dm644 DankMaterialShell-$(BASE_VERSION)/LICENSE \ debian/dms-greeter/usr/share/doc/dms-greeter/LICENSE - install -Dpm0644 DankMaterialShell-$(BASE_VERSION)/quickshell/systemd/tmpfiles-dms-greeter.conf \ - debian/dms-greeter/usr/lib/tmpfiles.d/dms-greeter.conf - install -Dm644 DankMaterialShell-$(BASE_VERSION)/quickshell/systemd/sysusers-dms-greeter.conf \ - debian/dms-greeter/usr/lib/sysusers.d/dms-greeter.conf + # Install systemd tmpfiles/sysusers fragments only when present in the fetched source. + # sysusers-dms-greeter.conf landed upstream after v1.4.6; guarding both lets older + # release tarballs build, while future tags that ship the files install them automatically. + if [ -f DankMaterialShell-$(BASE_VERSION)/quickshell/systemd/tmpfiles-dms-greeter.conf ]; then \ + install -Dpm0644 DankMaterialShell-$(BASE_VERSION)/quickshell/systemd/tmpfiles-dms-greeter.conf \ + debian/dms-greeter/usr/lib/tmpfiles.d/dms-greeter.conf; \ + fi + if [ -f DankMaterialShell-$(BASE_VERSION)/quickshell/systemd/sysusers-dms-greeter.conf ]; then \ + install -Dm644 DankMaterialShell-$(BASE_VERSION)/quickshell/systemd/sysusers-dms-greeter.conf \ + debian/dms-greeter/usr/lib/sysusers.d/dms-greeter.conf; \ + fi # Create cache directory structure (will be created by postinst) mkdir -p debian/dms-greeter/var/cache/dms-greeter