[Pkg-libvirt-commits] [SCM] VirtManager Debian packaging branch, master, updated. debian/0.8.7-1-6-geb64be2

[Laurent Léonard]

The following commit has been merged in the master branch:
commit 77f1b30feb2ac1921837116b00b0cf5890ab7336
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Sat Jul 30 20:57:49 2011 +0200

    Update patch 0005-Use-IPy-from-python-ipy.patch

diff --git a/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch b/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch
index e496158..5382cc8 100644
--- a/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch
+++ b/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch
@@ -8,7 +8,7 @@ Subject: use /usr/share/gconf for schema data
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/Makefile.am b/src/Makefile.am
-index e175838..6372462 100644
+index 9fa9fed..f03dba0 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -22,7 +22,7 @@ dbusdir = $(datadir)/dbus-1/services
@@ -21,7 +21,7 @@ index e175838..6372462 100644
  schema_DATA = $(PACKAGE).schemas
  
 diff --git a/src/Makefile.in b/src/Makefile.in
-index fe11bbb..9c14f35 100644
+index c64d781..df4e900 100644
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
 @@ -261,7 +261,7 @@ desktop_DATA = $(PACKAGE).desktop
diff --git a/debian/patches/0002-Use-IPy-from-python-ipy.patch b/debian/patches/0002-Use-IPy-from-python-ipy.patch
index 7c92a5c..5a1dd92 100644
--- a/debian/patches/0002-Use-IPy-from-python-ipy.patch
+++ b/debian/patches/0002-Use-IPy-from-python-ipy.patch
@@ -10,26 +10,26 @@ Bug-Debian: http://bugs.debian.org/605967
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/virtManager/createnet.py b/src/virtManager/createnet.py
-index 2311111..6024666 100644
+index 5bad52e..4b10472 100644
 --- a/src/virtManager/createnet.py
 +++ b/src/virtManager/createnet.py
-@@ -25,7 +25,7 @@ import re
- import traceback
+@@ -23,7 +23,7 @@ import re
+ 
+ import gtk
  
- import virtManager.util as util
 -from virtManager.IPy import IP
 +from IPy import IP
  from virtManager.network import vmmNetwork
  from virtManager.baseclass import vmmGObjectUI
  
 diff --git a/src/virtManager/network.py b/src/virtManager/network.py
-index c5339dd..068eb5f 100644
+index aa918b8..fad31c9 100644
 --- a/src/virtManager/network.py
 +++ b/src/virtManager/network.py
-@@ -20,7 +20,7 @@
- 
- import virtinst.util as util
+@@ -19,7 +19,7 @@
+ #
  
+ from virtManager import util
 -from virtManager.IPy import IP
 +from IPy import IP
  from virtManager.libvirtobject import vmmLibvirtObject

-- 
VirtManager Debian packaging