diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-01-03 12:02:07 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-01-09 18:05:35 +0100 |
commit | 40683c4dfd699ead8a24edec6a23d10f21a57363 (patch) | |
tree | c7c7cc1bb47225d05014fa1898e8a7f725050bc5 | |
parent | 8d92375ac7cc8ee2eee92fe2b38099fca2b301b8 (diff) | |
download | Ishtar-40683c4dfd699ead8a24edec6a23d10f21a57363.tar.bz2 Ishtar-40683c4dfd699ead8a24edec6a23d10f21a57363.zip |
Pick debian change from wheezy branch
-rw-r--r-- | debian/changelog | 352 | ||||
-rw-r--r-- | debian/control | 48 | ||||
-rw-r--r-- | debian/python-django-ishtar.install | 2 | ||||
-rw-r--r-- | debian/python-django-ishtar.postinst | 70 | ||||
-rwxr-xr-x | debian/rules | 32 |
5 files changed, 504 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 000000000..738462f50 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,352 @@ +python-django-ishtar (0.99.18) UNRELEASED; urgency=low + + * Upstream: cf CHANGES.md. + * ishtar-prepare-instance: change media owner + + -- É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 diff --git a/debian/control b/debian/control new file mode 100644 index 000000000..fb4ce26e5 --- /dev/null +++ b/debian/control @@ -0,0 +1,48 @@ +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 + +Package: python-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: + apg, + gettext, +Recommends: javascript-common, + libjs-jquery, + libjs-jquery-ui, + libjs-jquery-ui-theme-base, + memcached +Description: TBD diff --git a/debian/python-django-ishtar.install b/debian/python-django-ishtar.install new file mode 100644 index 000000000..14d90d1e6 --- /dev/null +++ b/debian/python-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/python-django-ishtar.postinst new file mode 100644 index 000000000..5efd25548 --- /dev/null +++ b/debian/python-django-ishtar.postinst @@ -0,0 +1,70 @@ +#!/bin/sh + +set -e +set -x + +DATA_DIR=/var/lib/python-django-ishtar +INSTANCES_FILE=$DATA_DIR/INSTANCES + +case "$1" in + configure) + instances="$( (cat $INSTANCES_FILE 2>/dev/null || true) | xargs )" + if [ -n "$instances" ]; then + echo "updading instances found in $INSTANCES_FILE: $instances" + for instance in $instances; do + # The upgrade procedure below was built from the "update" + # target and its dependencies in the upstream Makefile: + echo "updating $instance" + cd $DATA_DIR/$instance + + # from "syncdb" target: + python manage.py syncdb --noinput + python manage.py migrate + + # from "compilemessages" target: + # + # NOTE: Instead of hardcoding an "apps" variable here, let's + # look at candidates with find, and check whether each of + # them indeed contains PO files as a second check: + maybe_localized=$(cd $DATA_DIR; find -maxdepth 2 -name 'locale') + for candidate in $maybe_localized; do + if find $DATA_DIR/$candidate -name '*.po' >/dev/null 2>&1; then + # Really looks like a valid app, let's strip the last + # directory, cd into it, and compile messages using + # the instance's manage.py script: + app=${candidate%%/locale} + (cd $DATA_DIR/$app; python $DATA_DIR/$instance/manage.py compilemessages) + fi + done + # XXX: Doing this only once is likely sufficient, so + # we could remember having performed that update while + # taking care of the first instance, to avoid + # extraneous reruns? + + # from "collectstatic" target: + python manage.py collectstatic --noinput + + echo "updating $instance: OK" + done + echo "updating all instances: OK" + + # the assumption is that nginx and uwsgi were configured + # through ishtar-prepare-instance, so let's restart them + # unconditionally: + invoke-rc.d uwsgi restart + invoke-rc.d nginx restart + echo "restarting uwsgi and nginx: OK" + else + echo "found no instances to upgrade in $INSTANCES_FILE" + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac diff --git a/debian/rules b/debian/rules new file mode 100755 index 000000000..903fa0919 --- /dev/null +++ b/debian/rules @@ -0,0 +1,32 @@ +#!/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 + +%: + 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 |