diff options
| author | Philipp Hörist <philipp@hoerist.com> | 2023-01-30 23:41:14 +0300 |
|---|---|---|
| committer | Philipp Hörist <philipp@hoerist.com> | 2023-01-30 23:41:24 +0300 |
| commit | 1034848691aba104a8005ccf200d23dd3d8bd2c5 (patch) | |
| tree | 2c1af7deddd38413a2859a66b675c83b0e5bd716 /debian | |
| parent | 4cb34e809d73c580461b87006d0be8dc76551873 (diff) | |
ci: Debian: Fix debian package build
Use python3:Depends to gather dependencies
Fixes #11386
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 13 | ||||
| -rw-r--r-- | debian/patches/remove-nbxmpp-from-deps.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 29 insertions, 10 deletions
diff --git a/debian/control b/debian/control index 174fce266..fe821d69d 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,10 @@ Maintainer: Gajim Maintainers <ci@gajim.org> Build-Depends: debhelper-compat (= 13), dh-python, + pybuild-plugin-pyproject, gettext (>= 0.17-4), libglib2.0-dev, - python3 (>= 3.10), + python3-all, python3-css-parser, python3-gi, python3-gi-cairo, @@ -28,20 +29,12 @@ Package: gajim-nightly Architecture: all Depends: ${misc:Depends}, + ${python3:Depends}, desktop-file-utils, python3 (>= 3.10), - python3-css-parser (>= 1.0.2), python3-gi (>= 3.42.0), python3-gi-cairo (>= 1.14.0~), - python3-idna, python3-nbxmpp-nightly (>=20230123), - python3-cryptography (>= 3.4.8), - python3-precis-i18n, - python3-keyring, - python3-packaging, - python3-pil, - python3-setuptools, - python3-css-parser, gir1.2-pango-1.0 (>= 1.50.0), gir1.2-gtk-3.0 (>= 3.24.30), gir1.2-gtksource-4, diff --git a/debian/patches/remove-nbxmpp-from-deps.patch b/debian/patches/remove-nbxmpp-from-deps.patch new file mode 100644 index 000000000..3721db1d3 --- /dev/null +++ b/debian/patches/remove-nbxmpp-from-deps.patch @@ -0,0 +1,25 @@ +From 0056a3ef2c5b1f5320795b214aa35b38a6b9caa1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com> +Date: Mon, 30 Jan 2023 21:33:38 +0100 +Subject: [PATCH] Remove nbxmpp from deps + +The debian package depends on python3-nbxmpp-nightly +--- + pyproject.toml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 93c4acbe6..52544a89d 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -27,7 +27,6 @@ classifiers = [ + dependencies = [ + "css-parser", + "keyring", +- "nbxmpp>=4.0.1,<5.0.0", + "packaging", + "pillow", + "precis-i18n>=1.0.0", +-- +2.37.2 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000000000..abb5721b5 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +remove-nbxmpp-from-deps.patch
\ No newline at end of file |