Package launch.sh and more
* Applied patch contributed in launchpad (Closes: #837997). * Ran wrap-and-sort -t -a. * Build-depends on dh-python. * Removed Pre-Depends: dpkg (>= 1.15.6~). * Removed inactive uploaders. * Standards-Version: 3.9.8 (no change). Change-Id: I22cb343972bd0e65c8e11d50c97212b43d388b6e
This commit is contained in:
Thomas Goirand
parent
6fcdfe4717
commit
8e0f723215
|
|
@ -1,5 +1,6 @@
|
|||
novnc (1:0.4+dfsg+1+20131010+gitf68af8af3d-5) UNRELEASED; urgency=medium
|
||||
novnc (1:0.4+dfsg+1+20131010+gitf68af8af3d-6) unstable; urgency=medium
|
||||
|
||||
[ Ondřej Nový ]
|
||||
* Fixed homepage (https).
|
||||
* Fixed VCS URLs (https).
|
||||
* d/rules: Changed UPSTREAM_GIT protocol to https
|
||||
|
|
@ -7,7 +8,15 @@ novnc (1:0.4+dfsg+1+20131010+gitf68af8af3d-5) UNRELEASED; urgency=medium
|
|||
* d/s/options: extend-diff-ignore of .gitreview
|
||||
* d/control: Using OpenStack's Gerrit as VCS URLs.
|
||||
|
||||
-- Ondřej Nový <novy@ondrej.org> Sun, 28 Feb 2016 15:30:55 +0100
|
||||
[ Thomas Goirand ]
|
||||
* Applied patch contributed in launchpad (Closes: #837997).
|
||||
* Ran wrap-and-sort -t -a.
|
||||
* Build-depends on dh-python.
|
||||
* Removed Pre-Depends: dpkg (>= 1.15.6~).
|
||||
* Removed inactive uploaders.
|
||||
* Standards-Version: 3.9.8 (no change).
|
||||
|
||||
-- Thomas Goirand <zigo@debian.org> Sun, 09 Oct 2016 01:00:48 +0200
|
||||
|
||||
novnc (1:0.4+dfsg+1+20131010+gitf68af8af3d-4) unstable; urgency=high
|
||||
|
||||
|
|
|
|||
|
|
@ -2,29 +2,29 @@ Source: novnc
|
|||
Section: web
|
||||
Priority: optional
|
||||
Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
|
||||
Uploaders: Ghe Rivero <ghe.rivero@stackops.com>,
|
||||
Thomas Goirand <zigo@debian.org>,
|
||||
Mehdi Abaakouk <sileht@sileht.net>
|
||||
Build-Depends: debhelper (>= 9), openstack-pkg-tools, python (>=2.6.6-3~)
|
||||
Build-Depends-Indep: python-greenlet
|
||||
Standards-Version: 3.9.4
|
||||
Uploaders: Thomas Goirand <zigo@debian.org>,
|
||||
Build-Depends: debhelper (>= 9),
|
||||
dh-python,
|
||||
openstack-pkg-tools,
|
||||
python-all,
|
||||
Build-Depends-Indep: python-greenlet,
|
||||
Standards-Version: 3.9.8
|
||||
Vcs-Browser: https://git.openstack.org/cgit/openstack/deb-novnc?h=debian%2Fnewton
|
||||
Vcs-Git: https://git.openstack.org/openstack/deb-novnc -b debian/newton
|
||||
Homepage: https://github.com/kanaka/noVNC
|
||||
|
||||
Package: novnc
|
||||
Architecture: all
|
||||
Pre-Depends: dpkg (>= 1.15.6~)
|
||||
Depends: adduser,
|
||||
libjs-swfobject,
|
||||
python (>= 2.6.6-3~),
|
||||
python,
|
||||
python-novnc,
|
||||
python-numpy,
|
||||
websockify,
|
||||
${misc:Depends},
|
||||
${python:Depends},
|
||||
${shlibs:Depends}
|
||||
Recommends: python-nova
|
||||
${shlibs:Depends},
|
||||
Recommends: python-nova,
|
||||
Description: HTML5 VNC client - daemon and programs
|
||||
noVNC is a HTML5 VNC (WebSockets, Canvas) with encryption (wss://) support
|
||||
client that runs well in any modern browser including mobile browsers
|
||||
|
|
@ -37,13 +37,12 @@ Description: HTML5 VNC client - daemon and programs
|
|||
Package: python-novnc
|
||||
Architecture: all
|
||||
Section: python
|
||||
Pre-Depends: dpkg (>= 1.15.6~)
|
||||
Depends: python (>= 2.6.6-3~),
|
||||
Depends: python,
|
||||
python-oslo.config,
|
||||
${misc:Depends},
|
||||
${python:Depends},
|
||||
${shlibs:Depends}
|
||||
Recommends: python-nova
|
||||
${shlibs:Depends},
|
||||
Recommends: python-nova,
|
||||
Description: HTML5 VNC client - libraries
|
||||
noVNC is a HTML5 VNC (WebSockets, Canvas) with encryption (wss://) support
|
||||
client that runs well in any modern browser including mobile browsers
|
||||
|
|
|
|||
|
|
@ -19,5 +19,6 @@ include/web-socket-js/* /usr/share/novnc/include/web-socket-js
|
|||
include/websock.js /usr/share/novnc/include
|
||||
include/webutil.js /usr/share/novnc/include
|
||||
utils/Makefile /usr/share/novnc/utils
|
||||
utils/launch.sh /usr/share/novnc/utils
|
||||
vnc.html /usr/share/novnc
|
||||
vnc_auto.html /usr/share/novnc
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
python-disutils.patch
|
||||
adds_support_for_secure_attribute_on_token_cookie.patch
|
||||
utils-launch.patch
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
Description: Changes call to websockify to use PATH
|
||||
Author: Simon Bazley <sibaz@sibaz.com>
|
||||
Forwarded: no
|
||||
|
||||
--- a/utils/launch.sh
|
||||
+++ b/utils/launch.sh
|
||||
@@ -28,6 +28,8 @@
|
||||
CERT=""
|
||||
WEB=""
|
||||
proxy_pid=""
|
||||
+#WEBSOCKIFY=${HERE}/websockify
|
||||
+WEBSOCKIFY=websockify
|
||||
|
||||
die() {
|
||||
echo "$*"
|
||||
@@ -102,7 +104,7 @@
|
||||
fi
|
||||
|
||||
echo "Starting webserver and WebSockets proxy on port ${PORT}"
|
||||
-${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
|
||||
+${WEBSOCKIFY} --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
|
||||
proxy_pid="$!"
|
||||
sleep 1
|
||||
if ! ps -p ${proxy_pid} >/dev/null; then
|
||||
|
|
@ -15,6 +15,6 @@ override_dh_clean:
|
|||
|
||||
override_dh_fixperms:
|
||||
dh_fixperms
|
||||
rm -rf $(CURDIR)/debian/novnc/usr/share/novnc/utils
|
||||
rm -rf $(CURDIR)/debian/novnc/usr/share/novnc/utils/Makefile
|
||||
rm -f $(CURDIR)/debian/novnc/usr/share/novnc/include/web-socket-js/swfobject.js
|
||||
ln -s ../../../javascript/swfobject/swfobject.js $(CURDIR)/debian/novnc/usr/share/novnc/include/web-socket-js/swfobject.js
|
||||
|
|
|
|||
Loading…
Reference in New Issue