baculum: Update spec and deb files

diff --git a/gui/baculum/debian/baculum-api-apache2.postinst b/gui/baculum/debian/baculum-api-apache2.postinst
index fbd36fee9f683959a0ea6a22fe68b1bb0492d2e3..df89b97c61ed41442fec6bca0bed852d84b08480 100644 (file)
--- a/gui/baculum/debian/baculum-api-apache2.postinst
+++ b/gui/baculum/debian/baculum-api-apache2.postinst
@@ -6,6 +6,7 @@ case "$1" in
     configure)
        chown -R www-data:www-data /etc/baculum/Config-api-apache
        chmod 750 /etc/baculum/Config-api-apache
+       chmod 600 /etc/baculum/Config-api-apache/baculum.users
     ;;
 esac
 

diff --git a/gui/baculum/debian/baculum-api-lighttpd.postinst b/gui/baculum/debian/baculum-api-lighttpd.postinst
index 3d9decff4c49d5708562e3e55b0231bc913c3602..67d43e808ef9fcc49a4fc042f5f3eb5091f9530e 100644 (file)
--- a/gui/baculum/debian/baculum-api-lighttpd.postinst
+++ b/gui/baculum/debian/baculum-api-lighttpd.postinst
@@ -5,8 +5,8 @@ set -e
 case "$1" in
     configure)
        chown -R www-data:www-data /etc/baculum/Config-api-lighttpd
-       chown www-data:www-data /etc/baculum/baculum-api-lighttpd.conf
        chmod 750 /etc/baculum/Config-api-lighttpd
+       chmod 600 /etc/baculum/Config-api-lighttpd/baculum.users
     ;;
 esac
 

diff --git a/gui/baculum/debian/baculum-api.install b/gui/baculum/debian/baculum-api.install
index 7de16e9bd9263833225f55842e99addb934cf356..bace525d4ce37c243d7eda197cfbcd0aeab9b780 100644 (file)
--- a/gui/baculum/debian/baculum-api.install
+++ b/gui/baculum/debian/baculum-api.install
@@ -4,6 +4,6 @@ build/usr/share/baculum/htdocs/protected/API/Lang             /usr/share/baculum
 build/usr/share/baculum/htdocs/protected/API/Layouts          /usr/share/baculum/htdocs/protected/API/
 build/usr/share/baculum/htdocs/protected/API/Logs             /usr/share/baculum/htdocs/protected/API/
 build/usr/share/baculum/htdocs/protected/API/Pages            /usr/share/baculum/htdocs/protected/API/
-build/usr/share/baculum/htdocs/protected/API/endpoints.xml    /usr/share/baculum/htdocs/protected/API/
 build/usr/share/locale/en/LC_MESSAGES/baculum-api.mo          /usr/share/locale/en/LC_MESSAGES/
 build/usr/share/locale/pl/LC_MESSAGES/baculum-api.mo          /usr/share/locale/pl/LC_MESSAGES/
+build/usr/share/locale/pt/LC_MESSAGES/baculum-api.mo          /usr/share/locale/pt/LC_MESSAGES/

diff --git a/gui/baculum/debian/baculum-api.links b/gui/baculum/debian/baculum-api.links
index 14a8e7adf2b83878136ec40a3196dd9093a47b17..cf81576db41a4a27a02b388929512fa2952d7599 100644 (file)
--- a/gui/baculum/debian/baculum-api.links
+++ b/gui/baculum/debian/baculum-api.links
@@ -1,2 +1,3 @@
 usr/share/locale/en/LC_MESSAGES/baculum-api.mo usr/share/baculum/htdocs/protected/API/Lang/en/messages.mo
-usr/share/locale/pl/LC_MESSAGES/baculum-api.mo usr/share/baculum/htdocs/protected/API/Lang/pl/messages.mo
\ No newline at end of file
+usr/share/locale/pl/LC_MESSAGES/baculum-api.mo usr/share/baculum/htdocs/protected/API/Lang/pl/messages.mo
+usr/share/locale/pt/LC_MESSAGES/baculum-api.mo usr/share/baculum/htdocs/protected/API/Lang/pt/messages.mo
\ No newline at end of file

diff --git a/gui/baculum/debian/baculum-api.prerm b/gui/baculum/debian/baculum-api.prerm
index 9425dc9e032e77ac20c77ea1c94cec0b9c5b2f5b..e4d3aaa44e009dc1a41f07245dcc0f41161b2964 100644 (file)
--- a/gui/baculum/debian/baculum-api.prerm
+++ b/gui/baculum/debian/baculum-api.prerm
@@ -2,9 +2,6 @@
 
 set -e
 
-rm usr/share/baculum/htdocs/protected/API/Lang/en/messages.mo
-rm usr/share/baculum/htdocs/protected/API/Lang/pl/messages.mo
-
 #DEBHELPER#
 
 exit 0
\ No newline at end of file

diff --git a/gui/baculum/debian/baculum-web-apache2.postinst b/gui/baculum/debian/baculum-web-apache2.postinst
index 01b50ff6c51c8c8a4bda914baa16429773827a1c..afb5771ad0d4d249fb8a4163e6200d36d88366de 100644 (file)
--- a/gui/baculum/debian/baculum-web-apache2.postinst
+++ b/gui/baculum/debian/baculum-web-apache2.postinst
@@ -6,6 +6,7 @@ case "$1" in
     configure)
        chown -R www-data:www-data /etc/baculum/Config-web-apache
        chmod 750 /etc/baculum/Config-web-apache
+       chmod 600 /etc/baculum/Config-web-apache/baculum.users
     ;;
 esac
 

diff --git a/gui/baculum/debian/baculum-web-lighttpd.postinst b/gui/baculum/debian/baculum-web-lighttpd.postinst
index 2bb793e23a9f8df0cc2df9ffea4a9b50e5146656..2cdd9af0d4bb41a0fba701c58616322ebb430db5 100644 (file)
--- a/gui/baculum/debian/baculum-web-lighttpd.postinst
+++ b/gui/baculum/debian/baculum-web-lighttpd.postinst
@@ -5,8 +5,8 @@ set -e
 case "$1" in
     configure)
        chown -R www-data:www-data /etc/baculum/Config-web-lighttpd
-       chown www-data:www-data /etc/baculum/baculum-web-lighttpd.conf
        chmod 750 /etc/baculum/Config-web-lighttpd
+       chmod 600 /etc/baculum/Config-web-lighttpd/baculum.users
     ;;
 esac
 

diff --git a/gui/baculum/debian/changelog b/gui/baculum/debian/changelog
index 1ffb393ae48e40f8085368980f45f9e968b3d8b2..664d0c7465e829b19fcbfd53293d28033d1bd910 100644 (file)
--- a/gui/baculum/debian/changelog
+++ b/gui/baculum/debian/changelog
@@ -1,23 +1,6 @@
-baculum (9.0.0) xenial; urgency=high
+baculum (9.4.4~stretch) stretch; urgency=low
 
   [ Marcin Haba ]
-  * new Baculum upstream (Web and API)
-  * split deb metafiles into baculum-api-(lighttpd|apache2),
-    baculum-web-(lighttpd|apache2) and baculum-common
+  * new upstream 9.4.4
 
- -- Marcin Haba <marcin.haba@bacula.pl>  Sat, 29 Apr 2017 23:35:01 +0200
-
-baculum (7.2.0ppa1~wily1) wily; urgency=medium
-
-  [ Marcin Haba ]
-  * rebuild upstream 7.2.0 for Ubuntu 15.10
-  * fix and recreate lost baculum.users file after upgrade
-  * do not remove baculum.users file during upgrade
-  * rename setting.conf to settings.conf.apache or settings.conf.lighttpd
-    when baculum-apache2 or baculum-lighttpd is removed
-  * remove debug files while remove baculum package
-  * add bacula-console to baculum dependencies
-  * add baculum package to baculum-lighttpd dependencies
-  * correct baculum-lighttpd short description
-
- -- Marcin Haba <marcin.haba@bacula.pl>  Wed, 14 Nov 2015 19:41:01 +0200
+ -- Marcin Haba <marcin.haba@bacula.pl>  Thu, 30 May 2019 06:08:21 +0200

diff --git a/gui/baculum/debian/control b/gui/baculum/debian/control
index 11a26b15c810ad9caf22be738aa71c841aeaf2da..0ea1ac55b4ea9bd267932c07bc35e3f6665e79b9 100644 (file)
--- a/gui/baculum/debian/control
+++ b/gui/baculum/debian/control
@@ -18,7 +18,7 @@ Description: Baculum is web based tool to configure, manage, administer and moni
 Package: baculum-api
 Section: web
 Architecture: all
-Depends: ${misc:Depends}, php-cgi, php-mysql, php-pgsql, php-sqlite3, php-json, php-xml, baculum-common, bacula-console
+Depends: ${misc:Depends}, php-cgi, php-mysql, php-pgsql, php-sqlite3, php-json, php-xml, baculum-common
 Description: API for Baculum Web GUI
  This package provides the API files for Baculum.
  This module is a part of Baculum.
@@ -26,7 +26,7 @@ Description: API for Baculum Web GUI
 Package: baculum-web
 Section: web
 Architecture: all
-Depends: ${misc:Depends}, php-cgi, php-curl, php-json, php-xml, libjs-excanvas, baculum-common
+Depends: ${misc:Depends}, php-cgi, php-curl, php-json, php-xml, php-bcmath, libjs-excanvas, baculum-common
 Description: WebGUI tool for Bacula Community program
  This package provides the Web files for Baculum.
  This module is a part of Baculum.

diff --git a/gui/baculum/examples/rpm-template/baculum.spec b/gui/baculum/examples/rpm-template/baculum.spec
index a6288fa254c6a108bdfb5f27fcc1228d749e38a3..db939de464ba4b9bbf75ab8c376ab6640e126649 100644 (file)
--- a/gui/baculum/examples/rpm-template/baculum.spec
+++ b/gui/baculum/examples/rpm-template/baculum.spec
@@ -16,9 +16,7 @@ BuildRequires:        systemd-units
 BuildRequires: selinux-policy
 BuildRequires: selinux-policy-devel
 BuildRequires: checkpolicy
-# Lower version of PHP ( < 5.3.4) does not provide php-mysqlnd db driver
-# and from this reason the lowest is 5.3.4
-Requires:      php >= 5.3.4
+Requires:      php >= 5.4.0
 Requires:      php-bcmath
 Requires:      php-common
 Requires:      php-mysqlnd
@@ -47,9 +45,7 @@ This module is a part of Baculum.
 Summary:               Baculum API files
 Requires:              %name-common = %version-%release
 Group:                 Applications/Internet
-# Lower version of PHP ( < 5.3.4) does not provide php-mysqlnd db driver
-# and from this reason the lowest is 5.3.4
-Requires:              php >= 5.3.4
+Requires:              php >= 5.4.0
 Requires:              php-bcmath
 Requires:              php-common
 Requires:              php-mysqlnd
@@ -66,9 +62,7 @@ This module is a part of Baculum.
 Summary:               Baculum API files
 Requires:              %name-common = %version-%release
 Group:                 Applications/Internet
-# Lower version of PHP ( < 5.3.4) does not provide php-mysqlnd db driver
-# and from this reason the lowest is 5.3.4
-Requires:              php >= 5.3.4
+Requires:              php >= 5.4.0
 Requires:              php-common
 Requires:              php-json
 Requires:              php-xml

diff --git a/gui/baculum/examples/rpm/baculum.spec b/gui/baculum/examples/rpm/baculum.spec
index a6288fa254c6a108bdfb5f27fcc1228d749e38a3..db939de464ba4b9bbf75ab8c376ab6640e126649 100644 (file)
--- a/gui/baculum/examples/rpm/baculum.spec
+++ b/gui/baculum/examples/rpm/baculum.spec
@@ -16,9 +16,7 @@ BuildRequires:        systemd-units
 BuildRequires: selinux-policy
 BuildRequires: selinux-policy-devel
 BuildRequires: checkpolicy
-# Lower version of PHP ( < 5.3.4) does not provide php-mysqlnd db driver
-# and from this reason the lowest is 5.3.4
-Requires:      php >= 5.3.4
+Requires:      php >= 5.4.0
 Requires:      php-bcmath
 Requires:      php-common
 Requires:      php-mysqlnd
@@ -47,9 +45,7 @@ This module is a part of Baculum.
 Summary:               Baculum API files
 Requires:              %name-common = %version-%release
 Group:                 Applications/Internet
-# Lower version of PHP ( < 5.3.4) does not provide php-mysqlnd db driver
-# and from this reason the lowest is 5.3.4
-Requires:              php >= 5.3.4
+Requires:              php >= 5.4.0
 Requires:              php-bcmath
 Requires:              php-common
 Requires:              php-mysqlnd
@@ -66,9 +62,7 @@ This module is a part of Baculum.
 Summary:               Baculum API files
 Requires:              %name-common = %version-%release
 Group:                 Applications/Internet
-# Lower version of PHP ( < 5.3.4) does not provide php-mysqlnd db driver
-# and from this reason the lowest is 5.3.4
-Requires:              php >= 5.3.4
+Requires:              php >= 5.4.0
 Requires:              php-common
 Requires:              php-json
 Requires:              php-xml