Skip to content

Commit

Permalink
Updated debian folder to make debuild -S -us -uc run
Browse files Browse the repository at this point in the history
  • Loading branch information
lene committed Apr 21, 2020
1 parent 572dd20 commit 657e1d0
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 11 deletions.
23 changes: 21 additions & 2 deletions .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Nicotine+ CI
on: [push]

jobs:
build:

test:
runs-on: ${{ matrix.os }}
strategy:
matrix:
Expand All @@ -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
10 changes: 10 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
nicotine (1.4.3) disco; urgency=medium

* Upgrade Python to >= 3.6, use Gtk+ 3

-- Lene Preuss <[email protected]> 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.
Expand Down
20 changes: 13 additions & 7 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
1 change: 1 addition & 0 deletions debian/files
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nicotine_1.4.3_source.buildinfo net extra
2 changes: 1 addition & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion debian/source/format
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0 (quilt)
3.0 (native)

0 comments on commit 657e1d0

Please sign in to comment.