diff --git a/debian/control b/debian/control index 10d7962..6a1d87e 100644 --- a/debian/control +++ b/debian/control @@ -2,31 +2,32 @@ Source: corbo Maintainer: Serghei Mihai Section: python Priority: optional -Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9), dh-python, dh-systemd, - python-django +Build-Depends: python3-setuptools, python3-all, debhelper (>= 9), dh-python, dh-systemd, python3-django Standards-Version: 3.9.1 -Package: python-corbo +Package: python3-corbo Architecture: all -Depends: ${misc:Depends}, ${python:Depends}, - python-django (> 1.7), - python-django-ckeditor, - python-gadjo, - python-emails, - python-requests, - python-feedparser -Description: Announces Manager (Python module) +Depends: ${misc:Depends}, ${python3:Depends}, + python3-django (> 1.7), + python3-django-ckeditor, + python3-gadjo, + python3-emails, + python3-requests, + python3-feedparser +Description: Announces Manager (Python 3 module) Package: corbo Architecture: all Depends: ${misc:Depends}, - python-corbo (= ${binary:Version}), - python-hobo, - python-django-tenant-schemas, - python-psycopg2, - python-django-mellon, + python3-corbo (= ${binary:Version}), + python3-hobo, + python3-django-tenant-schemas, + python3-psycopg2, + python3-django-mellon, uwsgi, - uwsgi-plugin-python + uwsgi-plugin-python3 Recommends: nginx Suggests: postgresql +Breaks: python-corbo (<<0.22) +Replaces: python-corbo (<<0.22) Description: Announces Manager diff --git a/debian/corbo-manage b/debian/corbo-manage index 2ffced2..2c4d215 100755 --- a/debian/corbo-manage +++ b/debian/corbo-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/python-corbo.install b/debian/python-corbo.install deleted file mode 100644 index 156f643..0000000 --- a/debian/python-corbo.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/manage.py /usr/lib/corbo -usr/lib/python2*/*-packages diff --git a/debian/rules b/debian/rules index 83aef84..b1ba129 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,12 @@ #!/usr/bin/make -f # -*- makefile -*- -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export PYBUILD_NAME=corbo +export PYBUILD_DISABLE=test %: - dh $@ --with python2,systemd + dh $@ --with python3,systemd --buildsystem=pybuild + +override_dh_install: + dh_install + mv $(CURDIR)/debian/python3-corbo/usr/bin/manage.py $(CURDIR)/debian/corbo/usr/lib/corbo/manage.py diff --git a/debian/uwsgi.ini b/debian/uwsgi.ini index 7f677de..b6251db 100644 --- a/debian/uwsgi.ini +++ b/debian/uwsgi.ini @@ -2,7 +2,7 @@ auto-procname = true procname-prefix-spaced = corbo -plugin = python +plugin = python3 module = corbo.wsgi:application http-socket = /run/corbo/corbo.sock diff --git a/manage.py b/manage.py index 6daea30..4492711 100755 --- a/manage.py +++ b/manage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import sys