From dd8a24be86e6739eb3a0e63fe8551352dab7a068 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 25 Jan 2017 18:24:51 +0100 Subject: [PATCH] depend on libjs-extjs --- PVE/ExtJSIndex.pm | 2 +- PVE/Service/pveproxy.pm | 5 ++--- debian/control.in | 2 +- defines.mk | 1 - www/Makefile | 2 +- www/manager6/Makefile | 4 ++-- www/mobile/Makefile | 4 +++- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/PVE/ExtJSIndex.pm b/PVE/ExtJSIndex.pm index 800443c5e..39246d33c 100644 --- a/PVE/ExtJSIndex.pm +++ b/PVE/ExtJSIndex.pm @@ -42,7 +42,7 @@ _EOD } $page .= <<_EOD; - + _EOD diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm index 0fb6a3842..d9e56c6d2 100755 --- a/PVE/Service/pveproxy.pm +++ b/PVE/Service/pveproxy.pm @@ -64,11 +64,10 @@ sub init { add_dirs($dirs, '/pve2/locale/', '/usr/share/pve-manager/locale/'); add_dirs($dirs, '/pve2/touch/', '/usr/share/pve-manager/touch/'); - add_dirs($dirs, '/pve2/ext6/', '/usr/share/pve-manager/ext6/'); - add_dirs($dirs, '/pve2/manager6/', '/usr/share/pve-manager/manager6/'); - + add_dirs($dirs, '/pve2/ext6/', '/usr/share/javascript/extjs/'); add_dirs($dirs, '/pve2/images/' => '/usr/share/pve-manager/images/'); add_dirs($dirs, '/pve2/css/' => '/usr/share/pve-manager/css/'); + add_dirs($dirs, '/pve2/js/' => '/usr/share/pve-manager/js/'); add_dirs($dirs, '/pve-docs/' => '/usr/share/pve-docs/'); add_dirs($dirs, '/vncterm/' => '/usr/share/vncterm/'); add_dirs($dirs, '/novnc/' => '/usr/share/novnc-pve/'); diff --git a/debian/control.in b/debian/control.in index 6a0dadeb8..e159de22b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,7 +3,7 @@ Version: @VERSION@-@PACKAGERELEASE@ Section: admin Priority: optional Architecture: amd64 -Depends: perl (>= 5.10.0-19), libtimedate-perl, libauthen-pam-perl, libintl-perl, rsync, libjson-perl, liblockfile-simple-perl, vncterm, qemu-server (>= 1.1-1), libwww-perl (>= 6.04-1), libnet-http-perl (>= 6.06-1), libhttp-daemon-perl, wget, libnet-dns-perl, ifenslave (>= 2.6), liblinux-inotify2-perl, debconf (>= 0.5) | debconf-2.0, netcat-traditional, pve-cluster (>= 1.0-29), libpve-common-perl, libpve-storage-perl, libterm-readline-gnu-perl, libpve-access-control (>= 3.0-2), libio-socket-ssl-perl, libfilesys-df-perl, libfile-readbackwards-perl, libfile-sync-perl, cstream, postfix | mail-transport-agent, libxml-parser-perl, lzop, dtach, libpve-http-server-perl, liburi-perl, logrotate, apt-transport-https, ca-certificates, libapt-pkg-perl, libcrypt-ssleay-perl, liblwp-protocol-https-perl, spiceterm, libuuid-perl, hdparm, gdisk, librados2-perl, pve-firewall, novnc-pve, libev-perl, systemd, pve-ha-manager, pve-container, pve-docs +Depends: perl (>= 5.10.0-19), libtimedate-perl, libauthen-pam-perl, libintl-perl, rsync, libjson-perl, liblockfile-simple-perl, vncterm, qemu-server (>= 1.1-1), libwww-perl (>= 6.04-1), libnet-http-perl (>= 6.06-1), libhttp-daemon-perl, wget, libnet-dns-perl, ifenslave (>= 2.6), liblinux-inotify2-perl, debconf (>= 0.5) | debconf-2.0, netcat-traditional, pve-cluster (>= 1.0-29), libpve-common-perl, libpve-storage-perl, libterm-readline-gnu-perl, libpve-access-control (>= 3.0-2), libio-socket-ssl-perl, libfilesys-df-perl, libfile-readbackwards-perl, libfile-sync-perl, cstream, postfix | mail-transport-agent, libxml-parser-perl, lzop, dtach, libpve-http-server-perl, liburi-perl, logrotate, apt-transport-https, ca-certificates, libapt-pkg-perl, libcrypt-ssleay-perl, liblwp-protocol-https-perl, spiceterm, libuuid-perl, hdparm, gdisk, librados2-perl, pve-firewall, novnc-pve, libev-perl, systemd, pve-ha-manager, pve-container, pve-docs, libjs-extjs (>= 6.0.1) Build-Depends: liblocale-po-perl Conflicts: netcat-openbsd, vzdump, vlan Replaces: vzdump, vlan diff --git a/defines.mk b/defines.mk index 1f5e73747..3b8d55873 100644 --- a/defines.mk +++ b/defines.mk @@ -19,7 +19,6 @@ WWWBASEDIR=${DESTDIR}/usr/share/${PACKAGE} WWWROOTDIR=${WWWBASEDIR}/root WWWLOCALEDIR=${WWWBASEDIR}/locale WWWIMAGEDIR=${WWWBASEDIR}/images -WWWEXT6DIR=${WWWBASEDIR}/ext6 WWWTOUCHDIR=${WWWBASEDIR}/touch WWWCSSDIR=${WWWBASEDIR}/css WWWFONTSDIR=${WWWBASEDIR}/css/fonts diff --git a/www/Makefile b/www/Makefile index a7a0925e7..2d522b29d 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -SUBDIRS = images ext6 css manager6 touch mobile +SUBDIRS = images css manager6 touch mobile all: ${SUBDIRS} diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 8350185cd..66d7259ed 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -231,8 +231,8 @@ all: pvemanagerlib.js .PHONY: install install: pvemanagerlib.js install -d ${WWWBASEDIR}/root - install -d ${WWWEXT6DIR} - install -m 0644 -o www-data -g www-data pvemanagerlib.js ${WWWEXT6DIR} + install -d ${WWWJSDIR} + install -m 0644 -o www-data -g www-data pvemanagerlib.js ${WWWJSDIR} .PHONY: clean clean: diff --git a/www/mobile/Makefile b/www/mobile/Makefile index 479f186d6..1947e76bf 100644 --- a/www/mobile/Makefile +++ b/www/mobile/Makefile @@ -1,8 +1,10 @@ include ../../defines.mk +# Note: Cookies.js is copied from ExtJS sources +# extjs/classic/classic/src/util/Cookies.js JSSRC= \ - ../ext6/extjs/classic/classic/src/util/Cookies.js \ + Cookies.js \ ../manager6/Utils.js \ ../manager6/Parser.js \ Toolkit.js \