summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérôme Schneider <jschneider@entrouvert.com>2014-12-09 10:46:58 (GMT)
committerJérôme Schneider <jschneider@entrouvert.com>2014-12-09 10:46:58 (GMT)
commitd7c82a091e771dcf3c599496fddab17165f513c6 (patch)
treeb44f01828d71bc6af4e9e13bf79c873eed5d40dd
parentcdee447640881a3a431418fd3b0337539efffba0 (diff)
downloadmandaye-meyzieu-d7c82a091e771dcf3c599496fddab17165f513c6.zip
mandaye-meyzieu-d7c82a091e771dcf3c599496fddab17165f513c6.tar.gz
mandaye-meyzieu-d7c82a091e771dcf3c599496fddab17165f513c6.tar.bz2
port to last Mandaye version
-rw-r--r--control2
-rw-r--r--install1
-rwxr-xr-xmandaye_meyzieu_manager22
-rw-r--r--postinst2
-rwxr-xr-xrules2
5 files changed, 27 insertions, 2 deletions
diff --git a/control b/control
index f2b392b..6c4254f 100644
--- a/control
+++ b/control
@@ -9,7 +9,7 @@ X-Python-Version: current
Package: mandaye-meyzieu
Architecture: all
Depends: ${misc:Depends}, ${python:Depends},
- python-mandaye (>= 0.8),
+ python-mandaye (>= 0.10.2),
python-beautifulsoup (>= 3.1),
python-crypto (>= 2.6),
python-lasso (>= 2.4.0),
diff --git a/install b/install
index 9f2bc40..fb21d5f 100644
--- a/install
+++ b/install
@@ -1 +1,2 @@
debian/config.ini /etc/mandaye-meyzieu/
+debian/mandaye_meyzieu_manager /usr/bin/
diff --git a/mandaye_meyzieu_manager b/mandaye_meyzieu_manager
new file mode 100755
index 0000000..a7077dc
--- /dev/null
+++ b/mandaye_meyzieu_manager
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+NAME=mandaye-meyzieu
+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} "$@"
diff --git a/postinst b/postinst
index 3d1b1cf..4704653 100644
--- a/postinst
+++ b/postinst
@@ -41,7 +41,7 @@ case "$1" in
if [ -z "$2" ]; then
echo "Please create your database :"
- echo "su $USER -p -c '/usr/bin/rp_meyzieu_manager --createdb'"
+ echo "su $USER -p -c '/usr/bin/mandaye_meyzieu_manager --createdb'"
fi
;;
diff --git a/rules b/rules
index c0ff2e9..5dc8cc3 100755
--- a/rules
+++ b/rules
@@ -7,4 +7,6 @@ BUILD_DIR=$(CURDIR)/debian/mandaye-meyzieu
override_dh_install:
dh_install
+ mv $(BUILD_DIR)/usr/bin/server.py $(BUILD_DIR)/usr/lib/mandaye-meyzieu/server.py
+ mv $(BUILD_DIR)/usr/bin/manager.py $(BUILD_DIR)/usr/lib/mandaye-meyzieu/manager.py
cp -R rp_meyzieu/static $(BUILD_DIR)/usr/share/mandaye-meyzieu