add our own debian files

diff --git a/Makefile b/Makefile
index 1d6ff76f4f6f60a6ddfb5e201c3b81bb7671fffa..a59660bc431a9c46a8e63aa5e6e843b36e4f84ef 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,16 @@
 RELEASE=3.2
 
+PACKAGE=novnc-pve
+PKGREL=1
+
 NOVNCDIR=novnc
 NOVNCSRC=${NOVNCDIR}.tgz
+NOVNCVER=0.4
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
+DEB=${PACKAGE}_${NOVNCVER}-${PKGREL}_${ARCH}.deb
+
 all: deb
 
 .PHONY: dinstall
@@ -15,7 +21,10 @@ dinstall: deb
 deb ${DEB}: ${TARSRC}
        rm -rf ${NOVNCDIR}
        tar xf ${NOVNCSRC}
+       mv ${NOVNCDIR}/debian ${NOVNCDIR}/debian.org
+       cp -a debian ${NOVNCDIR}/debian 
        cd ${NOVNCDIR}; dpkg-buildpackage -b -uc -us
+       lintian ${DEB}
 
 .PHONY: download
 download:
@@ -25,4 +34,4 @@ download:
 
 .PHONY: clean
 clean:
-       rm -rf *~ *_${ARCH}.deb *_all.deb *.changes *.dsc novnc 
+       rm -rf *~ debian/*~ *_${ARCH}.deb *_all.deb *.changes *.dsc novnc 

diff --git a/debian/changelog b/debian/changelog
new file mode 100644 (file)
index 0000000..662d343
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,6 @@
+novnc-pve (0.4-1) unstable; urgency=low
+
+  * create specialized package for Proxmox VE. We use our own package because 
+    upstream novnc package depends on OpenStack.
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 13 Jun 2014 08:35:06 +0200

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7

diff --git a/debian/control b/debian/control
new file mode 100644 (file)
index 0000000..dcdc225
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,14 @@
+Source: novnc-pve
+Section: web
+Priority: optional
+Maintainer: Proxmox Support Team <support@proxmox.com>
+Build-Depends: debhelper (>= 7.0.0~)
+Standards-Version: 3.8.3
+Homepage: https://github.com/kanaka/noVNC/
+
+Package: novnc-pve
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python (>= 2.4)
+Description: HTML5 VNC client
+ VNC client using HTML5 (WebSockets, Canvas). This packet is use by 
+ Proxmox VE to provide HTML VM console. 

diff --git a/debian/copyright b/debian/copyright
new file mode 100644 (file)
index 0000000..db00fa1
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,37 @@
+Upstream Project: https://github.com/kanaka/noVNC/
+
+--------------------- Original LICENSE.txt ---------------------------
+
+noVNC is Copyright (C) 2012 Joel Martin <github@martintribe.org>
+
+Some portions of noVNC are copyright to their individual authors.
+Please refer to the individual source files and/or to the noVNC commit
+history: https://github.com/kanaka/noVNC/commits/master
+
+noVNC is licensed under the MPL 2.0 (Mozilla Public License) with the
+following exceptions:
+
+    *.html, *.css              : 2-Clause BSD license
+
+    include/Orbitron*          : SIL Open Font License 1.1
+                                 (Copyright 2009 Matt McInerney)
+
+    images/                    : Creative Commons Attribution-ShareAlike
+                                 http://creativecommons.org/licenses/by-sa/3.0/
+
+    include/base64.js          : MPL 2.0
+   
+    include/des.js             : Various BSD style licenses
+
+    include/jsunzip.js         : zlib/libpng license
+
+    include/web-socket-js/     : New BSD license (3-clause). Source code at
+                                 http://github.com/gimite/web-socket-js
+
+    include/chrome-app/tcp-stream.js
+                               : Apache 2.0 license
+
+----------------------------------------------------------------------
+
+The MPL-2.0 license text may be found here:
+    http://www.mozilla.org/MPL/2.0/

diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..443a0a4
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+README.md
+LICENSE.txt

diff --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..3e24112
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,25 @@
+vnc.html               /usr/share/novnc-pve
+vnc_auto.html          /usr/share/novnc-pve
+utils/launch.sh        /usr/share/novnc-pve/utils
+utils/websocket.py     /usr/share/novnc-pve/utils
+utils/websockify       /usr/share/novnc-pve/utils
+utils/rebind.so        /usr/lib/novnc-pve/utils
+images                 /usr/share/novnc-pve
+include/base64.js      /usr/share/novnc-pve/include
+include/des.js         /usr/share/novnc-pve/include
+include/display.js     /usr/share/novnc-pve/include
+include/keysymdef.js           /usr/share/novnc-pve/include
+include/keyboard.js    /usr/share/novnc-pve/include
+include/input.js       /usr/share/novnc-pve/include
+include/logo.js        /usr/share/novnc-pve/include
+include/base.css       /usr/share/novnc-pve/include
+include/blue.css       /usr/share/novnc-pve/include
+include/black.css      /usr/share/novnc-pve/include
+include/playback.js    /usr/share/novnc-pve/include
+include/rfb.js         /usr/share/novnc-pve/include
+include/ui.js          /usr/share/novnc-pve/include
+include/util.js        /usr/share/novnc-pve/include
+include/websock.js     /usr/share/novnc-pve/include
+include/webutil.js     /usr/share/novnc-pve/include
+include/jsunzip.js     /usr/share/novnc-pve/include
+include/web-socket-js/* /usr/share/novnc-pve/include/web-socket-js

diff --git a/debian/rules b/debian/rules
new file mode 100755 (executable)
index 0000000..915f1dc
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export DEB_BUILD_HARDENING=1
+
+clean:
+       make -C utils clean
+       dh clean
+
+build:
+       make -C utils rebind.so
+
+%:
+       dh ${@}