Merge branch 'master' of github.com:siamect/proview

src/tools/bld/src/os_linux/hw_arm/variables.mk

@@ -92,6 +92,9 @@ rt_msg_eobjs 	:= $(eobj_dir)/pwr_msg_co.o $(eobj_dir)/pwr_msg_rt.o
 rs_msg_eobjs 	:= $(eobj_dir)/pwr_msg_rs.o
 wb_msg_eobjs 	:= $(eobj_dir)/pwr_msg_wb.o $(eobj_dir)/pwr_msg_ge.o $(eobj_dir)/pwr_msg_flow.o
 
+linkcp = :
+pre_so =
+
 # Configuration
 #ifeq ($(pwre_conf_mysql),1)
 #  cmysql        := -DPWRE_CONF_MYSQL=1

src/tools/pkg/deb/pwrdemo/control

-Package: pwrdemo54
+Package: pwrdemo55
 Version: 5.5.0-1
 Section: base
 Priority: optional
 Architecture: i386
-Depends: sudo, pwr54 (>= 5.5.0-1)
+Depends: sudo, pwr55 (>= 5.5.0-1)
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package
  5.5.0-1 Base release

src/tools/pkg/deb_x86_64/pwr/control

-Package: pwr54
+Package: pwr55
 Version: 5.5.0-1
 Section: base
 Priority: optional
 Architecture: amd64
 Depends: libc6 (>= 2.19-18+deb8u1), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1), libdb5.3 (>=5.3.28-9), libdb5.3++ (>= 5.3.28-9), libmysql++3 (>= 3.2.1+pristine-1), libsqlite3-0 (>= 3.8.7.1-1+deb8u1), librsvg2-2 (>= 2.40.5-1), g++ (>= 4:4.9.2-2)
-Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53
+Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview development and runtime environment package
  5.5.0-1 Base release

src/tools/pkg/deb_x86_64/pwrdemo/control

-Package: pwrdemo54
+Package: pwrdemo55
 Version: 5.5.0-1
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: sudo, pwr54 (>= 5.4.0-1)
+Depends: sudo, pwr55 (>= 5.5.0-1)
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package
  5.5.0-1 Base release

src/tools/pkg/deb_x86_64/pwrrt/control

@@ -4,7 +4,7 @@ Section: base
 Priority: optional
 Architecture: amd64
 Depends: libc6 (>= 2.19-18+deb8u1), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1), libsqlite3-0 (>= 3.5.7.1-1+deb8u1), libdb5.3 (>=5.3.28-9)
-Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53
+Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54
 Maintainer: Proview <postmaster@proview.se>
 Description:
  5.5.0-1 Base release

src/tools/pkg/deb_x86_64/pwrsev/control

@@ -4,7 +4,7 @@ Section: base
 Priority: optional
 Architecture: amd64
 Depends: libc6 (>= 2.19-18+deb8u1), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1), libsqlite3-0 (>= 3.8.7.1-1+deb8u1), libdb5.3 (>=5.3.28-9), libmysqlclient18 (>= 5.5.44-0+deb8u1)
-Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53
+Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54
 Maintainer: Proview <postmaster@proview.se>
 Description:
  5.5.0-1 Base release

src/tools/pkg/raspbian/pwr/control

-Package: pwr54
+Package: pwr55
 Version: 5.5.0-1
 Section: base
 Priority: optional
 Architecture: armhf
-Depends: libc6 (>= 2.19-18+deb8u3), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1+rpi1), libdb5.3 (>=5.3.28-9), libdb5.3++ (>= 5.3.28-9), libsqlite3-0 (>= 3.8.7.1-1+deb8u1), librsvg2-2 (>= 2.40.5-1), g++ (>= 4:4.9.2-1),xterm
-Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53
+Depends: libc6 (>= 2.19-18+deb8u3), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1+rpi1), libdb5.3 (>=5.3.28-9), libdb5.3++ (>= 5.3.28-9), libmysql++3 (>= 3.2.1+pristine-1), libsqlite3-0 (>= 3.8.7.1-1+deb8u1), librsvg2-2 (>= 2.40.5-1), g++ (>= 4:4.9.2-1),xterm
+Replaces: pwrrt,pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview development and runtime environment package
  5.5.0-1 Base release

src/tools/pkg/raspbian/pwrdemo/control

-Package: pwrdemo54
+Package: pwrdemo55
 Version: 5.5.0-1
 Section: base
 Priority: optional
 Architecture: armhf
-Depends: pwr54 (>= 5.4.0-1)
+Depends: pwr55 (>= 5.5.0-1)
 Maintainer: Proview <postmaster@proview.se>
 Description: Proview Demo Project package
  5.5.0-1 Base release

src/tools/pkg/raspbian/pwrrt/control

@@ -4,7 +4,7 @@ Section: base
 Priority: optional
 Architecture: armhf
 Depends: libc6 (>= 2.19-18+deb8u3), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1+rpi1), libdb5.3 (>=5.3.28-9), libsqlite3-0 (>= 3.8.7.1-1+deb8u1)
-Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53
+Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54
 Maintainer: Proview <postmaster@proview.se>
 Description:
  5.5.0-1 Base release

src/tools/pkg/raspbian/pwrsev/control

@@ -4,7 +4,7 @@ Section: base
 Priority: optional
 Architecture: armhf
 Depends: libc6 (>= 2.19-18+deb8u3), libgtk2.0-0 (>= 2.24.25-3), libasound2 (>= 1.0.28-1+rpi1), libsqlite3-0 (>= 3.8.7.1-1+deb8u1), libdb5.3 (>=5.3.28-9), libmysqlclient18 (>= 5.5.44-0+deb8u1)
-Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53
+Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52,pwr53,pwr54
 Maintainer: Proview <postmaster@proview.se>
 Description:
  5.5.0-1 Base release