From bd394ef4768de3515547003200a09626a76af61a Mon Sep 17 00:00:00 2001 From: mIcHyAmRaNe Date: Fri, 26 Jul 2024 16:59:24 +0200 Subject: [PATCH] deb package fix --- .github/workflows/build-debian.yml | 1 - debian/changelog | 10 ++++++++-- debian/control | 3 ++- debian/debhelper-build-stamp | 1 - debian/okadminfinder.script | 6 ++++++ debian/rules | 8 ++++++++ okadminfinder/__init__.py | 2 +- pyproject.toml | 2 +- 8 files changed, 26 insertions(+), 7 deletions(-) delete mode 100644 debian/debhelper-build-stamp create mode 100644 debian/okadminfinder.script diff --git a/.github/workflows/build-debian.yml b/.github/workflows/build-debian.yml index 7f857f0..80fa336 100644 --- a/.github/workflows/build-debian.yml +++ b/.github/workflows/build-debian.yml @@ -20,7 +20,6 @@ jobs: - name: Install build dependencies run: | - export PYTHON=python3 python3 -V curl -sSL https://install.python-poetry.org | python3 - export PATH=$HOME/.local/bin:$PATH diff --git a/debian/changelog b/debian/changelog index e347255..9926810 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,18 @@ +okadminfinder (1.1.2-1) stable; urgency=low + + * Deb package build fix. + + -- mIcHy AmRaNe <6m63er17c@mozmail.com> Fri, 26 Jul 2024 16:49:05 +0200 + okadminfinder (1.1.1-1) stable; urgency=low * Debug mode. - * build the deb package using pyproject.toml instead of setup.py + * Build the deb package using pyproject.toml instead of setup.py -- mIcHy AmRaNe <6m63er17c@mozmail.com> Thu, 11 Jul 2024 17:29:05 +0200 okadminfinder (1.1.0-1) stable; urgency=low - * source package automatically created by stdeb 0.10.0 + * Source package automatically created by stdeb 0.10.0 -- mIcHy AmRaNe <6m63er17c@mozmail.com> Mon, 08 Jul 2024 00:28:22 +0200 diff --git a/debian/control b/debian/control index 8c842c3..ecf9821 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,9 @@ Source: okadminfinder Maintainer: mIcHy AmRaNe <6m63er17c@mozmail.com> Section: utils Priority: optional -Build-Depends: debhelper (>= 13), dh-python, python3-all +Build-Depends: debhelper (>= 13), dh-python, python3-all, pybuild-plugin-pyproject Standards-Version: 4.6.0.1 +XS-Python-Version: >= 3.7 X-Python3-Version: >= 3.7 Homepage: https://michyamrane.github.io/tools/okadminfinder/ diff --git a/debian/debhelper-build-stamp b/debian/debhelper-build-stamp deleted file mode 100644 index 4e0a364..0000000 --- a/debian/debhelper-build-stamp +++ /dev/null @@ -1 +0,0 @@ -okadminfinder diff --git a/debian/okadminfinder.script b/debian/okadminfinder.script new file mode 100644 index 0000000..7164a17 --- /dev/null +++ b/debian/okadminfinder.script @@ -0,0 +1,6 @@ +#!/usr/bin/python3 + +from okadminfinder.okadminfinder import main + +if __name__ == '__main__': + main() diff --git a/debian/rules b/debian/rules index 03c6b92..bb96383 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,15 @@ override_dh_auto_build: poetry build override_dh_auto_install: + + # Install the package using pybuild + dh_auto_install --buildsystem=pybuild --destdir=debian/okadminfinder/ poetry run pip3 install . --no-deps --force --root=debian/okadminfinder --no-compile --prefix=/usr + + # Install the entry point script + install -Dm755 debian/okadminfinder.script debian/okadminfinder/usr/bin/okadminfinder + + ## poetry run pip3 install . --no-deps --force --root=debian/okadminfinder --no-compile --prefix=/usr # poetry install --no-root --only main --no-interaction --no-ansi override_dh_installman: diff --git a/okadminfinder/__init__.py b/okadminfinder/__init__.py index 4a9bc84..4e0756a 100644 --- a/okadminfinder/__init__.py +++ b/okadminfinder/__init__.py @@ -1,3 +1,3 @@ __creator__ = "O.Koleda" __maintainer__ = "mIcHyAmRaNe" -__version__ = "1.1.1" +__version__ = "1.1.2" diff --git a/pyproject.toml b/pyproject.toml index 7225155..d29cc1a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "okadminfinder" -version = "1.1.1" +version = "1.1.2" description = "[Admin panel - Directories - Subdomains] finder ¢σ∂є∂ ву 👻 (❤-❤) 👻" authors = ["mIcHyAmRaNe <6m63er17c@mozmail.com>"] license = "Apache-2.0"