[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.0.6-2-20-g7fef725

[Iustin Pop]

The following commit has been merged in the master branch:
commit 61ff0352db22ddf7974e7191133a2604465989d5
Author: Iustin Pop <iustin at debian.org>
Date:   Sat Apr 17 18:58:13 2010 +0200

    Replace embedded jquery with external dependency

diff --git a/debian/control b/debian/control
index 9cd8697..a3b0492 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Git: git://git.debian.org/pkg-ganeti/ganeti.git
 Package: ganeti2
 Architecture: all
 Conflicts: ganeti
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2, openssh-client, openssh-server, bridge-utils, iproute, iputils-arping, openssl, python-simplejson, python-pyparsing, python-openssl, socat
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2, openssh-client, openssh-server, bridge-utils, iproute, iputils-arping, openssl, python-simplejson, python-pyparsing, python-openssl, socat, libjs-jquery
 Recommends: drbd8-utils (>= 8.0.7), kvm | xen-linux-system-2.6.26-2-xen-amd64 | xen-linux-system-2.6.26-2-xen-686, ganeti-instance-debootstrap
 Suggests: drbd8-module-source (>= 8.0.7)
 Provides: ${python:Provides}
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..ca43e7c
--- /dev/null
+++ b/debian/links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/ganeti2/html/_static/jquery.js
diff --git a/debian/rules b/debian/rules
index b5c034a..f98f255 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,6 +57,9 @@ install: build
 	install -m 0644 $(CURDIR)/debian/ganeti2.overrides \
 	  $(CURDIR)/debian/ganeti2/usr/share/lintian/overrides/ganeti2
 
+	# remove embedded copy of jquery
+	rm -f $(CURDIR)/debian/ganeti2/usr/share/doc/ganeti2/html/_static/jsquery.js
+
 	rmdir debian/ganeti2/var/run/ganeti
 	rmdir debian/ganeti2/var/run
 

-- 
Ganeti packaging