diff --git a/debian/combo.dirs b/debian/combo.dirs index 74e9cb57..ce9868cf 100644 --- a/debian/combo.dirs +++ b/debian/combo.dirs @@ -1,7 +1,7 @@ /etc/combo -/usr/share/combo/themes /usr/lib/combo +/usr/share/combo/themes /var/lib/combo/collectstatic +/var/lib/combo/spooler /var/lib/combo/tenants /var/log/combo -/var/lib/combo/spooler diff --git a/debian/combo.install b/debian/combo.install index 39d10002..3137715e 100644 --- a/debian/combo.install +++ b/debian/combo.install @@ -1,4 +1,4 @@ debian/combo-manage /usr/bin +debian/debian_config.py /usr/lib/combo debian/settings.py /etc/combo debian/uwsgi.ini /etc/combo -debian/debian_config.py /usr/lib/combo diff --git a/debian/control b/debian/control index c4c0bae2..20b14cff 100644 --- a/debian/control +++ b/debian/control @@ -2,33 +2,39 @@ Source: combo Maintainer: Jérôme Schneider Section: python Priority: optional -Build-Depends: python3-setuptools, python3-all, python3-django, debhelper-compat (= 12), dh-python, sassc +Build-Depends: debhelper-compat (= 12), + dh-python, + python3-all, + python3-django, + python3-setuptools, + sassc, Standards-Version: 3.9.6 Package: python3-combo Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, - python3-distutils, - python3-django (>= 2:2.2), - python3-djangorestframework (>= 3.3), - python3-gadjo (>= 0.53), - python3-pyproj, - python3-requests, - python3-feedparser, - python3-xstatic-leaflet, - python3-xstatic-leaflet-gesturehandling, - python3-xstatic-leaflet-markercluster, - python3-xstatic-opensans, - python3-xstatic-roboto-fontface (>= 0.5.0.0), - python3-eopayment (>= 1.60), - python3-django-ratelimit, - python3-sorl-thumbnail, - python3-pil, - python3-pycryptodome, - python3-pywebpush, - python3-pygal, - python3-lxml, - python3-publik-django-templatetags +Depends: python3-distutils, + python3-django (>= 2:2.2), + python3-django-ratelimit, + python3-djangorestframework (>= 3.3), + python3-eopayment (>= 1.60), + python3-feedparser, + python3-gadjo (>= 0.53), + python3-lxml, + python3-pil, + python3-publik-django-templatetags, + python3-pycryptodome, + python3-pygal, + python3-pyproj, + python3-pywebpush, + python3-requests, + python3-sorl-thumbnail, + python3-xstatic-leaflet, + python3-xstatic-leaflet-gesturehandling, + python3-xstatic-leaflet-markercluster, + python3-xstatic-opensans, + python3-xstatic-roboto-fontface (>= 0.5.0.0), + ${misc:Depends}, + ${python3:Depends}, Recommends: python3-django-mellon Conflicts: python-lingo Breaks: combo (<< 2.34.post2) @@ -36,15 +42,15 @@ Description: Portal Management System (Python module) Package: combo Architecture: all -Depends: ${misc:Depends}, - python3-combo (= ${binary:Version}), - python3-hobo (>= 1.34), - python3-django-tenant-schemas, - python3-psycopg2, - python3-django-mellon (>= 1.13), - uwsgi, - uwsgi-plugin-python3, - python3-uwsgidecorators +Depends: python3-combo (= ${binary:Version}), + python3-django-mellon (>= 1.13), + python3-django-tenant-schemas, + python3-hobo (>= 1.34), + python3-psycopg2, + python3-uwsgidecorators, + uwsgi, + uwsgi-plugin-python3, + ${misc:Depends}, Recommends: nginx Suggests: postgresql Breaks: python-combo (<< 2.34.post2)