Bug#432513: NMU uploaded

[Andreas Barth]

Hi,

I uploaded an NMU of your package.

Please see this as help to get the package into a releaseable condition again.

Please find the used diff below.


Cheers,
Andi

diff -u libxml-libxml-perl-1.63/debian/changelog 
libxml-libxml-perl-1.63/debian/changelog
--- libxml-libxml-perl-1.63/debian/changelog
+++ libxml-libxml-perl-1.63/debian/changelog
@@ -1,3 +1,10 @@
+libxml-libxml-perl (1.63-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS of libxml-feed-perl with upstream r664. Closes: #432513
+
+ -- Andreas Barth <[EMAIL PROTECTED]>  Tue, 31 Jul 2007 20:24:31 +0000
+
 libxml-libxml-perl (1.63-1) unstable; urgency=low
 
   * New upstream release (Closes: #389857).
only in patch2:
unchanged:
--- libxml-libxml-perl-1.63.orig/t/10ns.t
+++ libxml-libxml-perl-1.63/t/10ns.t
@@ -1,6 +1,6 @@
 # -*- cperl -*-
 use Test;
-BEGIN { plan tests=>122; }
+BEGIN { plan tests=>124; }
 use XML::LibXML;
 use XML::LibXML::Common qw(:libxml);
 
@@ -384,3 +384,15 @@
        ok ( !defined($child->getAttribute( 'xmlns:other' )) );
        ok ( defined($doca->documentElement->getAttribute( 'xmlns:other' )) );
 }
+
+print "# 10. xml namespace\n";
+{
+  my $docOne = XML::LibXML->new->parse_string('<foo><inc 
xml:id="test"/></foo>');
+  my $docTwo = XML::LibXML->new->parse_string('<bar><urgh 
xml:id="foo"/></bar>');
+
+  my $inc = $docOne->getElementById('test');
+  my $rep = $docTwo->getElementById('foo');
+  $inc->parentNode->replaceChild($rep, $inc);
+  ok($inc->getAttributeNS('http://www.w3.org/XML/1998/namespace','id'),'test');
+  ok($inc->isSameNode($docOne->getElementById('test')));
+}
only in patch2:
unchanged:
--- libxml-libxml-perl-1.63.orig/perl-libxml-mm.h
+++ libxml-libxml-perl-1.63/perl-libxml-mm.h
@@ -40,7 +40,7 @@
  * for warn!!
  */
 #ifdef XS_WARNINGS
-#define xs_warn(string) warn(string) 
+#define xs_warn(string) warn("%s",string) 
 #else
 #define xs_warn(string)
 #endif
only in patch2:
unchanged:
--- libxml-libxml-perl-1.63.orig/Changes
+++ libxml-libxml-perl-1.63/Changes
@@ -1,5 +1,8 @@
 Revision history for Perl extension XML::LibXML
 
+pre1.64
+   - fix reconcilation of the "xml" namespace [rt.cpan.org #26450] 
+
 1.63
    - added no_network parser flag
    - added support for exclusive canonicalization 
(http://www.w3.org/TR/xml-exc-c14n/)
only in patch2:
unchanged:
--- libxml-libxml-perl-1.63.orig/dom.c
+++ libxml-libxml-perl-1.63/dom.c
@@ -14,7 +14,7 @@
 /* #define warn(string) fprintf(stderr, string) */
 
 #ifdef XS_WARNINGS
-#define xs_warn(string) warn(string) 
+#define xs_warn(string) warn("%s",string) 
 #else
 #define xs_warn(string)
 #endif
@@ -91,9 +91,20 @@
 _domReconcileNsAttr(xmlAttrPtr attr, xmlNsPtr * unused)
 {
         xmlNodePtr tree = attr->parent;
+       if (tree == NULL)
+               return;
         if( attr->ns != NULL )
         {
-                xmlNsPtr ns = xmlSearchNs( tree->doc, tree->parent, 
attr->ns->prefix );
+               xmlNsPtr ns;
+               if ((attr->ns->prefix != NULL) && 
+                   (xmlStrEqual(attr->ns->prefix, BAD_CAST "xml"))) {
+                       /* prefix 'xml' has no visible declaration */
+                       ns = xmlSearchNsByHref(tree->doc, tree, 
XML_XML_NAMESPACE);
+                       attr->ns = ns;
+                       return;
+               } else {
+                       ns = xmlSearchNs( tree->doc, tree->parent, 
attr->ns->prefix );
+               }
                 if( ns != NULL && ns->href != NULL && attr->ns->href != NULL &&
                     xmlStrcmp(ns->href,attr->ns->href) == 0 )
                 {
@@ -114,7 +125,9 @@
                         {
                                 /* Replace/Add the namespace declaration on 
the element */
                                 attr->ns = xmlCopyNamespace(attr->ns);
-                                domAddNsDef(tree, attr->ns);
+                               if (attr->ns) {
+                                 domAddNsDef(tree, attr->ns);
+                               }
                         }
                 }
         }
-- 
  http://home.arcor.de/andreas-barth/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]