[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.7.5-1

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 7a13da497eb1c19db3a76b76a70d515223cad7a7
Merge: 3e715d2328c3253a15aa9a7c7d061784b724e243 5635a32908fba41183a4ee0018aa0318261455a3
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Dec 26 17:20:11 2009 +0100

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/control

diff --combined debian/control
index 4711fc9,a6c673a..94a8683
--- a/debian/control
+++ b/debian/control
@@@ -2,11 -2,8 +2,11 @@@ Source: libvir
  Section: libs
  Priority: optional
  Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
- Uploaders: Guido Günther <agx at sigxcpu.org>
+ Uploaders: Guido Günther <agx at sigxcpu.org>, Laurent Léonard <laurent at open-minds.org>
 -Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7), libxml2-dev, libncurses5-dev, libreadline-dev, zlib1g-dev, libgnutls-dev, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), quilt, libavahi-client-dev, libsasl2-dev, libxen-dev [i386 amd64], lvm2, qemu [amd64 i386 powerpc sparc], open-iscsi, libparted1.8-dev, libselinux1-dev, libdevmapper-dev, uuid-dev, libhal-dev, module-init-tools,
 +Build-Depends: cdbs (>= 0.4.43), debhelper (>= 7), libxml2-dev, libncurses5-dev, libreadline-dev, zlib1g-dev, libgnutls-dev, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), quilt, libavahi-client-dev, libsasl2-dev, libxen-dev [i386 amd64], lvm2, qemu [amd64 i386 powerpc sparc], open-iscsi, libparted1.8-dev, libdevmapper-dev, uuid-dev,
 + libudev-dev,
 + libpciaccess-dev,
 + module-init-tools,
   policykit-1,
   dpkg-dev (<< 1.15.3) | dpkg-dev (>> 1.15.3),
   libcap-ng-dev
@@@ -16,6 -13,7 +16,7 @@@ Vcs-Git: git://git.debian.org/git/pkg-l
  Vcs-Browser: http://git.debian.org/?p=pkg-libvirt/libvirt.git
  Homepage: http://libvirt.org
  Standards-Version: 3.8.3
+ DM-Upload-Allowed: yes
  
  Package: libvirt-bin
  Architecture: any

-- 
Libvirt Debian packaging