diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a5f04c2..0ed7b85 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: run: | VERSION=$(date '+%y.%m.0.0') dch --distribution `lsb_release -cs` -b -v ${VERSION} "Release ${VERSION}" - dpkg-buildpackage -us -uc + dpkg-buildpackage -us -uc -d mv ../open-eid* . - name: Lintian run: lintian *.deb diff --git a/debian/control b/debian/control index dd782fe..5eabb75 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,9 @@ Section: metapackages Priority: optional Maintainer: ria Build-Depends: - debhelper-compat (= 12) -Standards-Version: 4.5.1 + debhelper-compat (= 13) +Standards-Version: 4.6.1 +Rules-Requires-Root: no Homepage: https://www.ria.ee Package: open-eid diff --git a/install-open-eid.sh b/install-open-eid.sh index 2449c8c..1b46876 100755 --- a/install-open-eid.sh +++ b/install-open-eid.sh @@ -117,7 +117,6 @@ test_root test_sudo # version name LTS supported until -# 20.04 focal LTS 2025-04 # 22.04 jammy LTS 2027-04 # 24.04 noble LTS 2029-04 # 24.10 oracular - 2025-07 @@ -135,11 +134,6 @@ case $distro in # Debian lacks https support for apt, by default sudo apt install apt-transport-https case "$codename" in - bullseye) - make_warn "Debian $codename is not officially supported" - make_warn "Installing from ubuntu-focal repository" - add_repository focal - ;; bookworm) make_warn "Debian $codename is not officially supported" make_warn "Installing from ubuntu-jammy repository" @@ -156,10 +150,10 @@ case $distro in *) ;; esac case $codename in - utopic|vivid|wily|trusty|artful|cosmic|disco|xenial|eoan|groovy|hirsute|impish|bionic|zorin|kinetic|lunar|mantic) + utopic|vivid|wily|trusty|artful|cosmic|disco|xenial|eoan|groovy|hirsute|impish|bionic|zorin|kinetic|lunar|mantic|focal) make_fail "Ubuntu $codename is not officially supported" ;; - focal|jammy|noble|oracular) + jammy|noble|oracular) add_repository $codename ;; *) @@ -179,10 +173,6 @@ case $distro in make_warn "Linux Mint 21 is not officially supported" add_repository jammy ;; - 20*) - make_warn "Linux Mint 20 is not officially supported" - add_repository focal - ;; *) make_fail "Linux Mint $release is not officially supported" ;; @@ -201,10 +191,10 @@ case $distro in ;; pop) case $codename in - artful|cosmic|disco|eoan|bionic) + artful|cosmic|disco|eoan|bionic|focal) make_fail "Pop!_OS $codename is not officially supported" ;; - focal|jammy) + jammy) make_warn "Pop!_OS $codename is not officially supported" add_repository $codename ;;