Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -31,13 +31,13 @@ $(INSTALL) -c -m 644 -o root vws.1 $(DESTDIR)$(mandir)/man1 $(INSTALL) -c -m 644 -o root find_free_port.1 $(DESTDIR)$(mandir)/man1 $(INSTALL) -c -m 644 -o root vws.service $(DESTDIR)$(systemddir) $(INSTALL) -c -m 644 -o root vws.init $(DESTDIR)$(initddir)/vws -origtarball: vws find_free_port vws.init vws.service.in Makefile vws.conf vws.mkd find_free_port.mkd .pylintrc +origtarball: vws find_free_port vws.init vws.service.in Makefile vws.conf vws.mkd find_free_port.mkd .pylintrc README.md version=$$(sed -n 's/VERSION = //p' vws); \ mkdir vws-$$version; cp $+ vws-$$version; \ tar cjf ../vws_$$version.orig.tar.bz2 vws-$$version; \ rm -rf vws-$$version deb: origtarball debuild DELETED debian/README.source Index: debian/README.source ================================================================== --- debian/README.source +++ debian/README.source @@ -1,10 +0,0 @@ -vws for Debian --------------- - - - - - - -- Victor Wagner Sat, 14 Jan 2017 19:48:30 +0300 - Index: debian/changelog ================================================================== --- debian/changelog +++ debian/changelog @@ -1,5 +1,11 @@ +vws (0.8-1) unstable; urgency=medium + + * Switch to python3 + + -- Victor Wagner Tue, 01 Oct 2019 22:07:09 +0300 + vws (0.7-1) unstable; urgency=medium * Make spiceuri command more robust -- Victor Wagner Thu, 06 Jun 2019 18:10:04 +0300 Index: debian/control ================================================================== --- debian/control +++ debian/control @@ -1,16 +1,17 @@ Source: vws Section: otherosfs Priority: optional Maintainer: Victor Wagner -Build-Depends: debhelper (>= 9), dh-systemd, pandoc -Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 9.2), pandoc +Standards-Version: 3.9.8 Homepage: https://www.wagner.pp.ru/fossil/vws Package: vws Architecture: all -Depends: ${misc:Depends}, python, qemu-system, bridge-utils, net-tools +Depends: ${misc:Depends}, python3, qemu-system, bridge-utils, net-tools +Pre-Depends: adduser Recommends: dnsmasq, virt-viewer Description: Simple manger script for QEMU virtual machines Virtual Workstations (VWs) is simple and thin script layer that simplifies creation and use of KVM virtual machines. . Index: debian/copyright ================================================================== --- debian/copyright +++ debian/copyright @@ -1,31 +1,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: vws Source: https://www.wagner.pp.ru/fossil/vws Files: * -Copyright: 2015-2017 Victor Wagner - -License: GPL-3+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". - -Files: debian/* -Copyright: 2017 Victor Wagner +Copyright: © 2015-2019 Victor Wagner License: GPL-3+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Index: debian/files ================================================================== --- debian/files +++ debian/files @@ -1,2 +1,2 @@ -vws_0.7-1_all.deb otherosfs optional -vws_0.7-1_amd64.buildinfo otherosfs optional +vws_0.8-1_all.deb otherosfs optional +vws_0.8-1_amd64.buildinfo otherosfs optional Index: debian/postinst ================================================================== --- debian/postinst +++ debian/postinst @@ -20,11 +20,11 @@ case "$1" in configure) update-rc.d vws defaults dpkg-statoverride --list *qemu-bridge-helper|| dpkg-statoverride --update --add root kvm 4750 /usr/lib/qemu/qemu-bridge-helper - id -u kvm >/dev/null 2>&1 || adduser --system --ingroup kvm --home /home/virtual/vws --no-create-home kvm + id -u kvm >/dev/null 2>&1 || adduser --system --ingroup kvm --home /var/lib/vws kvm ;; abort-upgrade|abort-remove|abort-deconfigure) ;; Index: debian/rules ================================================================== --- debian/rules +++ debian/rules @@ -19,11 +19,11 @@ export prefix # main packaging script based on dh7 syntax %: dh $@ -override_dh_build override_dh_auto_build: +override_dh_auto_build: make prefix=/usr override_dh_install: dh_systemd_enable dh_installinit override_dh_auto_install: Index: find_free_port ================================================================== --- find_free_port +++ find_free_port @@ -1,22 +1,22 @@ -#!/usr/bin/python -import sys,socket,errno +#!/usr/bin/python3 +import sys, socket, errno if len(sys.argv)>1: - port=int(sys.argv[1]) + port = int(sys.argv[1]) else: - port=5900 + port = 5900 -s=socket.socket(socket.AF_INET, socket.SOCK_STREAM) +s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) while True: try: - s.bind(("",port)) + s.bind(("", port)) except socket.error as e: if e.errno== errno.EADDRINUSE: port+=1 continue else: raise e break s.close() -print port +print(port) Index: vws.conf ================================================================== --- vws.conf +++ vws.conf @@ -1,11 +1,11 @@ [directories] -SharedVMs=/home/virtual/vws/shared -AutostartVMs=/home/virtual/vws/autostart +SharedVMs=/var/lib/vws/shared +AutostartVMs=/var/lib/vws/autostart [tools] viewer=remote-viewer %s -bridge_list=/sbin/brigectl show +bridge_list=/sbin/brctl show lsusb=lsusb arp=/usr/sbin/arp [permissions] # User name of user which owns processes of autostart VM # Should be member of group which is able to access KVM device. Index: vws.init ================================================================== --- vws.init +++ vws.init @@ -8,14 +8,12 @@ # Short-Description: Example initscript # Description: This file should be used to construct scripts to be # placed in /etc/init.d. ### END INIT INFO -# Author: Foo Bar +# Author: Victor Wagner # -# Please remove the "Author" lines above and replace them -# with your own name if you copy and modify this script. # Do NOT "set -e" # PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin