Work on new package

8 files changed, 139 insertions, 417 deletions

diff --git a/debian/changelog b/debian/changelog
index 738462f50..4284c298a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,352 +1,5 @@
-python-django-ishtar (0.99.18) UNRELEASED; urgency=low
+python-django-ishtar (3.0.0-1) UNRELEASED; urgency=low
 
-  * Upstream: cf CHANGES.md.
-  * ishtar-prepare-instance: change media owner
+  * New version
 
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 11 Apr 2017 18:58:55 +0200
-
-python-django-ishtar (0.99.17) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 07 Apr 2017 12:22:42 +0200
-
-python-django-ishtar (0.99.16.1) UNRELEASED; urgency=low
-
-  * Fix bad migration name
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 22 Mar 2017 00:27:27 +0100
-
-python-django-ishtar (0.99.16) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 22 Mar 2017 00:01:26 +0100
-
-python-django-ishtar (0.99.15) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 09 Mar 2017 23:38:03 +0100
-
-python-django-ishtar (0.99.14) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 06 Mar 2017 17:02:18 +0100
-
-python-django-ishtar (0.99.13.1) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 20 Feb 2017 13:17:30 +0100
-
-python-django-ishtar (0.99.13) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 17 Feb 2017 21:29:18 +0100
-
-python-django-ishtar (0.99.12.2) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 10 Feb 2017 09:21:15 +0100
-
-python-django-ishtar (0.99.12.1) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 10 Feb 2017 09:03:52 +0100
-
-python-django-ishtar (0.99.12) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 10 Feb 2017 00:50:58 +0100
-
-python-django-ishtar (0.99.11) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 06 Feb 2017 20:11:30 +0100
-
-python-django-ishtar (0.99.10) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Sat, 04 Feb 2017 18:19:19 +0100
-
-python-django-ishtar (0.99.9) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 3 Feb 2017 16:54:42 +0200
-
-python-django-ishtar (0.99.8) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-  * Suffix displayed version in the footer with "deb"
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 2 Feb 2017 17:42:42 +0200
-
-python-django-ishtar (0.99.7.2) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 30 Jan 2017 15:59:42 +0200
-
-python-django-ishtar (0.99.7.1) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 30 Jan 2017 15:15:42 +0200
-
-python-django-ishtar (0.99.7) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 30 Jan 2017 14:06:42 +0200
-
-python-django-ishtar (0.99.6) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Sun, 29 Jan 2017 17:54:42 +0200
-
-python-django-ishtar (0.99.5) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 24 Jan 2017 19:33:42 +0200
-
-python-django-ishtar (0.99.4) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 24 Jan 2017 11:20:42 +0200
-
-python-django-ishtar (0.99.3) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 20 Jan 2017 20:09:42 +0200
-
-python-django-ishtar (0.99.2) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 12 Jan 2017 22:44:42 +0200
-
-python-django-ishtar (0.99-1-1) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Wed, 11 Jan 2017 17:11:42 +0200
-
-python-django-ishtar (0.99-1) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 10 Jan 2017 02:31:42 +0200
-
-python-django-ishtar (0.99-0) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 10 Jan 2017 01:19:42 +0200
-
-python-django-ishtar (0.98-10) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 3 Nov 2016 15:55:42 +0200
-
-python-django-ishtar (0.98-9) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Sun, 23 Oct 2016 18:12:42 +0200
-
-python-django-ishtar (0.98-8) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Sat, 22 Oct 2016 13:52:42 +0200
-
-python-django-ishtar (0.98-7) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 17 Oct 2016 19:28:42 +0200
-
-python-django-ishtar (0.98-6) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 11 Oct 2016 19:05:42 +0200
-
-python-django-ishtar (0.98-5) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 24 Sep 2016 16:22:42 +0200
-
-python-django-ishtar (0.98-4) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 22 Sep 2016 10:53:42 +0200
-
-python-django-ishtar (0.98-3) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 15 Sep 2016 17:44:42 +0200
-
-python-django-ishtar (0.98-2) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 13 Sep 2016 12:36:42 +0200
-
-python-django-ishtar (0.98-1) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Sun, 11 Sep 2016 23:42:42 +0200
-
-python-django-ishtar (0.98-0) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Sun, 11 Sep 2016 11:43:42 +0200
-
-python-django-ishtar (0.97-8) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 08 Sep 2016 10:10:42 +0200
-
-python-django-ishtar (0.97-7) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 06 Sep 2016 16:12:42 +0200
-
-python-django-ishtar (0.97-6) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 05 Sep 2016 20:48:42 +0200
-
-python-django-ishtar (0.97-5) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 05 Sep 2016 20:14:42 +0200
-
-python-django-ishtar (0.97-4) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 02 Sep 2016 10:45:42 +0200
-
-python-django-ishtar (0.97-3) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Mon, 29 Aug 2016 17:50:42 +0200
-
-python-django-ishtar (0.97-2) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-  * ishtar-prepare-instance: collectstatic and compilemessages after
-    local_settings copy
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 23 Aug 2016 14:13:42 +0200
-
-python-django-ishtar (0.97-1) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-  * ishtar-prepare-instance: fix bad link creation of settings.py
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 24 Aug 2016 12:56:42 +0200
-
-python-django-ishtar (0.97-0) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.md.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 23 Aug 2016 11:56:42 +0200
-
-python-django-ishtar (0.96-3) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.txt.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 19 July 2016 11:50:00 +0200
-
-python-django-ishtar (0.96-2) UNRELEASED; urgency=low
-
-  * Upstream: cf CHANGES.txt.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Sun, 17 July 2016 23:23:00 +0200
-
-python-django-ishtar (0.96-1) UNRELEASED; urgency=low
-
-  * Add media/upload, media/imported directory with corrected permissions
-  * Symbolic link of settings.py to example_project
-  * Upstream: cf CHANGES.txt.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Sat, 15 July 2016 19:27:00 +0200
-
-python-django-ishtar (0.96-0) UNRELEASED; urgency=low
-
-  * Debian installer: fix DB_PORT
-  * Debian installer: fix fixtures installation
-  * Upstream: cf CHANGES.txt.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Thu, 14 July 2016 19:22:00 +0200
-
-python-django-ishtar (0.95-2) UNRELEASED; urgency=low
-
-  * Upstream improvements - cf CHANGES.txt.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 09 Jun 2016 12:12:00 +0200
-
-python-django-ishtar (0.95-1) UNRELEASED; urgency=low
-
-  * Upstream improvements - cf CHANGES.txt.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 08 Jun 2016 18:43:29 +0200
-
-python-django-ishtar (0.94-2) UNRELEASED; urgency=low
-
-  * Fix a bad migration script.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 03 Jun 2016 22:59:29 +0200
-
-python-django-ishtar (0.94-1) UNRELEASED; urgency=low
-
-  * Upstream improvments - cf CHANGELOG.txt.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Fri, 03 Jun 2016 22:27:29 +0200
-
-python-django-ishtar (0.93-1) UNRELEASED; urgency=low
-
-  [ Étienne Loks ]
-  * Upstream improvments.
-
-  [ Cyril Brulebois ]
-  * Keep track of created instances in the INSTANCES file under
-    /var/lib/python-django-ishtar and make postinst script loop over
-    it to update instances, and restart uwsgi/nginx if appropriate.
-  * Fix ishtar-prepare-instance: compilemessages wasn't called in
-    ishtar_common/, only in archaeological_*/.
-
- -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 19 Apr 2016 22:39:29 +0200
-
-python-django-ishtar (0.9-1) UNRELEASED; urgency=low
-
-  * Initial release.
-
- -- Étienne Loks <etienne.loks@peacefrogs.net>  Thu, 24 Apr 2014 17:14:29 +0200
+ -- Étienne Loks <etienne.loks@iggdrasil.net>  Tue, 29 Jan 2020 11:00:00 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/control b/debian/control
index fb4ce26e5..061cd9b93 100644
--- a/debian/control
+++ b/debian/control
@@ -1,48 +1,61 @@
 Source: python-django-ishtar
 Section: python
 Priority: optional
-Maintainer: Étienne Loks <etienne.loks@peacefrogs.net>
-Build-Depends: debhelper (>= 9.0.0),
- python | python-all | python-dev | python-all-dev,
- python-setuptools
-Standards-Version: 3.9.3
-Homepage: http://pypi.python.org/pypi/ishtar
+Maintainer: Étienne Loks <etienne.loks@iggdrasil.net>
+Build-Depends: debhelper (>= 11~),
+ dh-python,
+ python3-all,
+ python3-setuptools
+Standards-Version: 4.3.0
+Homepage: https://ishtar-archeo.net/
 
-Package: python-django-ishtar
+Package: python3-django-ishtar
 Architecture: all
 Depends: ${misc:Depends},
- ${python:Depends},
- python-django (>= 1.4),
- python-django (<< 1.5),
- python-psycopg2,
- python-imaging,
- python-django-registration,
- python-django-south,
- python-pisa,
- python-reportlab,
- python-dbf,
- python-tidylib,
- python-lxml,
- python-html5lib,
- python-memcache,
- python-oook-replace,
- python-django-extra-views,
- python-django-simple-history,
- python-unicodecsv,
- python-markdown,
-# DB
- postgresql-9.1,
- postgresql-9.1-postgis,
-# Web:
- nginx,
- uwsgi,
- uwsgi-plugin-python,
-# Extra:
+ ${python3:Depends},
+ # generic python lib
+ python3-bs4,
+ python3-gdal,
+ python3-lxml,
+ python3-markdown,
+ python3-memcache,
+ python3-psycopg2,
+ python3-pil,
+ python3-png,
+ python3-pyqrcode,
+ python3-requests,
+ python3-tidylib,
+ python3-unidecode,
+ python3-xmltodict,
+ # generic python lib - custom packaging
+ python3-django-simple-history,
+ python3-secretary,
+ python3-weasyprint,
+ # django
+ python3-django (>= 1.11.18),
+ python3-django (<< 2.0),
+ python3-ajax-select,
+ python3-djangorestframework,
+ python3-django-compressor,
+ python3-django-extensions,
+ python3-django-extra-views,
+ python3-django-formtools,
+ python3-django-registration,
+ # generic
  apg,
  gettext,
-Recommends: javascript-common,
- libjs-jquery,
- libjs-jquery-ui,
- libjs-jquery-ui-theme-base,
- memcached
-Description: TBD
+ locales,
+ memcached,
+ graphviz,
+ pandoc
+Recommends:
+ postgresql,
+ postgresql-contrib,
+ postgresql-11-postgis-2.5,
+ postgresql-11-postgis-2.5-scripts,
+ uwsgi,
+ uwsgi-plugin-python3,
+ nginx
+Description: Archaeological data management
+ Ishtar aims at enabling the management, improvement, analysis and sharing of
+ data from archaeological excavations, from fieldwork to museums.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000000000..28ba2ded6
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,42 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ishtar
+Source: https://gitlab.com/iggdrasil/ishtar.git
+
+Files: *
+Copyright: 2013-2020 Étienne Loks <etienne.loks@iggdrasil.net>
+License: AGPL-3.0+
+
+Files: debian/*
+Copyright: 2013-2020 Étienne Loks <etienne.loks@iggdrasil.net>
+License: GPL-3.0+
+
+License: GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: AGPL-3.0
+ This program is free software: you can use, redistribute, and/or modify
+ this code under the terms of the GNU Affero General Public License
+ version 3.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Affero General Public License for more details.
+ .
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
diff --git a/debian/python-django-ishtar.install b/debian/python-django-ishtar.install
deleted file mode 100644
index 14d90d1e6..000000000
--- a/debian/python-django-ishtar.install
+++ /dev/null
@@ -1,2 +0,0 @@
-/var/lib/python-django-ishtar
-ishtar-prepare-instance  usr/sbin
diff --git a/debian/python3-django-ishtar.install b/debian/python3-django-ishtar.install
new file mode 100644
index 000000000..6cd529f90
--- /dev/null
+++ b/debian/python3-django-ishtar.install
@@ -0,0 +1,2 @@
+# /var/lib/python-django-ishtar
+# ishtar-prepare-instance  usr/sbin
diff --git a/debian/python-django-ishtar.postinst b/debian/python3-django-ishtar.postinst
index 5efd25548..5efd25548 100644
--- a/debian/python-django-ishtar.postinst
+++ b/debian/python3-django-ishtar.postinst
diff --git a/debian/rules b/debian/rules
index 903fa0919..cfd67a8b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,32 +1,45 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-PYTHON2=$(shell pyversions -vr)
-
-# Prevent setuptools/distribute from accessing the internet.
-export http_proxy = http://127.0.9.1:9
+export PYBUILD_NAME = ishtar
 
 %:
-	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
+    dh $@ --with python3 --buildsystem=pybuild
+
+#override_dh_auto_test:
+    #dh_auto_test -- --test-tox
+#    tox -c tox.ini -e py37
+
+
+
+
+
+
+#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