From 657e1d03345911a8ebb66d2bc5c7f713f2047f6e Mon Sep 17 00:00:00 2001 From: Lene Preuss Date: Tue, 21 Apr 2020 18:45:44 +0200 Subject: [PATCH] Updated debian folder to make debuild -S -us -uc run --- .github/workflows/pythonapp.yml | 23 +++++++++++++++++++++-- debian/changelog | 10 ++++++++++ debian/control | 20 +++++++++++++------- debian/files | 1 + debian/rules | 2 +- debian/source/format | 2 +- 6 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 debian/files diff --git a/.github/workflows/pythonapp.yml b/.github/workflows/pythonapp.yml index 4280c7bafd1c5..e6deb5c668442 100644 --- a/.github/workflows/pythonapp.yml +++ b/.github/workflows/pythonapp.yml @@ -3,8 +3,7 @@ name: Nicotine+ CI on: [push] jobs: - build: - + test: runs-on: ${{ matrix.os }} strategy: matrix: @@ -31,3 +30,23 @@ jobs: run: | pip install pytest pytest + + package: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install dependencies + run: | + sudo apt-get install devscripts debhelper dh-python python-all \ + python-gobject-2 python-setuptools quilt + - name: Build source .deb + run: | + debuild -S -us -uc + - name: Collect source .deb artifacts + mkdir ../output + mv ../nicotine_?.?.?* ../output + - name: Archive source .deb artifacts + uses: actions/upload-artifact@v1 + with: + name: nicotine-debuild-artifacts + path: ../output \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 670226c6ddcee..0b042fad7fb80 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +nicotine (1.4.3) disco; urgency=medium + + * Upgrade Python to >= 3.6, use Gtk+ 3 + + -- Lene Preuss Tue, 21 Apr 2020 18:35:00 +0200 + +nicotine (1.4.3) eoan; urgency=medium + + * Upgrade Python to >= 3.6, use Gtk+ 3 + nicotine (1.4.2-1) eoan; urgency=medium * Latest upstream. diff --git a/debian/control b/debian/control index 447623a92987a..1245850323ee3 100644 --- a/debian/control +++ b/debian/control @@ -11,10 +11,11 @@ Build-Depends: gettext, lintian, python-setuptools, - quilt + quilt, + python3 Vcs-Git: https://github.com/Nicotine-Plus/nicotine-plus.git Vcs-browser: https://github.com/Nicotine-Plus/nicotine-plus -X-Python-Version: >= 2.7 +X-Python-Version: >= 3.6 Homepage: https://www.nicotine-plus.org/ Package: nicotine @@ -24,18 +25,23 @@ Depends: ${misc:Depends}, miniupnpc (>= 1.9), python-gobject-2, - python-gtk2 (>= 2.24), - python (>= 2.7), + libgtk-3-0, + libcairo2-dev, + libgirepository1.0-dev, + python3-gi, + gobject-introspection, + gir1.2-gtk-3.0, + python (>= 3.6), python-mutagen (>= 1.25), xdg-utils Recommends: python-geoip, python-notify Suggests: python-gnome2, python-sexy, python-dbus, python-gst0.10 -Description: graphical client for SoulSeek P2P network (Gtk+ / Python 2) +Description: graphical client for SoulSeek P2P network (Gtk+ / Python 3) Nicotine+ is a client for SoulSeek, a light and efficient file sharing - system, written in Python and using the GTK+2 toolkit, based on the + system, written in Python and using the GTK+ toolkit, based on the PySoulSeek project. . It features uploading, downloading, searching and chatting, with strict bandwidth control, and tries to look like PySoulSeek. . - This package installs the Gtk+ 2 client which uses Python 2. + This package installs the Gtk+ 3 client which uses Python 3. diff --git a/debian/files b/debian/files new file mode 100644 index 0000000000000..8b201b693aa33 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +nicotine_1.4.3_source.buildinfo net extra diff --git a/debian/rules b/debian/rules index c57cc53c5435c..64369bc1bcd9e 100755 --- a/debian/rules +++ b/debian/rules @@ -37,7 +37,7 @@ VERSION_UPSTREAM_DISTUTILS = $(shell sed -n 's/^version\s*=\s*"\(\S*\)"$$/\1/p' # Catch all debhelper rule... %: - dh $@ --with python2 --buildsystem=pybuild + dh $@ --with python3 --buildsystem=pybuild # Prepare an upstream vanilla distribution tarball as per DPM ยง 4.9... # http://wiki.debian.org/onlyjob/get-orig-source diff --git a/debian/source/format b/debian/source/format index 163aaf8d82b6c..89ae9db8f88b8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native)