diff --git a/base b/base index fee904f..a7f1ffa 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit fee904f298c898539624f335067684fe9c58fd80 +Subproject commit a7f1ffabc55f3230b2abaa98135fbc111331042c diff --git a/browser b/browser index d8104ff..85cd828 160000 --- a/browser +++ b/browser @@ -1 +1 @@ -Subproject commit d8104ff58f8e3661b519bd85018c341be80e975d +Subproject commit 85cd82824105d840204becc8c7ffa6d1736467c1 diff --git a/debian/lwr-dist-dpkg b/debian/lwr-dist-dpkg index 610290a..58981ef 100755 --- a/debian/lwr-dist-dpkg +++ b/debian/lwr-dist-dpkg @@ -16,7 +16,7 @@ cat < "$DEST_DIR/bin/luwrain" # Copyright $(date +%Y) Michael Pozhidaev cd /usr/share/luwrain -exec java --module-path /usr/share/openjfx/lib --add-modules javafx.controls,javafx.web,javafx.swing -jar jar/luwrain-base.jar "\$@" +exec java --module-path /usr/share/openjfx/lib --add-modules javafx.controls,javafx.web,javafx.swing --add-exports javafx.web/com.sun.webkit.dom=ALL-UNNAMED -jar jar/luwrain-base.jar "\$@" EOF cat < "$DEST_DIR/bin/lwr" @@ -37,6 +37,5 @@ rm -f rhvoice-data.tar.xz cd jar rm -f javafx-*.jar -#[ -d $DIR/jni ] && cp $DIR/jni/* $DEST_DIR/lib -echo DPKG distro prepared -exit 0 +ln -s luwrain-base-*.jar luwrain-base.jar +[ -d $DIR/jni ] && cp $DIR/jni/* $DEST_DIR/jar diff --git a/registry b/registry index b9abaff..44d1071 160000 --- a/registry +++ b/registry @@ -1 +1 @@ -Subproject commit b9abaffe1a74cb71fe106316f454e892d7d8d329 +Subproject commit 44d10712b1881ddd43d71e451f0b1ee85dbb3d05