update packaging to support mandaye 0.11

control

@@ -9,7 +9,7 @@ X-Python-Version: current
 Package: mandaye-vincennes
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
-    python-mandaye (>= 0.10),
+    python-mandaye (>= 0.11),
     python-beautifulsoup (>= 3.1),
     python-crypto (>= 2.6),
     python-lasso (>= 2.4.0),

dirs

@@ -2,6 +2,7 @@ etc/mandaye-vincennes
 etc/mandaye-vincennes/certs
 etc/mandaye-vincennes/sites-available
 etc/mandaye-vincennes/sites-enabled
+usr/lib/mandaye-vincennes
 var/lib/mandaye-vincennes
 var/lib/mandaye-vincennes/data
 var/lib/mandaye-vincennes/sessions

init.d

@@ -18,6 +18,7 @@ PID_DIR=/var/run/mandaye-vincennes
 PIDFILE=/var/run/mandaye-vincennes/$NAME.pid
 LOG_DIR=/var/log/mandaye-vincennes
 SCRIPTNAME=/etc/init.d/$NAME
+MANDAYE_CONFIG_FILES=/etc/$NAME/config.ini
 
 USER=mandaye-vincennes
 GROUP=mandaye-vincennes
@@ -49,6 +50,9 @@ mandaye_vincennes.wsgi:application"
 # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
 . /lib/lsb/init-functions
 
+# environment for wsgi & settings
+export MANDAYE_CONFIG_FILES
+
 #
 # Function that starts the daemon/service
 #

install

@@ -1 +1,2 @@
 debian/config.ini           /etc/mandaye-vincennes/
+debian/mandaye_cud_manager  /usr/bin/

mandaye_vincennes_manager

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+NAME=mandaye-vincennes
+MANAGER="/usr/lib/$NAME/manager.py --config=/etc/$NAME/config.ini"
+
+# check user
+if test x$1 = x"--forceuser"
+then
+    shift
+elif test $(id -un) != "$NAME"
+then
+    echo "error: must use $0 with user ${NAME}"
+    exit 1
+fi
+
+if test $# -eq 0
+then
+    python ${MANAGER} --help
+    exit 1
+fi
+
+python ${MANAGER} "$@"

rules

@@ -7,4 +7,6 @@ BUILD_DIR=$(CURDIR)/debian/mandaye-vincennes
 
 override_dh_install:
 	dh_install
+	mv $(BUILD_DIR)/usr/bin/server.py $(BUILD_DIR)/usr/lib/mandaye-vincennes/server.py
+	mv $(BUILD_DIR)/usr/bin/manager.py $(BUILD_DIR)/usr/lib/mandaye-vincennes/manager.py
 	cp -R mandaye_vincennes/static $(BUILD_DIR)/usr/share/mandaye-vincennes