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

[Guido Trotter]

The following commit has been merged in the master branch:
commit b50a4355a3047142b3138736bfff571b95888b67
Author: Guido Trotter <ultrotter at debian.org>
Date:   Mon Jul 1 13:14:09 2013 +0000

    Move out haskell binaries from the binary-all package
    
    Signed-off-by: Guido Trotter <ultrotter at debian.org>

diff --git a/debian/changelog b/debian/changelog
index 60de887..eb36d02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ ganeti (2.7.0~rc3-1) unstable; urgency=low
     script (Closes: #705005)
   * Update Xen recommends to be version-independent (Closes: #696133)
   * Remove outdated fix-no-kvm.patch
+  * Suggest ganeti-htools
+  * Split other haskell components in the ganeti-haskell package
 
  -- Guido Trotter <ultrotter at debian.org>  Fri, 28 Jun 2013 15:17:44 +0200
 
diff --git a/debian/control b/debian/control
index 9d12bdc..cedba0e 100644
--- a/debian/control
+++ b/debian/control
@@ -26,13 +26,13 @@ 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
+ socat, libjs-jquery, fping, ganeti-haskell
 Recommends: drbd8-utils (>= 8.0.7), qemu-kvm |
  xen-linux-system-amd64 | xen-linux-system-686 |
  xen-linux-system-686-pae, ganeti-instance-debootstrap,
  ndisc6
 Breaks: ganeti-htools (<< 0.3)
-Suggests: drbd8-module-source (>= 8.0.7)
+Suggests: drbd8-module-source (>= 8.0.7), ganeti-htools
 Provides: ${python:Provides}
 Description: Cluster-based virtualization management software
  Ganeti is a virtual server cluster management software tool built on top
@@ -49,6 +49,13 @@ Description: Cluster-based virtualization management software
  install scripts), startup, shutdown, failover of instances between physical
  systems.
 
+Package: ganeti-haskell
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Haskell components of Ganeti
+ These are the components of Ganeti written in Haskell. They are split in a
+ separate package as they are not architecture independent.
+
 Package: ganeti-htools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -62,3 +69,4 @@ Description: Cluster allocation tools for Ganeti
    - hbal, used to redistribute instances on the cluster
    - hspace, used for capacity calculation
    - hscan, used to gather cluster files for offline use in hbal/hspace
+   - hroller, used to calculate rolling maintenances
diff --git a/debian/ganeti-haskell.dirs b/debian/ganeti-haskell.dirs
new file mode 100644
index 0000000..39e3054
--- /dev/null
+++ b/debian/ganeti-haskell.dirs
@@ -0,0 +1,3 @@
+usr/sbin
+usr/lib/ganeti
+usr/share/man/man8
diff --git a/debian/rules b/debian/rules
index dff95fd..d008e55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@
 
 GANETI_DIR=$(CURDIR)/debian/ganeti2
 HTOOLS_DIR=$(CURDIR)/debian/ganeti-htools
+HASKELL_DIR=$(CURDIR)/debian/ganeti-haskell
 
 build: build-arch build-indep
 build-arch: build-stamp
@@ -84,6 +85,11 @@ install: build
 	done
 	rmdir $(GANETI_DIR)/usr/share/man/man1
 
+        # haskell package
+	mv $(GANETI_DIR)/usr/sbin/ganeti-confd $(HASKELL_DIR)/usr/sbin/
+	mv $(GANETI_DIR)/usr/lib/ganeti/mon-collector $(HASKELL_DIR)/usr/lib/ganeti/
+	mv $(GANETI_DIR)/usr/share/man/man8/ganeti-confd.8 $(HASKELL_DIR)/usr/share/man/man8/
+
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i

-- 
Ganeti packaging