From 9a009cacc0e573d3e111ceac1a05be0cd01eab92 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 11 Dec 2017 13:28:42 +0100 Subject: [PATCH] Lintian warnings solved --- debian/control | 9 +++++---- debian/install | 1 - debian/postinst | 12 ++++++++++-- debian/postrm | 8 ++++++++ debian/rules | 2 +- js/hedera/gui.xml | 0 js/hedera/login.xml | 0 js/hedera/report.html | 0 reports/delivery-note/ui.xml | 0 reports/items-report/ui.xml | 0 reports/recover-password/ui.php | 0 reports/shelves-report/ui.xml | 0 12 files changed, 24 insertions(+), 8 deletions(-) mode change 100755 => 100644 js/hedera/gui.xml mode change 100755 => 100644 js/hedera/login.xml mode change 100755 => 100644 js/hedera/report.html mode change 100755 => 100644 reports/delivery-note/ui.xml mode change 100755 => 100644 reports/items-report/ui.xml mode change 100755 => 100644 reports/recover-password/ui.php mode change 100755 => 100644 reports/shelves-report/ui.xml diff --git a/debian/control b/debian/control index a3a71323..e5367b3b 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,18 @@ Source: hedera-web Priority: optional Maintainer: Juan Ferrer Toribio -Build-Depends: build-essential, debhelper, nodejs +Build-Depends: build-essential, debhelper, dh-apache2, nodejs Standards-Version: 3.9.3 Section: misc Homepage: http://www.verdnatura.es -Vcs-Git: git://www.verdnatura.es/var/git/hedera-web +Vcs-Git: https://git.verdnatura.es/hedera-web Package: hedera-web Architecture: all -Depends: apache2, php5-mysql, php5-mcrypt, php5-ldap, php5-ssh2, php-vn-lib, nodejs +Depends: apache2 | httpd, nodejs, php5-cli, php5-mysql, php5-mcrypt, php5-ldap, php5-ssh2, php-vn-lib Suggests: php-text-captcha, php5-imap, tinymce Section: misc Priority: optional Description: Verdnatura's web page - Verdnatura's web page. + Web page used by Verdnatura, it includes user authetication, a simple CMS and + a webpshop. diff --git a/debian/install b/debian/install index 7e79b186..68a9ca27 100644 --- a/debian/install +++ b/debian/install @@ -11,6 +11,5 @@ rest usr/share/hedera-web index.php usr/share/hedera-web package.json usr/share/hedera-web build usr/share/hedera-web -LICENSE usr/share/hedera-web README.md usr/share/hedera-web webpack.config.json usr/share/hedera-web diff --git a/debian/postinst b/debian/postinst index 13608102..314c646b 100755 --- a/debian/postinst +++ b/debian/postinst @@ -1,7 +1,15 @@ #!/bin/bash -cd /usr/share/hedera-web && npm install --production -a2enconf hedera-web +set -e + +(cd /usr/share/hedera-web && npm install --production) + +if [ -e /usr/share/apache2/apache2-maintscript-helper ] +then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke enconf hedera-web.conf +fi + service apache2 reload service php5-fpm restart service cron restart diff --git a/debian/postrm b/debian/postrm index d2d54aca..d1172f9e 100755 --- a/debian/postrm +++ b/debian/postrm @@ -1,5 +1,13 @@ #!/bin/bash +set -e + +if [ -e /usr/share/apache2/apache2-maintscript-helper ] +then + . /usr/share/apache2/apache2-maintscript-helper + apache2_invoke disconf hedera-web.conf +fi + rm -rf /usr/share/hedera-web/node_modules service apache2 reload service cron restart diff --git a/debian/rules b/debian/rules index a8f9a7e2..53e46d63 100755 --- a/debian/rules +++ b/debian/rules @@ -3,7 +3,7 @@ #export DH_VERBOSE=1 %: - dh $@ + dh $@ --with apache2 clean: npm --production run clean diff --git a/js/hedera/gui.xml b/js/hedera/gui.xml old mode 100755 new mode 100644 diff --git a/js/hedera/login.xml b/js/hedera/login.xml old mode 100755 new mode 100644 diff --git a/js/hedera/report.html b/js/hedera/report.html old mode 100755 new mode 100644 diff --git a/reports/delivery-note/ui.xml b/reports/delivery-note/ui.xml old mode 100755 new mode 100644 diff --git a/reports/items-report/ui.xml b/reports/items-report/ui.xml old mode 100755 new mode 100644 diff --git a/reports/recover-password/ui.php b/reports/recover-password/ui.php old mode 100755 new mode 100644 diff --git a/reports/shelves-report/ui.xml b/reports/shelves-report/ui.xml old mode 100755 new mode 100644