[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, bpo-squeeze, updated. debian/0.9.8-2_bpo60+1

Guido Günther agx at sigxcpu.org
Wed Jan 11 08:12:00 UTC 2012


The following commit has been merged in the bpo-squeeze branch:
commit fc4667ad62d15833df00ee6503ee98f22f8c1ec9
Merge: bb593f91b2366ec77b818613315ffbf438d40f20 19849f1ec716c811dc33b46ab20c30c00d6962a0
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Jan 10 16:14:31 2012 +0100

    Merge commit 'debian/0.9.8-2' into bpo-squeeze

diff --combined debian/changelog
index 64f9146,718155f..d559331
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,105 +1,112 @@@
+ libvirt (0.9.8-2) unstable; urgency=low
+ 
+   * Upload to unstable. Works with qemu-kvm and qemu 1.0.
+     (Closes: #652454)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sat, 17 Dec 2011 14:01:20 +0100
+ 
+ libvirt (0.9.8-1) experimental; urgency=low
+ 
+   * [8a35c97] New upstream version 0.9.8
+   * [52e19b5] Drop remote_driver-don-t-fail-if-keepalive-check-fails.patch
+     applied upstream.
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Thu, 08 Dec 2011 23:31:31 +0100
+ 
+ libvirt (0.9.8~rc2-2) experimental; urgency=low
+ 
+   * [e50aac4] remote_driver: don't fail if keepalive check fails. This fixes
+     remote connections to older libvirt versions.
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Mon, 05 Dec 2011 18:00:06 +0100
+ 
+ libvirt (0.9.8~rc2-1) experimental; urgency=low
+ 
+   * [9b1abb2] New upstream version 0.9.8~rc2
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sun, 04 Dec 2011 13:58:31 +0100
+ 
+ libvirt (0.9.8~rc1-1) experimental; urgency=low
+ 
+   * [99476ba] New upstream version 0.9.8~rc1
+   * [3bdcf07] Make radvd a linux-any build-dep (Closes: #649635)
+   * [7546785] Drop patch storage-forbid-rebuilding-existing-disk-storage-pool
+     applied upstream.
+   * [0c2afdb] Rediff remaining patches
+   * [3d121b2] Update symbols file
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sat, 03 Dec 2011 14:49:49 +0100
+ 
+ libvirt (0.9.7-2) unstable; urgency=low
+ 
+   * [b0bdb13] Enable numa support. (Closes: #648323)
+     Thanks to Ralf Spenneberg for testing
+   * [5b55828] Disk storage: forbid rebuilding existing disk storage pools
+     wiping all it's data.
+   * [d77511c] Build depend on radvd (Closes: #648551)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sat, 12 Nov 2011 23:16:21 +0100
+ 
+ libvirt (0.9.7-1) experimental; urgency=low
+ 
+   * [c06e393] debian/watch: match releases and release candidates
+   * [2d08768] New upstream version 0.9.7
+   * [a260f43] Add empty hooks dir (Closes: #623996)
+   * [0b10e48] Install logrotate files again. This got broken by moving to
+     separate build-dir. Based on a patch from Serge Hallyn. (Closes: #647953)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Thu, 10 Nov 2011 19:11:02 +0100
+ 
+ libvirt (0.9.7~rc2-1) experimental; urgency=low
+ 
+   * [2d51700] New upstream version 0.9.7~rc2
+   * [bae02ad] Drop patches, now fixed upstream.
+       - Fix-storage-pool-source-comparison-to-avoid-comparin.patch
+       - Skip-socket-test-if-we-exceed-UNIX_PATH_MAX.patch
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Thu, 03 Nov 2011 18:59:03 +0100
+ 
+ libvirt (0.9.7~rc1-2) experimental; urgency=low
+ 
+   * [c0292f7] Skip socket test if we exceed UNIX_PATH_MAX.
+   * [764a29c] Fix storage pool source comparison to avoid comparing with self
+     Thanks to Daniel P. Berrange
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Wed, 02 Nov 2011 19:07:51 +0100
+ 
+ libvirt (0.9.7~rc1-1) experimental; urgency=low
+ 
+   * [6dba3c4] New upstream version 0.9.7~rc1
+   * [456c4b7] Update symbols file
+   * [a5b6513] debian/watch: allow for '-' in the version number so we also
+     catch the release candidates.
+   * [a5d0318] Drop Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
+     fixed upstream.
+   * [fb8aed9] Update remaining patches
+   * [1f841c0] Move Debian specific patches to debian/patches/debian
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Wed, 02 Nov 2011 10:04:40 +0100
+ 
+ libvirt (0.9.6-2) unstable; urgency=low
+ 
+   * [6e5ad9d] Install libvirtd manpage. Thanks to Serge E. Hallyn
+     (Closes: #644457, #606069)
+   * [480ef36] Remove now superfluous build-dep on QEMU
+   * [86140cf] python-libvirt: Recommend libvirt-bin (Closes: #646440)
+   * [a76d37f] Build-depend and Recommend: parted since it's needed for disk
+     storage pool creation (found by libvirt-tck)
+   * [2e7bee9] Remove workaround for m68k ICE fixed in gcc-4.6 upstream and
+     Debian's gcc-4.4. Thanks to Thorsten Glaser
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sun, 30 Oct 2011 17:14:21 +0100
+ 
 +libvirt (0.9.6-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * [82758c4] Use dh_pycentral on Squeeze since there's no dh_python2 yet.
 +
 + -- Guido Günther <agx at sigxcpu.org>  Tue, 04 Oct 2011 14:57:07 +0200
 +
  libvirt (0.9.6-1) unstable; urgency=low
  
    * [828e4e3] New upstream version 0.9.6
@@@ -107,21 -202,6 +209,21 @@@ libvirt (0.9.3-1) experimental; urgency
  
   -- Guido Günther <agx at sigxcpu.org>  Sun, 10 Jul 2011 19:43:05 +0200
  
 +libvirt (0.9.2-7~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Remaining changes
 +      * use python-central on squeeze
 +
 + -- Guido Günther <agx at sigxcpu.org>  Thu, 14 Jul 2011 18:43:41 +0200
 +
 +libvirt (0.9.2-7) unstable; urgency=low
 +
 +  * [9c99f46] CVE-2011-2511: Fix integer overflow in VirDomainGetVcpus. Patch
 +    taken verbatim from upstream's git. (Closes: #633630)
 +
 + -- Guido Günther <agx at sigxcpu.org>  Tue, 12 Jul 2011 15:07:39 +0200
 +
  libvirt (0.9.2-6) unstable; urgency=low
  
    * [b385504] Disable the testsuite on all architectures except i386 and amd64
@@@ -201,14 -281,6 +303,14 @@@ libvirt (0.9.0-2) unstable; urgency=lo
  
   -- Guido Günther <agx at sigxcpu.org>  Mon, 09 May 2011 17:14:02 +0200
  
 +libvirt (0.9.0-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * [82758c4] Use dh_pycentral on Squeeze
 +    since there's no dh_python2 yet.
 +
 + -- Guido Günther <agx at sigxcpu.org>  Mon, 09 May 2011 18:41:55 +0200
 +
  libvirt (0.9.0-1) unstable; urgency=low
  
    * [a91c8f6] New upstream version 0.9.0
diff --combined debian/control
index e85b74e,b7397f2..35ef059
--- a/debian/control
+++ b/debian/control
@@@ -3,8 -3,7 +3,8 @@@ Section: lib
  Priority: optional
  Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
  Uploaders: Guido Günther <agx at sigxcpu.org>, Laurent Léonard <laurent at open-minds.org>
 -Build-Depends: cdbs (>= 0.4.90~),
 +Build-Depends: cdbs (>= 0.4.89~),
 + python-central,
   debhelper (>= 7),
   libxml2-dev,
   libncurses5-dev,
@@@ -16,9 -15,9 +16,9 @@@
   libsasl2-dev,
   libxen-dev [i386 amd64],
   lvm2 [linux-any],
-  qemu [amd64 i386 powerpc sparc],
   open-iscsi [linux-any],
   libparted0-dev (>= 2.2),
+  parted (>= 2.2),
   libdevmapper-dev [linux-any],
   uuid-dev,
   libudev-dev [linux-any],
@@@ -31,6 -30,8 +31,8 @@@
   libnl-dev [linux-any],
   libyajl-dev,
   libpcap0.8-dev,
+  libnuma-dev [amd64 i386 ia64 mips mipsel powerpc],
+  radvd [linux-any],
  # For "make check"
   libxml2-utils,
   dnsmasq-base,
@@@ -42,7 -43,7 +44,7 @@@ Vcs-Browser: http://git.debian.org/?p=p
  Homepage: http://libvirt.org
  Standards-Version: 3.9.2
  DM-Upload-Allowed: yes
 -X-Python-Version: >= 2.6
 +XS-Python-Version: >= 2.6
  
  Package: libvirt-bin
  Architecture: any
@@@ -58,7 -59,8 +60,8 @@@ Recommends: netcat-openbsd
   gawk,
   ebtables,
   dmidecode,
-  iproute
+  iproute,
+  parted
  Suggests: policykit-1, radvd
  Description: programs for the libvirt library
   Libvirt is a C toolkit to interact with the virtualization capabilities
@@@ -122,8 -124,8 +125,9 @@@ Package: python-libvir
  Architecture: any
  Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvirt0 (>= ${binary:Version})
  Provides: ${python:Provides}
+ Recommends: libvirt-bin
  Section: python
 +XB-Python-Version: ${python:Versions}
  Description: libvirt Python bindings
   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 --combined debian/rules
index 2c358f9,4b4f87e..70d7b42
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,5 +1,6 @@@
  #!/usr/bin/make -f
  
 +DEB_PYTHON_SYSTEM = pycentral
  DEB_BUILD_PARALLEL = yes
  export VIR_TEST_DEBUG=1
  
@@@ -28,6 -27,11 +28,11 @@@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS
    WITH_NETWORK        = --with-network
    WITH_QEMU           = --with-qemu
    WITH_OPENVZ         = --with-openvz
+   ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 i386 ia64 mips mipsel powerpc))
+       WITH_NUMA       = --with-numactl
+   else
+       WITH_NUMA       = --without-numactl
+   endif
    ifneq (,$(findstring $(DEB_HOST_ARCH), ia64))
        WITH_LXC        = --without-lxc
    else
@@@ -44,10 -48,7 +49,7 @@@ els
    WITH_NETWORK        = --without-network
    WITH_QEMU           = --without-qemu
    WITH_LXC            = --without-lxc
- endif
- 
- ifneq (,$(findstring ${DEB_BUILD_ARCH}, m68k))
- 	CFLAGS = -fwrapv -DWRAPV
+   WITH_NUMA           = --without-numactl
  endif
  
  DEB_BUILDDIR := $(CURDIR)/debian/build
@@@ -67,7 -68,7 +69,7 @@@ DEB_CONFIGURE_EXTRA_FLAGS :=     
  	$(WITH_STORAGE_ISCSI)	 \
  	$(WITH_STORAGE_DISK)	 \
  	--with-init-script=none  \
- 	--without-numactl	 \
+ 	$(WITH_NUMA)             \
  	--without-selinux        \
  	--without-esx		 \
  	--without-libssh2	 \
@@@ -97,7 -98,7 +99,7 @@@ binary-install/libvirt-bin:
  	dh_installinit --name=libvirt-guests --no-restart-on-upgrade -- defaults 29 71
  
  	for l in $(LOGROTATE); do \
- 		cp $(CURDIR)/daemon/$$l.logrotate    \
+ 		cp $(CURDIR)/debian/build/daemon/$$l.logrotate \
                     debian/libvirt-bin.$$l.logrotate; \
  		dh_installlogrotate --name=$$l;     \
  	done

-- 
Libvirt Debian packaging



More information about the Pkg-libvirt-commits mailing list