Merge branch 'master' of pwrcvs:/data1/git/pwr

src/tools/pkg/deb_x86_64/pwrrt/control

@@ -3,7 +3,7 @@ Version: 5.3.0-1
 Section: base
 Priority: optional
 Architecture: amd64
-Depends: libc6 (>= 2.13-38), libgtk2.0-0 (>= 2.24.10-2), libasound2 (>= 1.0.25-4), libsqlite3-0 (>= 3.7.13-1+deb7u1), libdb5.1 (>=5.1.29-5)
+Depends: libc6 (>= 2.13-38), libgtk2.0-0 (>= 2.24.10-2), libasound2 (>= 1.0.25-4), libsqlite3-0 (>= 3.7.13-1+deb7u1), libdb5.1 (>=5.1.29-5), libmysqlclient18 (>= 5.5.43-0+deb7u1), libhdf5-openmpi-7 (>= 1.8.8-9+b1)
 Replaces: pwr34,pwr39,pwr40,pwr41,pwr42,pwr43,pwr44,pwr45,pwr46,pwr47,pwr48,pwr50,pwr51,pwr52
 Maintainer: Proview <postmaster@proview.se>
 Description:

src/tools/pkg/deb_x86_64/pwrrt/pwrp_profile

@@ -20,10 +20,10 @@ export pwr_load=$pwrb_root/load
 export pwr_lis=$pwrb_root/lis
 export pwr_doc=$pwrb_root/doc
 
-export pwrp_exe=$pwrp_root/x86_linux/exe
-export pwrp_lib=$pwrp_root/x86_linux/lib
-export pwrp_obj=$pwrp_root/x86_linux/obj
-export pwrp_lis=$pwrp_root/x86_linux/lis
+export pwrp_exe=$pwrp_root/x86_64_linux/exe
+export pwrp_lib=$pwrp_root/x86_64_linux/lib
+export pwrp_obj=$pwrp_root/x86_64_linux/obj
+export pwrp_lis=$pwrp_root/x86_64_linux/lis
 export pwrp_inc=$pwrp_root/common/inc
 export pwrp_load=$pwrp_root/common/load
 export pwrp_log=$pwrp_root/common/log

src/tools/pkg/ubu_x86_64/pwrrt/pwrp_profile

@@ -20,10 +20,10 @@ export pwr_load=$pwrb_root/load
 export pwr_lis=$pwrb_root/lis
 export pwr_doc=$pwrb_root/doc
 
-export pwrp_exe=$pwrp_root/x86_linux/exe
-export pwrp_lib=$pwrp_root/x86_linux/lib
-export pwrp_obj=$pwrp_root/x86_linux/obj
-export pwrp_lis=$pwrp_root/x86_linux/lis
+export pwrp_exe=$pwrp_root/x86_64_linux/exe
+export pwrp_lib=$pwrp_root/x86_64_linux/lib
+export pwrp_obj=$pwrp_root/x86_64_linux/obj
+export pwrp_lis=$pwrp_root/x86_64_linux/lis
 export pwrp_inc=$pwrp_root/common/inc
 export pwrp_load=$pwrp_root/common/load
 export pwrp_log=$pwrp_root/common/log