From defbfd95fd490e13eb00d154244090ecc03b7dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Sun, 19 Jan 2020 18:01:41 +0100 Subject: [PATCH] debian: run with python3 --- debian/control | 24 +++++++++++++----------- debian/python-scrutiny.dirs | 1 - debian/python-scrutiny.docs | 2 -- debian/python-scrutiny.install | 2 -- debian/rules | 9 ++++++--- debian/scrutiny-manage | 4 ++-- debian/uwsgi.ini | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) delete mode 100644 debian/python-scrutiny.dirs delete mode 100644 debian/python-scrutiny.docs delete mode 100644 debian/python-scrutiny.install diff --git a/debian/control b/debian/control index 6e0c43a..eae8ec8 100644 --- a/debian/control +++ b/debian/control @@ -2,26 +2,28 @@ Source: scrutiny Maintainer: Frederic Peters Section: python Priority: optional -Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9), dh-systemd +Build-Depends: python3-setuptools, python3-all, debhelper (>= 9), dh-python, dh-systemd Standards-Version: 3.9.6 -X-Python-Version: >= 2.7 -Package: python-scrutiny +Package: python3-scrutiny Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, - python-django (>= 1.8), - python-gadjo -Recommends: python-django-mellon +Depends: ${misc:Depends}, ${python3:Depends}, + python3-django (>= 1:1.11), + python3-gadjo, + python3-requests +Recommends: python3-django-mellon Description: Tracker of installed modules Package: scrutiny Architecture: all Depends: ${misc:Depends}, - python-scrutiny (= ${binary:Version}), - python-memcache, - python-psycopg2, + python3-scrutiny (= ${binary:Version}), + python3-memcache, + python3-psycopg2, uwsgi, - uwsgi-plugin-python, + uwsgi-plugin-python3, memcached Recommends: nginx, postgresql +Breaks: python-chrono (<<0.1.post69) +Replaces: python-chrono (<<0.1.post69) Description: Tracker of installed modules diff --git a/debian/python-scrutiny.dirs b/debian/python-scrutiny.dirs deleted file mode 100644 index 7b24e98..0000000 --- a/debian/python-scrutiny.dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/scrutiny diff --git a/debian/python-scrutiny.docs b/debian/python-scrutiny.docs deleted file mode 100644 index 2e3abae..0000000 --- a/debian/python-scrutiny.docs +++ /dev/null @@ -1,2 +0,0 @@ -COPYING -README diff --git a/debian/python-scrutiny.install b/debian/python-scrutiny.install deleted file mode 100644 index dfb9f56..0000000 --- a/debian/python-scrutiny.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/manage.py /usr/lib/scrutiny -usr/lib/python2*/*-packages diff --git a/debian/rules b/debian/rules index de1bd88..8b84ca5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,11 @@ #!/usr/bin/make -f # -*- makefile -*- -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export PYBUILD_NAME=scrutiny %: - dh $@ --with python2 + dh $@ --with python3,systemd --buildsystem=pybuild + +override_dh_install: + dh_install + mv $(CURDIR)/debian/python3-scrutiny/usr/bin/manage.py $(CURDIR)/debian/scrutiny/usr/lib/scrutiny/manage.py diff --git a/debian/scrutiny-manage b/debian/scrutiny-manage index c6f0ad6..2b9fe11 100755 --- a/debian/scrutiny-manage +++ b/debian/scrutiny-manage @@ -18,8 +18,8 @@ fi if test $# -eq 0 then - python ${MANAGE} help + python3 ${MANAGE} help exit 1 fi -python ${MANAGE} "$@" +python3 ${MANAGE} "$@" diff --git a/debian/uwsgi.ini b/debian/uwsgi.ini index 0be7b5d..12f8bd9 100644 --- a/debian/uwsgi.ini +++ b/debian/uwsgi.ini @@ -2,7 +2,7 @@ auto-procname = true procname-prefix-spaced = scrutiny -plugin = python +plugin = python3 module = scrutiny.wsgi:application http-socket = /run/scrutiny/scrutiny.sock