[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.6.2-2-19-g78a6e96

[Apollon Oikonomopoulos]

The following commit has been merged in the master branch:
commit 78a6e9604ba3f81c88f4e15b37fe0d52234aea30
Author: Apollon Oikonomopoulos <apollon at skroutz.gr>
Date:   Fri Jul 12 16:59:15 2013 +0300

    Do not ship underscore.js
    
    … instead depend on libjs-underscore and use the Debian version.

diff --git a/debian/control b/debian/control
index 193d074..8299252 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2,
  openssh-client, openssh-server, bridge-utils, iproute, iputils-arping,
  openssl, python-simplejson, python-pyparsing, python-openssl,
  python-pyinotify, python-pycurl, python-paramiko,
- socat, libjs-jquery, fping, ganeti-haskell
+ socat, libjs-jquery, fping, ganeti-haskell, libjs-underscore
 Recommends: drbd8-utils (>= 8.0.7), qemu-kvm |
  xen-linux-system-amd64 | xen-linux-system-686 |
  xen-linux-system-686-pae, ganeti-instance-debootstrap,
diff --git a/debian/links b/debian/links
index ca43e7c..52ae860 100644
--- a/debian/links
+++ b/debian/links
@@ -1 +1,2 @@
 usr/share/javascript/jquery/jquery.js usr/share/doc/ganeti2/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.js usr/share/doc/ganeti2/html/_static/underscore.js

-- 
Ganeti packaging