[tryton-debian-vcs] suds branch debian updated. debian/0.4.1-9-2-g3de7141

git repository hosting tryton-debian-vcs at m9s.biz
Mon Nov 4 17:27:42 UTC 2013


The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/suds.git;a=commitdiff;h=debian/0.4.1-9-2-g3de7141

commit 3de71413550e44c4bc0996a3aa2b653e8a4a60b2
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Nov 4 18:27:34 2013 +0100

    Releasing debian version 0.4.1-10.

diff --git a/debian/changelog b/debian/changelog
index c5dfeeb..58692b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+suds (0.4.1-10) unstable; urgency=low
+
+  * Adding 04-merge-schema.patch. Thanks to Russell Stuart (Closes:
+    #728184).
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Mon, 04 Nov 2013 18:21:25 +0100
+
 suds (0.4.1-9) unstable; urgency=low
 
   * Adding 03-fix-timezone-handling.patch (Closes: #714722). Thanks to
commit 2fcc4c467d9542406715bda246e67df09dd6fda7
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Nov 4 18:18:51 2013 +0100

    Adding 04-merge-schema.patch. Thanks to Russell Stuart (Closes: #728184).

diff --git a/debian/patches/04-merge-schema.patch b/debian/patches/04-merge-schema.patch
new file mode 100644
index 0000000..0675a1d
--- /dev/null
+++ b/debian/patches/04-merge-schema.patch
@@ -0,0 +1,28 @@
+Author: gwalker
+Description: Merge correctly multiple namespaces
+ Debian patch provided and tested by Russell Stuart <ras at debian.org>.
+Origin: upstream, https://fedorahosted.org/suds/attachment/ticket/346/suds.xsd.schema.patch
+Bug: https://fedorahosted.org/suds/ticket/346
+Bug-Debian: http://bugs.debian.org/728184
+Forwarded: https://fedorahosted.org/suds/ticket/346
+
+--- suds-0.4.1.orig/suds/xsd/schema.py
++++ suds-0.4.1/suds/xsd/schema.py
+@@ -265,6 +265,7 @@ class Schema:
+         @returns: self
+         @rtype: L{Schema} 
+         """
++        initial_count = len(self.all)
+         for item in schema.attributes.items():
+             if item[0] in self.attributes:
+                 continue
+@@ -290,6 +291,9 @@ class Schema:
+                 continue
+             self.all.append(item[1])
+             self.agrps[item[0]] = item[1]
++        for top_level_item in self.all[initial_count:]:
++            for descendant in top_level_item.content():
++                descendant.schema = self
+         schema.merged = True
+         return self
+         
diff --git a/debian/patches/series b/debian/patches/series
index 8715974..2219dd1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-remove-makefile
 02-fix-unsecure-cache-path.patch
 03-fix-timezone-handling.patch
+04-merge-schema.patch
-- 
suds



More information about the tryton-debian-vcs mailing list