[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.7.2-4-5-gf184e28

Laurent Léonard laurent at open-minds.org
Sun Nov 29 18:37:59 UTC 2009


The following commit has been merged in the master branch:
commit f184e28421ee531d118cbd80558be6d35417eb21
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Sun Nov 29 19:37:06 2009 +0100

    Revert "switch to new source format 3.0 (quilt)"
    
    This reverts commit 213ca47bbbefe2dc95be58a09db34669e3be5797.
    
    Conflicts:
    
    	debian/control

diff --git a/debian/control b/debian/control
index ebf2d58..b896436 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: optional
 Maintainer: Debian Libvirt Maintainers <pkg-libvirt-maintainers at lists.alioth.debian.org>
 Uploaders: Guido Günther <agx at sigxcpu.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), 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, libselinux1-dev, libdevmapper-dev, uuid-dev, libhal-dev, module-init-tools,
  policykit-1,
  dpkg-dev (<< 1.15.3) | dpkg-dev (>> 1.15.3),
  libcap-ng-dev
diff --git a/debian/rules b/debian/rules
index e0fd9fa..4ae8ebd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,7 @@ 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
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS :=     \
 	--disable-rpath          \
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)

-- 
Libvirt Debian packaging



More information about the Pkg-libvirt-commits mailing list