Debian: install other files - fix libraries

5 files changed, 22 insertions, 39 deletions

diff --git a/debian/control b/debian/control
index 2d91e0fb6..2f90a8ce1 100644
--- a/debian/control
+++ b/debian/control
@@ -29,8 +29,8 @@ Depends: ${misc:Depends},
  python3-django-simple-history,
  python3-secretary,
  python3-weasyprint,
- python3-django (>= 1.11.18),
- python3-django (<< 2.0),
+ python3-django (>= 1:1.11.18),
+ python3-django (<< 2:2.0.0),
  python3-ajax-select,
  python3-djangorestframework,
  python3-django-compressor,
diff --git a/debian/python3-django-ishtar.install b/debian/python3-django-ishtar.install
index 6cd529f90..701e65e90 100644
--- a/debian/python3-django-ishtar.install
+++ b/debian/python3-django-ishtar.install
@@ -1,2 +1 @@
-# /var/lib/python-django-ishtar
-# ishtar-prepare-instance  usr/sbin
+example_project conf database fixtures install locale pot scripts scss usr/share/python3-django-ishtar/
diff --git a/debian/python3-django-ishtar.links b/debian/python3-django-ishtar.links
new file mode 100644
index 000000000..210855bed
--- /dev/null
+++ b/debian/python3-django-ishtar.links
@@ -0,0 +1,4 @@
+usr/share/python3-django-ishtar/install/ishtar-prepare-instance usr/sbin/ishtar-prepare-instance
+usr/share/python3-django-ishtar/install/ishtar-delete-instance usr/sbin/ishtar-delete-instance
+usr/share/python3-django-ishtar/fixtures srv/ishtar/fixtures
+usr/share/python3-django-ishtar/locale srv/ishtar/locale
diff --git a/debian/python3-django-ishtar.postinst b/debian/python3-django-ishtar.postinst
index 5efd25548..4d850ac27 100644
--- a/debian/python3-django-ishtar.postinst
+++ b/debian/python3-django-ishtar.postinst
@@ -3,11 +3,15 @@
 set -e
 set -x
 
-DATA_DIR=/var/lib/python-django-ishtar
-INSTANCES_FILE=$DATA_DIR/INSTANCES
+DATA_DIR=/srv/ishtar
+INSTANCES_FILE=/etc/ishtar/instances
 
 case "$1" in
     configure)
+        mkdir -p /etc/ishtar/
+        if [ ! -f /etc/ishtar/config ]; then
+            cp /usr/share/python3-django-ishtar/install/config.template /etc/ishtar/config ;
+        fi
         instances="$( (cat $INSTANCES_FILE 2>/dev/null || true) | xargs )"
         if [ -n "$instances" ]; then
             echo "updading instances found in $INSTANCES_FILE: $instances"
diff --git a/debian/rules b/debian/rules
index d1cda62a6..55b23e74c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,20 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+## Prevent setuptools/distribute from accessing the internet.
+#export http_proxy = http://127.0.9.1:9
+
 export PYBUILD_NAME = ishtar
 
 %:
 	@dh $@ --with python3 --buildsystem=pybuild
 
+override_dh_auto_install:
+	dh_auto_install
+	mkdir -p debian/tmp/usr/sbin
+	mkdir -p debian/tmp/etc/ishtar
+	mkdir -p debian/tmp/srv/ishtar
+
 override_dh_auto_test:
 	sudo -u postgres psql -c 'DROP DATABASE IF EXISTS "ishtar-setup-test";'
 	sudo -u postgres psql -c 'DROP DATABASE IF EXISTS "test_ishtar-setup-test";'
@@ -17,37 +26,4 @@ override_dh_auto_test:
 	sudo -u postgres psql -c "ALTER USER \"ishtar-setup-test\" WITH PASSWORD 'ishtar-setup-test';"
 	sudo -u postgres createdb -O ishtar-setup-test ishtar-setup-test
 	dh_auto_test
-	sudo -u postgres psql -c 'DROP DATABASE IF EXISTS "ishtar-setup-test";'
-	sudo -u postgres psql -c 'DROP ROLE IF EXISTS "ishtar-setup-test";'
-
 
-
-
-
-
-#PYTHON2=$(shell pyversions -vr)
-#
-## Prevent setuptools/distribute from accessing the internet.
-#export http_proxy = http://127.0.9.1:9
-#
-#%:
-#	dh $@
-#
-#override_dh_auto_build:
-#	echo "Building does nothing"
-#
-#override_dh_auto_configure:
-#	echo "Configuring does nothing"
-#
-#override_dh_auto_install:
-#	git ls-files \
-#		| grep -v ^debian \
-#		| grep -v ^django-simple-history \
-#		| grep -v ^doc \
-#	> install.list
-#	mkdir -p debian/tmp/var/lib/python-django-ishtar
-#	rsync -av --files-from install.list . debian/tmp/var/lib/python-django-ishtar
-#
-#override_dh_auto_clean:
-#	dh_auto_clean
-#	rm -f install.list