Merge remote-tracking branch 'origin/unstable' into unstable

This commit is contained in:
Weblate 2015-10-31 19:22:49 +01:00
commit 717d8fdc18
2 changed files with 3 additions and 2 deletions

2
debian/control vendored
View file

@ -10,7 +10,7 @@ Homepage: https://yunohost.org/
Package: yunohost Package: yunohost
Architecture: all Architecture: all
Depends: ${python:Depends}, ${misc:Depends}, Depends: ${python:Depends}, ${misc:Depends},
moulinette (>= 2.2.1), moulinette (> 2.2.1.1),
python-psutil, python-psutil,
python-requests, python-requests,
glances, glances,

3
debian/postinst vendored
View file

@ -15,7 +15,8 @@ do_configure() {
# restart yunohost-firewall if it's running # restart yunohost-firewall if it's running
service yunohost-firewall status > /dev/null \ service yunohost-firewall status > /dev/null \
&& service yunohost-firewall restart && service yunohost-firewall restart \
|| echo "Firewall stopped"
fi fi
} }