Merge branch 'release/UV_v1.5.5-1'

pom.xml

@@ -21,9 +21,11 @@
     </modules>
 
     <properties>
-        <backend-build>${project.build.directory}/${project.artifactId}-${project.version}_all.deb</backend-build>
+        <backend-build>${project.build.directory}/${project.artifactId}-${debian-package-version}_all.deb</backend-build>
+        <frontend-build>${project.build.directory}/${project.artifactId}-${debian-package-version}_all.deb</frontend-build>
         <!-- set version in control file in debian package-->
-        <debian-package-version>${project.version}</debian-package-version>
+        <debian-package-version-suffix>-1</debian-package-version-suffix>
+        <debian-package-version>${project.version}${debian-package-version-suffix}</debian-package-version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
@@ -36,8 +38,9 @@
                 <!--read from comand line parameter: backend-snapshot-suffix -->
                 <!-- backend-snapshot-suffix is used in debian package's control file. The parameter Version has to be set without suffix SNAPSHOT,
                 because convetion of debian packages: unifiedviews-backend-1.5.1~rc${build_number}.deb  -->
-                <debian-package-version>${project.version}~${backend-snapshot-suffix}</debian-package-version>
+                <debian-package-version>${project.version}${debian-package-version-suffix}~${backend-snapshot-suffix}</debian-package-version>
                 <backend-build>${project.build.directory}/${project.artifactId}_${debian-package-version}_all.deb</backend-build>
+                <frontend-build>${project.build.directory}/${project.artifactId}_${debian-package-version}_all.deb</frontend-build>
             </properties>
         </profile>
     </profiles>

unifiedviews-backend-mysql/src/deb/control/templates

@@ -1,12 +1,15 @@
 Template: backend/mysql_root
 Type: password
-Default: admin
+Default: root
 Description: MySQL root password
 
 Template: backend/mysql_db_user
 Type: string
+Default: uv
 Description: MySQL user for unifiedviews
 
+
 Template: backend/mysql_db_password
 Type: password
+Default: uv
 Description: MySQL user password for unifiedviews

unifiedviews-backend-pgsql/src/deb/control/config

@@ -2,8 +2,8 @@
 set -e
 . /usr/share/debconf/confmodule
 
-db_input critical backend/pgsql_db_user || true
+db_input low backend/pgsql_db_user || true
 db_go
-db_input critical backend/pgsql_db_password || true
+db_input low backend/pgsql_db_password || true
 db_go
 

unifiedviews-backend-pgsql/src/deb/control/templates

@@ -1,8 +1,10 @@
 Template: backend/pgsql_db_user
 Type: string
+Default: uv
 Description: Postgres user for unifiedviews
 
 Template: backend/pgsql_db_password
 Type: password
+Default: uv
 Description: Postgres user password for unifiedviews
 

unifiedviews-backend/src/deb/etc/init.d/unifiedviews-backend

@@ -3,6 +3,18 @@
 # unifiedviews backend
 # This file was inspirated by tomcat6 init script
 #
+### BEGIN INIT INFO
+# Provides:          unifiedviews-backend
+# Required-Start:    $local_fs $remote_fs $network
+# Required-Stop:     $local_fs $remote_fs $network
+# Should-Start:      $named
+# Should-Stop:       $named
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start unifiedviews-backend at boot time
+# Description:       Enable unifiedviews-backend provided by daemon.
+### END INIT INFO
+
 
 ## Source function library.
 #. /etc/rc.d/init.d/functions

unifiedviews-webapp-mysql/src/deb/control/templates

@@ -1,7 +1,9 @@
 Template: frontend/mysql_db_user
 Type: string
+Default: uv
 Description: MySQL user for unifiedviews
 
 Template: frontend/mysql_db_password
 Type: password
+Default: uv
 Description: MySQL user password

unifiedviews-webapp-pgsql/src/deb/control/config

@@ -2,8 +2,8 @@
 set -e
 . /usr/share/debconf/confmodule
 
-db_input critical frontend/pgsql_db_user || true
+db_input low frontend/pgsql_db_user || true
 db_go
-db_input critical frontend/pgsql_db_password || true
+db_input low frontend/pgsql_db_password || true
 db_go
 

unifiedviews-webapp-pgsql/src/deb/control/templates

@@ -1,7 +1,9 @@
 Template: frontend/pgsql_db_user
 Type: string
+Default: uv
 Description: Postgresql user for unifiedviews
 
 Template: frontend/pgsql_db_password
 Type: password
+Default: uv
 Description: Postgresql user password

unifiedviews-webapp-shared/src/deb/control/postinst

@@ -17,7 +17,6 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-. /usr/share/debconf/confmodule
 
 
 prepare_dir() {
@@ -33,7 +32,6 @@ prepare_dir() {
 case "$1" in
     configure)
     prepare_dir
-    db_stop
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)