[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, bpo-squeeze, updated. debian/0.9.6-1-7-gbb593f9

Guido Günther agx at sigxcpu.org
Tue Oct 4 20:29:16 UTC 2011 

The following commit has been merged in the bpo-squeeze branch:
commit 6c163ba439f33754565b4cb045e7be9f98b0f361
Merge: 7bdd4c25c8d8a9c07adca0dac227c58e36d6ba3c 0902e141ae14e7f1595d699cb869f182b3c29a95
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Oct 4 13:12:14 2011 +0200

    Merge commit 'debian/0.9.6-1' into bpo-squeeze

diff --combined debian/changelog
index 15fe93e,ba3e27c..d310028
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,105 +1,120 @@@
+ libvirt (0.9.6-1) unstable; urgency=low
+ 
+   * [828e4e3] New upstream version 0.9.6
+   * [59404f4] Use versioned X-Python-Version
+   * [0b43f12] Update symbols file
+   * [744aaeb] Drop Readd-LFS-support.patch - fixed upstream
+   * [f759960] Rediff remaining patches
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Mon, 26 Sep 2011 23:28:03 +0200
+ 
+ libvirt (0.9.4-2) unstable; urgency=low
+ 
+   [ Philipp Hahn ]
+   * [c9a080d] Build python-libvirt for all python versions (Closes: #628828)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Tue, 23 Aug 2011 21:17:55 +0200
+ 
+ libvirt (0.9.4-1) experimental; urgency=low
+ 
+   * [a92d03e] New upstream version 0.9.4
+   * [76f0333] Run tests verbosely to ease error diagnostics
+   * [f4e7d0b] Work around ICE on m68k.
+     Thanks to Thorsten Glaser
+   * [ac6e760] Add directories chown'ed in the postinst.
+     Thanks to Houmehr Aghabozorgi for the report (Closes: #636965)
+   * [194722a] Simplify netcat probe and adjust testcase output to reduce
+     number of failing testcases.
+   * [05e5a06] Use libyajl QEMU JSON support
+   * [e7934f7] Use libpcap for ip address learning support
+   * [6661730] Readd LFS support
+   * [17d831b] Don't require gawk for a simple print expression
+     (Closes: #636712)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Tue, 09 Aug 2011 16:41:24 +0200
+ 
+ libvirt (0.9.4~rc1-1) experimental; urgency=low
+ 
+   * [0e60a81] New upstream version 0.9.4~rc1
+   * [db6dbcc] Suggest radvd needed for IPv6
+   * [a9b77e5] Drop Catch-dnsmasq-start-failures.patch applied upstream
+   * [b18ac26] Rediff remaining patches
+   * [8ee8750] Update symbols
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Tue, 26 Jul 2011 13:12:57 +0200
+ 
+ libvirt (0.9.3-5) unstable; urgency=low
+ 
+   * [44874f6] Add directories chown'ed in the postinst.  Thanks to Houmehr
+     Aghabozorgi for the report (Closes: #636965)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Thu, 11 Aug 2011 08:19:38 +0200
+ 
+ libvirt (0.9.3-4) unstable; urgency=low
+ 
+   * [db6dbcc] Suggest radvd needed for IPv6
+   * [32ac1cf] Work around ICE on m68k. Thanks to Thorsten Glaser.
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Wed, 27 Jul 2011 21:26:02 +0200
+ 
+ libvirt (0.9.3-3) unstable; urgency=low
+ 
+   * [6db6929] Catch dnsmasq start failures
+   * [0254bfb] Add empty log directories to make logrotate happy
+     (Closes: #635239)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sun, 24 Jul 2011 10:51:58 +0200
+ 
+ libvirt (0.9.3-2) unstable; urgency=low
+ 
+   * Upload to unstable
+   * [331afb8] Move build rules to make sure DEB_BUILD_ARCH_OS is properly
+     defined.
+     Thanks to Serge E. Hallyn
+   * [4f3fe1d] Adjust directory permissions to what upstream uses to avoid
+     potential information leakage.
+     (Closes: #632332)
+   * [ab7ad05] Add sanlock dir
+   * [bc05a9d] Logrotate logs from HVs other than qemu too
+     (Closes: #625746)
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Sat, 23 Jul 2011 15:28:10 +0200
+ 
+ libvirt (0.9.3-1) experimental; urgency=low
+ 
+   * [320f8b6] New upstream version 0.9.3 (Closes: #633840)
+   * [fff5144] Update symbols
+   * [787d91c] Depend on dnsmasq-base, netcat-openbsd and openssh-client for
+     "make check"
+   * [1fa64b0] Remove article from libvirt-bin description to make lintian
+     happy.
+   * [3689fc5] Drop patches applied upstream:
+     - Skip-nodeinfo-test-on-non-intel-architectures.patch
+     - Split-out-dlopen-detection.patch
+     - nodeinfo-remove-superfluous-braces.patch
+   * [31b17c8] Drop Update-generated-autoconf-files.patch. No need to
+     regenerate autoconf for 0.9.3
+   * [65871eb] Adjust nc autodetect patch to new socket code
+   * [7b0c6df] Disable failing virnetsockettest until investigated further
+   * [248bc3f] Rediff remaining patches
+ 
+  -- 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
@@@ -92,14 -179,6 +194,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 58a5b81,6c7419b..8866309
--- a/debian/control
+++ b/debian/control
@@@ -3,15 -3,14 +3,15 @@@ 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,
   libreadline-dev,
   zlib1g-dev,
   libgnutls-dev,
-  python-dev (>= 2.6.6-3~),
+  python-all-dev (>= 2.6.6-3~),
   libavahi-client-dev,
   libsasl2-dev,
   libxen-dev [i386 amd64],
@@@ -29,16 -28,20 +29,20 @@@
   libcap-ng-dev [linux-any],
   virtualbox-ose [amd64 i386],
   libnl-dev [linux-any],
+  libyajl-dev,
+  libpcap0.8-dev,
  # For "make check"
   libxml2-utils,
- XS-Python-Version: current
+  dnsmasq-base,
+  openssh-client,
+  netcat-openbsd,
  Build-Conflicts: dpkg-dev (= 1.15.3)
  Vcs-Git: git://git.debian.org/git/pkg-libvirt/libvirt.git
  Vcs-Browser: http://git.debian.org/?p=pkg-libvirt/libvirt.git
  Homepage: http://libvirt.org
  Standards-Version: 3.9.2
  DM-Upload-Allowed: yes
- X-Python-Version: 2.6
+ X-Python-Version: >= 2.6
  
  Package: libvirt-bin
  Architecture: any
@@@ -55,8 -58,8 +59,8 @@@ Recommends: netcat-openbsd
   ebtables,
   dmidecode,
   iproute
- Suggests: policykit-1
- Description: the programs for the libvirt library
+ Suggests: policykit-1, radvd
+ 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
   a long term stable C API for different virtualization mechanisms. It currently
@@@ -119,7 -122,6 +123,7 @@@ Architecture: an
  Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, libvirt0 (>= ${binary:Version})
  Provides: ${python:Provides}
  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 55b73f6,b4fba08..2c358f9
--- a/debian/rules
+++ b/debian/rules
@@@ -1,7 -1,11 +1,12 @@@
  #!/usr/bin/make -f
  
 +DEB_PYTHON_SYSTEM = pycentral
  DEB_BUILD_PARALLEL = yes
+ export VIR_TEST_DEBUG=1
+ 
+ include /usr/share/cdbs/1/rules/debhelper.mk
+ include /usr/share/cdbs/1/class/autotools.mk
+ include /usr/share/cdbs/1/class/python-distutils.mk
  
  ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
    DEB_MAKE_CHECK_TARGET = check
@@@ -41,10 -45,11 +46,11 @@@ els
    WITH_LXC            = --without-lxc
  endif
  
- include /usr/share/cdbs/1/rules/debhelper.mk
- include /usr/share/cdbs/1/class/autotools.mk
- include /usr/share/cdbs/1/class/python-distutils.mk
+ ifneq (,$(findstring ${DEB_BUILD_ARCH}, m68k))
+ 	CFLAGS = -fwrapv -DWRAPV
+ endif
  
+ DEB_BUILDDIR := $(CURDIR)/debian/build
  DEB_CONFIGURE_EXTRA_FLAGS :=     \
  	--disable-rpath          \
  	$(WITH_QEMU)		 \
@@@ -53,6 -58,7 +59,7 @@@
          $(WITH_OPENVZ)		 \
  	--with-avahi             \
  	--with-sasl              \
+ 	--with-yajl              \
  	$(WITH_POLKIT)		 \
  	$(WITH_UDEV)		 \
  	--with-storage-fs        \
@@@ -77,19 -83,29 +84,29 @@@ DEB_COMPRESS_EXCLUDE = .o event-test he
  DEB_PYTHON_SETUP_CMD = /dev/null
  DEB_DH_MAKESHLIBS_ARGS_libvirt0 += -V 'libvirt0 (>= 0.5.0)'
  DEB_DH_INSTALLINIT_ARGS = --no-restart-on-upgrade -- defaults 28 72
- DEB_DH_INSTALLLOGROTATE_ARGS = --name=libvirtd
+ DEB_PYTHON_MODULE_PACKAGE = python-libvirt
  
+ LOGROTATE = $(basename $(basename $(notdir $(wildcard daemon/libvirtd*.logrotate.in))))
  EXAMPLES_DIR = $(CURDIR)/debian/libvirt-doc/usr/share/doc/libvirt-doc/examples/
  
+ include debian/python.mk
+ 
  binary-install/libvirt-bin::
  	cp $(CURDIR)/tools/libvirt-guests.init.sh $(CURDIR)/debian/libvirt-bin.libvirt-guests.init
  	cp $(CURDIR)/tools/libvirt-guests.sysconf $(CURDIR)/debian/libvirt-bin.libvirt-guests.default
  	dh_installinit --name=libvirt-guests --no-restart-on-upgrade -- defaults 29 71
  
+ 	for l in $(LOGROTATE); do \
+ 		cp $(CURDIR)/daemon/$$l.logrotate    \
+                    debian/libvirt-bin.$$l.logrotate; \
+ 		dh_installlogrotate --name=$$l;     \
+ 	done
+ 
  build/libvirt-bin::
  	# Add empty dir so dh_install doesn't fail on kFreebsd until we have Polkit support
  	mkdir -p debian/tmp/usr/share/polkit-1
  
+ 
  binary-install/libvirt-doc::
  	find $(EXAMPLES_DIR) -name "*.o" -type f -delete -o -name .libs -type d -exec rm -rf {} \;
  	rm -f $(EXAMPLES_DIR)domain-events/events-c/event-test
@@@ -100,3 -116,5 +117,5 @@@
  clean::
  	rm -f $(CURDIR)/debian/libvirt-bin.libvirt-guests.init
  	rm -f $(CURDIR)/debian/libvirt-bin.libvirt-guests.default
+ 	rm -f $(CURDIR)/debian/libvirt-bin.*.logrotate
+ 	rm -rf $(DEB_BUILDDIR)

-- 
Libvirt Debian packaging

More information about the Pkg-libvirt-commits mailing list