From 43c31d759b531f53172ed16db8bbbf0cf7ac625c Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 25 Aug 2021 19:36:51 +0000 Subject: [PATCH] deb package dependency updates --- builder/build-tarball | 1 + builder/build.sh | 4 ++++ debian/Makefile.to_fakebuild_tar_package | 1 + debian/control | 2 +- debian/postinst | 2 +- debian/prerm | 2 +- release/maketarball.in | 1 + unix/vncserver | 2 +- 8 files changed, 11 insertions(+), 4 deletions(-) diff --git a/builder/build-tarball b/builder/build-tarball index 3cf9d2f..d619a5f 100755 --- a/builder/build-tarball +++ b/builder/build-tarball @@ -1,6 +1,7 @@ #!/bin/bash set -e +set -x build_www_dir() { local webpacked_www=$PWD/builder/www diff --git a/builder/build.sh b/builder/build.sh index 75794db..8de18a3 100755 --- a/builder/build.sh +++ b/builder/build.sh @@ -1,5 +1,7 @@ #!/bin/sh -e +set -x + detect_quilt() { if which quilt 1>/dev/null; then QUILT_PRESENT=1 @@ -80,7 +82,9 @@ cd /src detect_quilt if [ -n "$QUILT_PRESENT" ]; then quilt push -a + echo 'Patches applied!' fi + make servertarball cp kasmvnc*.tar.gz /build/kasmvnc.${KASMVNC_BUILD_OS}_${KASMVNC_BUILD_OS_CODENAME}.tar.gz diff --git a/debian/Makefile.to_fakebuild_tar_package b/debian/Makefile.to_fakebuild_tar_package index dd097af..646b7ed 100644 --- a/debian/Makefile.to_fakebuild_tar_package +++ b/debian/Makefile.to_fakebuild_tar_package @@ -16,6 +16,7 @@ install: unpack_tarball cp $(SRC_BIN)/vncserver $(DESTDIR)/usr/bin/kasmvncserver cp $(SRC_BIN)/vncconfig $(DESTDIR)/usr/bin/kasmvncconfig cp $(SRC_BIN)/kasmvncpasswd $(DESTDIR)/usr/bin/ + cp $(SRC_BIN)/kasmxproxy $(DESTDIR)/usr/bin/ cp -r $(SRC)/share/doc/kasmvnc*/* $(DESTDIR)/usr/share/doc/kasmvncserver/ rsync -r --exclude '.git*' --exclude po2js --exclude xgettext-html \ --exclude www/utils/ --exclude .eslintrc \ diff --git a/debian/control b/debian/control index 623d913..adf5030 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Kasm Technologies LLC Build-Depends: debhelper (>= 11), rsync, libjpeg-dev, libjpeg-dev, libpng-dev, - libtiff-dev, libgif-dev, libavcodec-dev, libssl-dev, libgl1, libxfont2, libsm6 + libtiff-dev, libgif-dev, libavcodec-dev, libssl-dev, libgl1, libxfont2, libsm6, libxext-dev, libxrandr-dev, libxtst6 Standards-Version: 4.1.3 Homepage: https://github.com/kasmtech/KasmVNC #Vcs-Browser: https://salsa.debian.org/debian/kasmvnc diff --git a/debian/postinst b/debian/postinst index 8a1f407..ffc58a7 100644 --- a/debian/postinst +++ b/debian/postinst @@ -21,7 +21,7 @@ case "$1" in configure) bindir=/usr/bin mandir=/usr/share/man - commands="kasmvncserver kasmvncpasswd kasmvncconfig Xkasmvnc" + commands="kasmvncserver kasmvncpasswd kasmvncconfig Xkasmvnc kasmxproxy" for kasm_command in $commands; do generic_command=`echo "$kasm_command" | sed -e 's/kasm//'`; diff --git a/debian/prerm b/debian/prerm index 8c0802f..d02176a 100644 --- a/debian/prerm +++ b/debian/prerm @@ -21,7 +21,7 @@ case "$1" in remove) bindir=/usr/bin mandir=/usr/share/man - commands="kasmvncserver kasmvncpasswd kasmvncconfig Xkasmvnc" + commands="kasmvncserver kasmvncpasswd kasmvncconfig Xkasmvnc kasmxproxy" for kasm_command in $commands; do generic_command=`echo "$kasm_command" | sed -e 's/kasm//'`; diff --git a/release/maketarball.in b/release/maketarball.in index 02888f7..5b382a9 100644 --- a/release/maketarball.in +++ b/release/maketarball.in @@ -45,6 +45,7 @@ mkdir -p $OUTDIR/man/man1 make DESTDIR=$TMPDIR/inst install if [ $SERVER = 1 ]; then + install -m 755 ./unix/kasmxproxy/kasmxproxy $OUTDIR/bin/ install -m 755 ./xorg.build/bin/Xvnc $OUTDIR/bin/ install -m 644 ./xorg.build/man/man1/Xvnc.1 $OUTDIR/man/man1/Xvnc.1 install -m 644 ./xorg.build/man/man1/Xserver.1 $OUTDIR/man/man1/Xserver.1 diff --git a/unix/vncserver b/unix/vncserver index 68b4ad9..609b01e 100644 --- a/unix/vncserver +++ b/unix/vncserver @@ -1,4 +1,4 @@ -#!/usr/bin/env perl +#!/usr/bin/perl # # Copyright (C) 2009-2010 D. R. Commander. All Rights Reserved. # Copyright (C) 2005-2006 Sun Microsystems, Inc. All Rights Reserved.