[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, squeeze, updated. debian/0.8.3-5+squeeze0

[Guido Günther]

The following commit has been merged in the squeeze branch:
commit 224ea6393f1c5d75a3656d554b8e086307bc7638
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Feb 18 21:26:53 2011 +0100

    Document changes and release 0.8.3-5+squeeze0

diff --git a/debian/changelog b/debian/changelog
index 08a6844..dec5fa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,10 @@
-libvirt (0.8.3-6~1.gbpca2348) UNRELEASED; urgency=low
-
-  ** SNAPSHOT build @ca2348476605efc4d067933f136ffdae3cf44283 **
+libvirt (0.8.3-5+squeeze0) stable; urgency=low
 
   [ Laurent Léonard ]
-  * [6e46f0e] Fix wrong regular expression in debian/watch
   * [6f95d48] Fix exit status codes in libvirt init script to comply with LSB
     (Closes: #612305)
 
- -- Guido Günther <agx at sigxcpu.org>  Sat, 15 Jan 2011 13:55:42 +0100
+ -- Guido Günther <agx at sigxcpu.org>  Fri, 18 Feb 2011 21:26:03 +0100
 
 libvirt (0.8.3-5) unstable; urgency=low
 
@@ -18,10 +15,10 @@ libvirt (0.8.3-5) unstable; urgency=low
   * [f561b2e] New patch 0010-nwfilter-resolve-deadlock-between-VM-
     operations-and-.patch nwfilter: resolve deadlock between VM operations and
     filter update (Closes: #602715)
-  * [91a1b8d] New patch 0011-OpenVZ-take-veid-from-vmdef-name-when-
+  * [239bbe5] New patch 0011-OpenVZ-take-veid-from-vmdef-name-when-
     defining-new-d.patch: Fixes OpenVZ domain creation (Closes: #592817) -
     thanks to Eric Litak.
-  * [3d3f395] New patch 0012-OpenVZ-Fix-some-overwritten-error-codes.patch:
+  * [c4a2a6b] New patch 0012-OpenVZ-Fix-some-overwritten-error-codes.patch:
     Improve error reporting.
 
  -- Guido Günther <agx at sigxcpu.org>  Wed, 01 Dec 2010 15:12:48 +0100
diff --git a/debian/patches/0011-OpenVZ-take-veid-from-vmdef-name-when-defining-new-d.patch b/debian/patches/0011-OpenVZ-take-veid-from-vmdef-name-when-defining-new-d.patch
index fb8d7c1..4fb7914 100644
--- a/debian/patches/0011-OpenVZ-take-veid-from-vmdef-name-when-defining-new-d.patch
+++ b/debian/patches/0011-OpenVZ-take-veid-from-vmdef-name-when-defining-new-d.patch
@@ -20,7 +20,7 @@ index d2f91c6..556df52 100644
 -    int max_veid;
 -    char str_id[10];
 -    FILE *fp;
-
+ 
      for (narg = 0; narg < maxarg; narg++)
          args[narg] = NULL;
 @@ -135,36 +131,7 @@ openvzDomainDefineCmd(const char *args[],
@@ -58,7 +58,7 @@ index d2f91c6..556df52 100644
 -    sprintf(str_id, "%d", max_veid);
 -    ADD_ARG_LIT(str_id);
 +    ADD_ARG_LIT(vmdef->name);
-
+ 
      ADD_ARG_LIT("--name");
      ADD_ARG_LIT(vmdef->name);
 @@ -188,11 +155,6 @@ no_memory:
@@ -73,4 +73,4 @@ index d2f91c6..556df52 100644
  #undef ADD_ARG
  #undef ADD_ARG_LIT
  }
---
+-- 
diff --git a/debian/patches/0012-OpenVZ-Fix-some-overwritten-error-codes.patch b/debian/patches/0012-OpenVZ-Fix-some-overwritten-error-codes.patch
index 5c5b892..1f19d89 100644
--- a/debian/patches/0012-OpenVZ-Fix-some-overwritten-error-codes.patch
+++ b/debian/patches/0012-OpenVZ-Fix-some-overwritten-error-codes.patch
@@ -19,9 +19,9 @@ index 556df52..698d0e6 100644
  #include "memory.h"
  #include "bridge.h"
 +#include "logging.h"
-
+ 
  #define VIR_FROM_THIS VIR_FROM_OPENVZ
-
+ 
 @@ -209,8 +210,7 @@ static int openvzSetInitialConfig(virDomainDefPtr vmdef)
      else
      {
@@ -31,25 +31,25 @@ index 556df52..698d0e6 100644
 +            VIR_ERROR0(_("Error creating command for container"));
              goto cleanup;
          }
-
+ 
 @@ -870,8 +870,7 @@ openvzDomainDefineXML(virConnectPtr conn, const char *xml)
      vm->persistent = 1;
-
+ 
      if (openvzSetInitialConfig(vm->def) < 0) {
 -        openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
 -                    _("Error creating initial configuration"));
 +        VIR_ERROR0(_("Error creating initial configuration"));
          goto cleanup;
      }
-
+ 
 @@ -954,8 +953,7 @@ openvzDomainCreateXML(virConnectPtr conn, const char *xml,
      vm->persistent = 1;
-
+ 
      if (openvzSetInitialConfig(vm->def) < 0) {
 -        openvzError(VIR_ERR_INTERNAL_ERROR, "%s",
 -                    _("Error creating initial configuration"));
 +        VIR_ERROR0(_("Error creating initial configuration"));
          goto cleanup;
      }
-
---
+ 
+-- 

-- 
Libvirt Debian packaging