Commit 94ec7899 authored by Claes Sjöfors's avatar Claes Sjöfors

Debian 8 build

parent e6589544
...@@ -101,6 +101,7 @@ echo "-- Building pwr$ver" ...@@ -101,6 +101,7 @@ echo "-- Building pwr$ver"
# Create directories # Create directories
mkdir -p $pkgroot/DEBIAN mkdir -p $pkgroot/DEBIAN
mkdir -p $pkgroot/usr/share/doc/pwr$ver mkdir -p $pkgroot/usr/share/doc/pwr$ver
mkdir -p $pkgroot/usr/share/applications
mkdir -p $pkgroot/usr/pwrp mkdir -p $pkgroot/usr/pwrp
mkdir -p $pkgroot/etc mkdir -p $pkgroot/etc
...@@ -193,6 +194,8 @@ cp $pwre_sroot/tools/pkg/deb/user/wtt_init1.pwr_com $pkgroot/usr/pwr$ver/$pwre_t ...@@ -193,6 +194,8 @@ cp $pwre_sroot/tools/pkg/deb/user/wtt_init1.pwr_com $pkgroot/usr/pwr$ver/$pwre_t
echo "Categories=GNOME;GTK;Application;" echo "Categories=GNOME;GTK;Application;"
} > $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop } > $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop
cp $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview$ver.desktop $pkgroot/usr/share/applications/
# Create package # Create package
echo "-- Building package" echo "-- Building package"
if which fakeroot > /dev/null; then if which fakeroot > /dev/null; then
......
...@@ -22,6 +22,7 @@ echo "-- Building pwrdemo$ver" ...@@ -22,6 +22,7 @@ echo "-- Building pwrdemo$ver"
# Create directories # Create directories
mkdir -p $pkgroot/DEBIAN mkdir -p $pkgroot/DEBIAN
mkdir -p $pkgroot/usr/share/doc/pwrdemo$ver mkdir -p $pkgroot/usr/share/doc/pwrdemo$ver
mkdir -p $pkgroot/usr/share/applications
mkdir -p $pkgroot/usr/pwrp mkdir -p $pkgroot/usr/pwrp
find $pkgroot -type d | xargs chmod 755 find $pkgroot -type d | xargs chmod 755
...@@ -81,6 +82,8 @@ cd $currentdir ...@@ -81,6 +82,8 @@ cd $currentdir
echo "Categories=GNOME;GTK;Application;" echo "Categories=GNOME;GTK;Application;"
} > $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop } > $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop
cp $pkgroot/usr/pwrp/pwrdemo$ver/cnf/proviewdemo$ver.desktop $pkgroot/usr/share/applications/
# Create package # Create package
echo "-- Building package" echo "-- Building package"
if which fakeroot > /dev/null; then if which fakeroot > /dev/null; then
......
...@@ -3,7 +3,7 @@ Version: 5.3.1-1 ...@@ -3,7 +3,7 @@ Version: 5.3.1-1
Section: base Section: base
Priority: optional Priority: optional
Architecture: i386 Architecture: i386
Depends: pwr53 (>= 5.3.1-1) Depends: sudo, pwr53 (>= 5.3.1-1)
Maintainer: Proview <postmaster@proview.se> Maintainer: Proview <postmaster@proview.se>
Description: Proview Demo Project package Description: Proview Demo Project package
Proview Demo Project Proview Demo Project
......
...@@ -459,8 +459,8 @@ else ...@@ -459,8 +459,8 @@ else
pwre_config_check_lib mysql MYSQL lib lib 1 "/usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so:/usr/lib/$hwpl-linux-$gnu/libmysqlclient.so" pwre_config_check_lib mysql MYSQL lib lib 1 "/usr/lib/libmysqlclient.so:/usr/lib/mysql/libmysqlclient.so:/usr/lib/$hwpl-linux-$gnu/libmysqlclient.so"
pwre_config_check_include sqlite3 SQLITE3 1 "/usr/include/sqlite3.h" pwre_config_check_include sqlite3 SQLITE3 1 "/usr/include/sqlite3.h"
pwre_config_check_lib libsqlite3 LIBSQLITE3 lib lib 0 "/usr/lib/libsqlite3.so:/usr/lib/$hwpl-linux-$gnu/libsqlite3.so" pwre_config_check_lib libsqlite3 LIBSQLITE3 lib lib 0 "/usr/lib/libsqlite3.so:/usr/lib/$hwpl-linux-$gnu/libsqlite3.so"
pwre_config_check_include hdf5 HDF5 1 "/usr/lib/openmpi/include/mpi.h" pwre_config_check_include hdf5 HDF5 1 "/usr/lib/openmpi/include/mpi.h.no"
pwre_config_check_lib libhdf5 LIBHDF5 lib lib 0 "/usr/lib/libhdf5.so:/usr/lib/$hwpl-linux-$gnu/libhdf5.so" pwre_config_check_lib libhdf5 LIBHDF5 lib lib 0 "/usr/lib/libhdf5.so:/usr/lib/$hwpl-linux-$gnu/libhdf5_openmpi.so"
pwre_config_check_lib mq MQ lib mq 1 "/usr/lib/libdmq.so:/usr/local/dmq/lib/libdmq.so" pwre_config_check_lib mq MQ lib mq 1 "/usr/lib/libdmq.so:/usr/local/dmq/lib/libdmq.so"
pwre_config_check_lib wmq WMQ lib wmq 1 "/usr/lib/libmqic.so" pwre_config_check_lib wmq WMQ lib wmq 1 "/usr/lib/libmqic.so"
pwre_config_check_lib libprofinet PNAK lib pnak 1 "/usr/lib/libprofinet.a" pwre_config_check_lib libprofinet PNAK lib pnak 1 "/usr/lib/libprofinet.a"
......
...@@ -335,7 +335,7 @@ XttGeGtk::XttGeGtk( GtkWidget *xg_parent_wid, void *xg_parent_ctx, const char *x ...@@ -335,7 +335,7 @@ XttGeGtk::XttGeGtk( GtkWidget *xg_parent_wid, void *xg_parent_ctx, const char *x
float rd = 0.05; float rd = 0.05;
if ( window_width < 300 || window_height < 300) if ( window_width < 300 || window_height < 300)
rd = 0.2; rd = 0.2;
printf( "w: %d h: %d rd: %5.3f\n", window_width, window_height, rd);
geometry.min_aspect = gdouble(window_width)/window_height * (1.0 - rd); geometry.min_aspect = gdouble(window_width)/window_height * (1.0 - rd);
geometry.max_aspect = gdouble(window_width)/window_height * (1.0 + rd); geometry.max_aspect = gdouble(window_width)/window_height * (1.0 + rd);
gtk_window_set_geometry_hints( GTK_WINDOW(toplevel), GTK_WIDGET(toplevel), gtk_window_set_geometry_hints( GTK_WINDOW(toplevel), GTK_WIDGET(toplevel),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment