[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.9.12-2

[Guido Günther]

The following commit has been merged in the master branch:
commit 1efc3040c9649f0fe64f847039616a787fb7e5f3
Merge: 77bd1263d796558e256d7d984288ad64ec5e8fe4 9515e285f3a350b1df3668ac3c66c9d39245ca99
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Jun 14 19:28:21 2012 +0200

    Merge experimental to master

diff --combined debian/changelog
index a0e4926,7d3c5bb..11d6eb2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,20 +1,29 @@@
+ libvirt (0.9.12-1) experimental; urgency=low
+ 
+   * [75e280b] New upstream version 0.9.12
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Tue, 15 May 2012 14:31:26 +0200
+ 
+ libvirt (0.9.12~rc2-1) experimental; urgency=low
+ 
+   * [721a2d8] New upstream version 0.9.12~rc2
+   * [a469ff6] Update symbols
+   * [a483028] Daemon tests changed so update the patches
+   * [fbd9c12] Drop virURIParse-don-t-forget-to-copy-the-user-part applied
+     upstream
+   * [00931ed] Update gbp.conf for experimental
+ 
+  -- Guido Günther <agx at sigxcpu.org>  Mon, 14 May 2012 08:43:49 +0200
+ 
 +libvirt (0.9.11.3-1) unstable; urgency=low
 +
 +  * [f254551] New upstream version 0.9.11.3
 +  * [5362229] Drop virURIParse-don-t-forget-to-copy-the-user-part.patch.
 +    Fixed upstream.
 +  * [36ed9f0] Update symbols file
 +
 + -- Guido Günther <agx at sigxcpu.org>  Mon, 30 Apr 2012 09:44:51 +0200
 +
  libvirt (0.9.11-2) unstable; urgency=low
  
    * [70dcb2e] Make module-init-tools a linux-any dependency
diff --combined debian/gbp.conf
index 0b62a62,f3196e3..c97ab1d
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,2 -1,6 +1,6 @@@
+ [DEFAULT]
 -upstream-branch=upstream/experimental
 -debian-branch=experimental
++upstream-branch=upstream/sid
++debian-branch=master
+ 
  [gbp-pq]
  patch-numbers = False

-- 
Libvirt Debian packaging