summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Péters <fpeters@entrouvert.com>2019-09-29 07:40:47 (GMT)
committerFrédéric Péters <fpeters@entrouvert.com>2019-09-29 08:57:17 (GMT)
commitd1c8438d7a4bc3e9e825231609fea3c1e1fe71a5 (patch)
tree7861ca7661a12bfcd516f3241c38d4c4401d443e
parenteab1ee6750af4e55d2a10f04b62b19b28e17973e (diff)
downloadcombo-d1c8438d7a4bc3e9e825231609fea3c1e1fe71a5.zip
combo-d1c8438d7a4bc3e9e825231609fea3c1e1fe71a5.tar.gz
combo-d1c8438d7a4bc3e9e825231609fea3c1e1fe71a5.tar.bz2
debian: distribute manage.py in combo package, not python-combo (#36508)v2.35
-rw-r--r--debian/combo.install1
-rw-r--r--debian/control3
-rw-r--r--debian/python-combo.install1
3 files changed, 4 insertions, 1 deletions
diff --git a/debian/combo.install b/debian/combo.install
index b2dcf2d..d5b58cb 100644
--- a/debian/combo.install
+++ b/debian/combo.install
@@ -3,3 +3,4 @@ debian/combo-manage /usr/bin
debian/settings.py /etc/combo
debian/uwsgi.ini /etc/combo
debian/debian_config.py /usr/lib/combo
+usr/bin/manage.py /usr/lib/combo
diff --git a/debian/control b/debian/control
index ee0aa13..81c7cdf 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Depends: ${misc:Depends}, ${python:Depends},
python-lxml
Recommends: python-django-mellon, python-whoosh
Conflicts: python-lingo
+Breaks: combo (<< 2.34.post2)
Description: Portal Management System (Python module)
Package: combo
@@ -44,4 +45,6 @@ Depends: ${misc:Depends},
uwsgi-plugin-python
Recommends: nginx
Suggests: postgresql
+Breaks: python-combo (<< 2.34.post2)
+Replaces: python-combo (<< 2.34.post2)
Description: Portal Management System
diff --git a/debian/python-combo.install b/debian/python-combo.install
index c3dd372..5fda4d4 100644
--- a/debian/python-combo.install
+++ b/debian/python-combo.install
@@ -1,2 +1 @@
-usr/bin/manage.py /usr/lib/combo
usr/lib/python2*/*-packages