depend on libjs-extjs

This commit is contained in:
Dietmar Maurer 2017-01-25 18:24:51 +01:00
parent 87d50de749
commit 9556b395b0
7 changed files with 10 additions and 10 deletions

View File

@ -42,7 +42,7 @@ _EOD
}
$page .= <<_EOD;
<script type="text/javascript" src="/pve2/ext6/pvemanagerlib.js"></script>
<script type="text/javascript" src="/pve2/js/pvemanagerlib.js"></script>
<script type="text/javascript" src="/pve2/ext6/locale/locale-${lang}.js"></script>
_EOD

View File

@ -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/');

2
debian/control.in vendored
View File

@ -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

View File

@ -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

View File

@ -1,4 +1,4 @@
SUBDIRS = images ext6 css manager6 touch mobile
SUBDIRS = images css manager6 touch mobile
all: ${SUBDIRS}

View File

@ -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:

View File

@ -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 \