From 0853572e0aedf06a781b51037fea3a577773a8f5 Mon Sep 17 00:00:00 2001
From: Robin Rawson-Tetley <robin@curvy.robsdomain>
Date: Fri, 2 Feb 2018 12:50:21 +0000
Subject: [PATCH] fix some of the release process, fix deb dependencies

---
 Makefile               |  6 +++---
 RELEASE                | 13 +++++++++----
 VERSION                |  2 +-
 install/deb/makedeb.sh |  6 +++---
 src/i18n.py            |  4 ++--
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 76faa5a3a..f47a1671b 100644
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,7 @@ testsdb:
 
 deps:
 	@echo "[deps] ========================="
-	apt-get install python python-imaging python-webpy python-mysqldb python-psycopg2
-	apt-get install python-requests python-ndg-httpsclient python-pyasn1
-	apt-get install nodejs pychecker python-sphinx python-sphinx-rtd-theme texlive-latex-base texlive-latex-extra
+	apt-get install python python-imaging python-webpy python-mysqldb python-psycopg2 python-requests python-memcache
+	apt-get install nodejs flake8 imagemagick wkhtmltopdf
+	apt-get install python-sphinx python-sphinx-rtd-theme texlive-latex-base texlive-latex-extra
 
diff --git a/RELEASE b/RELEASE
index 90191e583..27926c350 100644
--- a/RELEASE
+++ b/RELEASE
@@ -3,14 +3,17 @@
 *. Generate manual - html and pdf for the program with make manual
 
 *. Update the translations - (download from zanata, make translations)
+   (Where to do mass download?)
 
-*. Run make to compile/check, then make dist to build
+*. Add the new version to zanata and make it default
+   (Use: "Copy to new version" from ... menu at the top right of current version)
 
-*. Verify installation works with an empty MySQL database
+*. Run make compile tests, then make dist to build
 
-*. Commit any changes made so far
+*. Verify installation works with an empty MySQL database
 
-*. Copy all sheltermanager* files to public.sheltermanager.com:/var/www/deb
+*. Copy build/sheltermanager* to public.sheltermanager.com:/var/www/public/deb
+   run /var/www/public/deb/makerepo.sh to rebuild Debian repository.
 
 *. Update site/en_news.html site/rss.xml site/en_header.t (new version number)
 
@@ -24,6 +27,8 @@
 
 *. Update manual with lulu
 
+*. Commit any changes made so far
+
 *. run "git tag -f -a 41" to create a tag for the release number, followed by "git push && git push -f --tags" 
    (-f is only necessary for replacing a tag)
 
diff --git a/VERSION b/VERSION
index 2b625c317..425151f3a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-40u
+40
diff --git a/install/deb/makedeb.sh b/install/deb/makedeb.sh
index 0251d53c5..6c307d4bb 100755
--- a/install/deb/makedeb.sh
+++ b/install/deb/makedeb.sh
@@ -112,10 +112,10 @@ Section: contrib
 Priority: optional
 Architecture: all
 Essential: no
-Depends: debconf, python-webpy, python-imaging, python-mysqldb
-Suggests: python-pisa, mysql-server, python-memcache, python-requests, python-ndg-httpsclient, python-pyasn1
+Depends: debconf, python-webpy, python-imaging, python-memcache, python-requests, python-mysqldb, python-psycopg2
+Suggests: mysql-server, imagemagick, wkhtmltopdf, python-sqlite3
 Installed-Size: `du -s -k sheltermanager3 | awk '{print$1}'`
-Maintainer: Robin Rawson-Tetley [robin@rawsontetley.org]
+Maintainer: ASM Team [info@sheltermanager.com]
 Provides: sheltermanager3
 Description: Web-based management solution for animal shelters and sanctuaries
  Animal Shelter Manager is the most popular, free management package
diff --git a/src/i18n.py b/src/i18n.py
index 71f6b47c5..6e84dc321 100644
--- a/src/i18n.py
+++ b/src/i18n.py
@@ -7,8 +7,8 @@
 # flake8: noqa - we have a lot of locales and this is convenient
 from locales import *
 
-VERSION = "40u [Fri  2 Feb 09:59:57 GMT 2018]"
-BUILD = "02020959"
+VERSION = "40 [Fri  2 Feb 12:49:36 GMT 2018]"
+BUILD = "02021249"
 
 DMY = ( "%d/%m/%Y", "%d/%m/%y" )
 MDY = ( "%m/%d/%Y", "%m/%d/%y" )