[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.10.2-4-3-g99d7ed7

[Guido Günther]

The following commit has been merged in the experimental branch:
commit f3fdef3c5fa87d2f6a4f44e0773fd24f1ef7cfac
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Oct 13 21:58:54 2012 +0200

    Install systemtap tapsets on Linux

diff --git a/debian/control b/debian/control
index 23169c9..65bf7f5 100644
--- a/debian/control
+++ b/debian/control
@@ -36,6 +36,7 @@ Build-Depends: cdbs (>= 0.4.90~),
  libnetcf-dev [linux-any],
  libsanlock-dev [linux-any],
  libaudit-dev [linux-any],
+ systemtap-sdt-dev [linux-any],
 # for --with-storage-sheepdog
  sheepdog [linux-any],
 # For "make check"
@@ -70,7 +71,7 @@ Recommends: netcat-openbsd,
  iproute,
  parted,
  pm-utils
-Suggests: policykit-1, radvd, auditd
+Suggests: policykit-1, radvd, auditd, systemtap
 Description: programs for the libvirt library
  Libvirt is a C toolkit to interact with the virtualization capabilities
  of recent versions of Linux (and other OSes). The library aims at providing
diff --git a/debian/libvirt-bin.install b/debian/libvirt-bin.install
index a1ea30e..914cf93 100644
--- a/debian/libvirt-bin.install
+++ b/debian/libvirt-bin.install
@@ -9,3 +9,4 @@ usr/share/augeas/*
 usr/share/libvirt/*
 usr/share/man/man8/*
 lib/systemd/system
+usr/share/systemtap
diff --git a/debian/libvirt0.install b/debian/libvirt0.install
index 01277d8..8d3f215 100644
--- a/debian/libvirt0.install
+++ b/debian/libvirt0.install
@@ -1,3 +1,2 @@
 usr/lib/libvirt.so.*
 usr/lib/libvirt-qemu.so.*
-
diff --git a/debian/rules b/debian/rules
index 6d32857..0cf0f7e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
   WITH_SANLOCK        = --with-sanlock
   WITH_INIT_SCRIPT    =	--with-init-script=systemd
   WITH_AUDIT          = --with-audit
+  WITH_DTRACE         = --with-dtrace
   ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 i386 ia64 mips mipsel powerpc))
       WITH_NUMA       = --with-numactl
   else
@@ -58,6 +59,7 @@ else
   WITH_NETCF          = --without-netcf
   WITH_INIT_SCRIPT    =	--with-init-script=none
   WITH_AUDIT          = --without-audit
+  WITH_DTRACE         = --without-dtrace
 endif
 
 DEB_BUILDDIR := $(CURDIR)/debian/build
@@ -88,7 +90,8 @@ DEB_CONFIGURE_EXTRA_FLAGS :=     \
 	$(WITH_NETCF)		 \
 	$(WITH_XEN)		 \
 	$(WITH_VBOX)		 \
-	$(WITH_LXC)
+	$(WITH_LXC)              \
+	$(WITH_DTRACE)
 
 DEB_COMPRESS_EXCLUDE = .o event-test hellolibvirt info1 suspend
 DEB_PYTHON_SETUP_CMD = /dev/null

-- 
Libvirt Debian packaging