[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.3.1-1-7-gf9d7f59

[Iustin Pop]

The following commit has been merged in the master branch:
commit 617d908a604a35d967d61676d46ed749b8766464
Author: Iustin Pop <iustin at debian.org>
Date:   Thu Mar 10 20:33:53 2011 +0100

    Update control and rules for the new version

diff --git a/debian/control b/debian/control
index 5a55c85..f3cc565 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2,
 Recommends: drbd8-utils (>= 8.0.7), qemu-kvm |
  xen-linux-system-2.6.32-5-xen-amd64 | xen-linux-system-2.6.32-5-xen-686,
  ganeti-instance-debootstrap, ndisc6
+Breaks: ganeti-htools (<< 0.3)
 Suggests: drbd8-module-source (>= 8.0.7)
 Provides: ${python:Provides}
 Description: Cluster-based virtualization management software
diff --git a/debian/ganeti2.overrides b/debian/ganeti2.overrides
index 07d65d6..4c923c5 100644
--- a/debian/ganeti2.overrides
+++ b/debian/ganeti2.overrides
@@ -1 +1,2 @@
 ganeti2 binary: hyphen-used-as-minus-sign
+ganeti2 binary: package-contains-empty-directory usr/lib/ganeti/iallocators/
diff --git a/debian/rules b/debian/rules
index 016ad43..228c8a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,8 +54,6 @@ install: build
 	cp $(CURDIR)/doc/examples/ganeti.default $(CURDIR)/debian/ganeti2.ganeti.default
 	# No longer needed with ganeti 2.1
 	#mv $(CURDIR)/debian/ganeti2/usr/share/doc/ganeti $(CURDIR)/debian/ganeti2/usr/share/doc/ganeti2
-	install -m 0755 $(CURDIR)/doc/examples/dumb-allocator \
-	  $(CURDIR)/debian/ganeti2/usr/lib/ganeti/iallocators/dumb
 	install -m 0644 $(CURDIR)/doc/examples/bash_completion \
 	  $(CURDIR)/debian/ganeti2/etc/bash_completion.d/ganeti
 	install -m 0644 $(CURDIR)/debian/ganeti2.overrides \

-- 
Ganeti packaging