r7691 - in /trunk/libxml-atom-perl: ./ debian/ debian/patches/ inc/Module/Install/ lib/XML/ lib/XML/Atom/ t/

hanska-guest at users.alioth.debian.org hanska-guest at users.alioth.debian.org
Tue Sep 18 07:48:09 UTC 2007 

Author: hanska-guest
Date: Tue Sep 18 07:48:09 2007
New Revision: 7691

URL: http://svn.debian.org/wsvn/?sc=1&rev=7691
Log:
Revert r7690 -- I promise to use svn-upgrade next time... :)

Added:
    trunk/libxml-atom-perl/Build.PL
      - copied unchanged from r7689, trunk/libxml-atom-perl/Build.PL
    trunk/libxml-atom-perl/inc/Module/Install/Build.pm
      - copied unchanged from r7689, trunk/libxml-atom-perl/inc/Module/Install/Build.pm
Modified:
    trunk/libxml-atom-perl/Changes
    trunk/libxml-atom-perl/MANIFEST
    trunk/libxml-atom-perl/META.yml
    trunk/libxml-atom-perl/Makefile.PL
    trunk/libxml-atom-perl/debian/changelog
    trunk/libxml-atom-perl/debian/patches/test_cases.dpatch
    trunk/libxml-atom-perl/lib/XML/Atom.pm
    trunk/libxml-atom-perl/lib/XML/Atom/Base.pm
    trunk/libxml-atom-perl/t/04-person.t
    trunk/libxml-atom-perl/t/19-ext.t
    trunk/libxml-atom-perl/t/23-category.t
    trunk/libxml-atom-perl/t/25-utf8-create.t

Modified: trunk/libxml-atom-perl/Changes
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/Changes?rev=7691&op=diff
==============================================================================
--- trunk/libxml-atom-perl/Changes (original)
+++ trunk/libxml-atom-perl/Changes Tue Sep 18 07:48:09 2007
@@ -1,22 +1,6 @@
 $Id$
 
 Revision history for XML::Atom
-
-0.27 2007.09.15
-    * Fixed $feed->as_xml_utf8 to work with latest XML::LibXML
-
-0.26 2007.09.15
-    * This be 0.26
-
-0.25_02  2007.06.20
-    * Fixed tests that fail with newer libxml (Thanks to knagano)
-
-0.25_01 2007.04.27
-
-    * Fixed XML::Atom::Base element accessor to work with attributes
-      (Patch from LTjake and Jshirley for OpenSearch extension)
-    * Make XML::Atom::Link easily subclassable
-      (Patch from Simon Wistow for Google Calendar support)
 
 0.25  2006.11.30
     * Fixed memory leaks in XML::Atom::Client

Modified: trunk/libxml-atom-perl/MANIFEST
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/MANIFEST?rev=7691&op=diff
==============================================================================
--- trunk/libxml-atom-perl/MANIFEST (original)
+++ trunk/libxml-atom-perl/MANIFEST Tue Sep 18 07:48:09 2007
@@ -1,9 +1,11 @@
+Build.PL
 Changes
 inc/ExtUtils/AutoInstall.pm
 inc/Module/AutoInstall.pm
 inc/Module/Install.pm
 inc/Module/Install/AutoInstall.pm
 inc/Module/Install/Base.pm
+inc/Module/Install/Build.pm
 inc/Module/Install/Can.pm
 inc/Module/Install/Fetch.pm
 inc/Module/Install/Include.pm
@@ -57,4 +59,3 @@
 t/samples/me.jpg
 t/samples/vox.xml
 t/TestLib.pm
-t/28-ext.t

Modified: trunk/libxml-atom-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/META.yml?rev=7691&op=diff
==============================================================================
--- trunk/libxml-atom-perl/META.yml (original)
+++ trunk/libxml-atom-perl/META.yml Tue Sep 18 07:48:09 2007
@@ -15,10 +15,10 @@
   HTML::Parser: 0
   LWP: 0
   LWP::Authen::Wsse: 0
-  XML::LibXML: 1.64
+  XML::LibXML: 1.54
   XML::XPath: 0
 requires: 
   Class::Data::Inheritable: 0
   MIME::Base64: 0
   URI: 0
-version: 0.27
+version: 0.25

Modified: trunk/libxml-atom-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/Makefile.PL?rev=7691&op=diff
==============================================================================
--- trunk/libxml-atom-perl/Makefile.PL (original)
+++ trunk/libxml-atom-perl/Makefile.PL Tue Sep 18 07:48:09 2007
@@ -19,7 +19,7 @@
 features(
     'Faster XML parsing with libxml' => [
         -default => 1,
-        recommends('XML::LibXML' => 1.64),
+        recommends('XML::LibXML' => 1.54),
     ],
     'Pure perl XML parsing with XML::XPath' => [
         -default => 0,

Modified: trunk/libxml-atom-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/debian/changelog?rev=7691&op=diff
==============================================================================
--- trunk/libxml-atom-perl/debian/changelog (original)
+++ trunk/libxml-atom-perl/debian/changelog Tue Sep 18 07:48:09 2007
@@ -14,10 +14,9 @@
     - Moved $(MAKE) test under the build target, from the install
     - Removed useless comments
     - Some general cleanup
-  * debian/patches/:
-    - test_cases.dpatch adjusted to apply well on new testfiles
+  * 
 
- -- David Paleino <d.paleino at gmail.com>  Tue, 18 Sep 2007 09:33:29 +0200
+ -- David Paleino <d.paleino at gmail.com>  Mon, 17 Sep 2007 19:18:24 +0200
 
 libxml-atom-perl (0.25-2) unstable; urgency=low
 

Modified: trunk/libxml-atom-perl/debian/patches/test_cases.dpatch
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/debian/patches/test_cases.dpatch?rev=7691&op=diff
==============================================================================
--- trunk/libxml-atom-perl/debian/patches/test_cases.dpatch (original)
+++ trunk/libxml-atom-perl/debian/patches/test_cases.dpatch Tue Sep 18 07:48:09 2007
@@ -5,40 +5,58 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad libxml-atom-perl~/t/04-person.t libxml-atom-perl/t/04-person.t
---- libxml-atom-perl~/t/04-person.t	2007-09-17 19:29:47.000000000 +0200
-+++ libxml-atom-perl/t/04-person.t	2007-09-17 19:32:57.000000000 +0200
+diff -urNad libxml-atom-perl-0.25~/t/04-person.t libxml-atom-perl-0.25/t/04-person.t
+--- libxml-atom-perl-0.25~/t/04-person.t	2006-08-15 23:40:38.000000000 -0600
++++ libxml-atom-perl-0.25/t/04-person.t	2007-07-10 14:02:00.000000000 -0600
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ 
+-use Test::More tests => 9;
++use Test::More tests => 10;
+ use XML::Atom::Person;
+ 
+ my $person;
 @@ -22,5 +22,6 @@
  my $xml = $person->as_xml;
  like $xml, qr/^<\?xml version="1.0" encoding="utf-8"\?>/;
  like $xml, qr/<author xmlns="http:\/\/purl.org\/atom\/ns#">/;
--like $xml, qr/<name(?: xmlns="http:\/\/purl.org\/atom\/ns#")?>Baz Quux<\/name>/;
--like $xml, qr/<email(?: xmlns="http:\/\/purl.org\/atom\/ns#")?>foo\@bar.com<\/email>/;
+-like $xml, qr/<name xmlns="http:\/\/purl.org\/atom\/ns#">Baz Quux<\/name>/;
+-like $xml, qr/<email xmlns="http:\/\/purl.org\/atom\/ns#">foo\@bar.com<\/email>/;
 +like $xml, qr/<name>Baz Quux<\/name>/;
 +like $xml, qr/<email>foo\@bar.com<\/email>/;
 +like $xml, qr/<\/author>/;
-diff -urNad libxml-atom-perl~/t/19-ext.t libxml-atom-perl/t/19-ext.t
---- libxml-atom-perl~/t/19-ext.t	2007-09-17 19:29:47.000000000 +0200
-+++ libxml-atom-perl/t/19-ext.t	2007-09-17 19:34:01.000000000 +0200
+diff -urNad libxml-atom-perl-0.25~/t/19-ext.t libxml-atom-perl-0.25/t/19-ext.t
+--- libxml-atom-perl-0.25~/t/19-ext.t	2006-11-20 14:58:10.000000000 -0600
++++ libxml-atom-perl-0.25/t/19-ext.t	2007-07-10 14:02:00.000000000 -0600
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use FindBin;
+-use Test::More tests => 9;
++use Test::More tests => 10;
+ 
+ use XML::Atom::Feed;
+ 
 @@ -11,7 +11,8 @@
  $foo->bar(1);
  is $foo->bar, 1;
  like $foo->as_xml, qr/<foo xmlns="http:\/\/www.example.com\/ns\/">/;
--like $foo->as_xml, qr/<bar(?: xmlns="http:\/\/www.example.com\/ns\/")?>1<\/bar>/;
+-like $foo->as_xml, qr/<bar xmlns="http:\/\/www.example.com\/ns\/">1<\/bar>/;
 +like $foo->as_xml, qr/<bar>1<\/bar>/;
 +like $foo->as_xml, qr/<\/foo>/;
  
  my $feed = XML::Atom::Feed->new;
  $feed->foo($foo);
-diff -urNad libxml-atom-perl~/t/23-category.t libxml-atom-perl/t/23-category.t
---- libxml-atom-perl~/t/23-category.t	2007-09-17 19:29:47.000000000 +0200
-+++ libxml-atom-perl/t/23-category.t	2007-09-17 23:34:59.000000000 +0200
+diff -urNad libxml-atom-perl-0.25~/t/23-category.t libxml-atom-perl-0.25/t/23-category.t
+--- libxml-atom-perl-0.25~/t/23-category.t	2006-08-15 23:40:39.000000000 -0600
++++ libxml-atom-perl-0.25/t/23-category.t	2007-07-10 14:02:00.000000000 -0600
 @@ -47,7 +47,11 @@
      is $cat[1]->term, "bar";
  
      my $xml = $entry->as_xml;
--    like $xml, qr!<category(?: xmlns="http://www.w3.org/2005/Atom")? term="foo" scheme="http://example.org/foo#" label="foo bar"/>!;
--    like $xml, qr!<category(?: xmlns="http://www.w3.org/2005/Atom")? term="bar" scheme="http://example.org/bar#"/>!;
+-    like $xml, qr!<category xmlns="http://www.w3.org/2005/Atom" term="foo" scheme="http://example.org/foo#" label="foo bar"/>!;
+-    like $xml, qr!<category xmlns="http://www.w3.org/2005/Atom" term="bar" scheme="http://example.org/bar#"/>!;
 +    like $xml, qr/<\?xml version="1.0" encoding="utf-8"\?>/;
 +    like $xml, qr/<entry xmlns="http:\/\/www.w3.org\/2005\/Atom">/;
 +    like $xml, qr/<title>foo bar<\/title>/;
@@ -47,17 +65,15 @@
 +    like $xml, qr/<\/entry>/;
  }
  
-diff -urNad libxml-atom-perl~/t/25-utf8-create.t libxml-atom-perl/t/25-utf8-create.t
---- libxml-atom-perl~/t/25-utf8-create.t	2007-09-17 19:29:47.000000000 +0200
-+++ libxml-atom-perl/t/25-utf8-create.t	2007-09-17 23:36:17.000000000 +0200
-@@ -5,15 +5,15 @@
+diff -urNad libxml-atom-perl-0.25~/t/25-utf8-create.t libxml-atom-perl-0.25/t/25-utf8-create.t
+--- libxml-atom-perl-0.25~/t/25-utf8-create.t	2006-09-16 00:55:53.000000000 -0600
++++ libxml-atom-perl-0.25/t/25-utf8-create.t	2007-07-10 14:02:00.000000000 -0600
+@@ -5,14 +5,14 @@
  
  my $feed = XML::Atom::Feed->new(Version => 1.0);
  $feed->version; # 1.0
 -$feed->title("Dicion\xc3\xa1rios");
--is $feed->title, "Dicion\xc3\xa1rios";
 +$feed->title("Dicionários");
-+is $feed->title, "Dicionários";
  
  my $out = "$FindBin::Bin/utf8-create.xml";
  open my $fh, ">", $out;

Modified: trunk/libxml-atom-perl/lib/XML/Atom.pm
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/lib/XML/Atom.pm?rev=7691&op=diff
==============================================================================
--- trunk/libxml-atom-perl/lib/XML/Atom.pm (original)
+++ trunk/libxml-atom-perl/lib/XML/Atom.pm Tue Sep 18 07:48:09 2007
@@ -3,7 +3,7 @@
 package XML::Atom;
 use strict;
 
-our $VERSION = '0.27';
+our $VERSION = '0.25';
 
 BEGIN {
     @XML::Atom::EXPORT = qw( LIBXML );

Modified: trunk/libxml-atom-perl/lib/XML/Atom/Base.pm
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/lib/XML/Atom/Base.pm?rev=7691&op=diff
==============================================================================
--- trunk/libxml-atom-perl/lib/XML/Atom/Base.pm (original)
+++ trunk/libxml-atom-perl/lib/XML/Atom/Base.pm Tue Sep 18 07:48:09 2007
@@ -1,4 +1,4 @@
-# $Id: /mirror/code/XML-Atom/trunk/lib/XML/Atom/Base.pm 6911 2007-09-16T04:41:21.502409Z miyagawa  $
+# $Id: /mirror/code/XML-Atom/trunk/lib/XML/Atom/Base.pm 5342 2006-09-16T06:39:51.745764Z miyagawa  $
 
 package XML::Atom::Base;
 use strict;
@@ -28,20 +28,7 @@
     unless ($elem = $param{Elem}) {
         if (LIBXML) {
             my $doc = XML::LibXML::Document->createDocument('1.0', 'utf-8');
-            my $ns = $obj->ns;
-            my ($ns_uri, $ns_prefix);
-            if ( ref $ns and $ns->isa('XML::Atom::Namespace') ) {
-                $ns_uri     = $ns->{uri};
-                $ns_prefix  = $ns->{prefix};
-            } else {
-                $ns_uri = $ns;
-            }
-            if ( $ns_uri and $ns_prefix ) {
-                $elem = $doc->createElement($obj->element_name);
-                $elem->setNamespace( $ns_uri, $ns_prefix, 1 );
-            } else {
-                $elem = $doc->createElementNS($obj->ns, $obj->element_name);
-            }
+            $elem = $doc->createElementNS($obj->ns, $obj->element_name);
             $doc->setDocumentElement($elem);
         } else {
             $elem = XML::XPath::Node::Element->new($obj->element_name);
@@ -175,35 +162,16 @@
 
 sub mk_elem_accessors {
     my $class = shift;
-    my (@list) = @_;
-    my $override_ns;
-
-    if ( ref $list[-1] ) {
-        my $ns_list = pop @list;
-        if ( ref $ns_list eq 'ARRAY' ) {
-            $ns_list = $ns_list->[0];
-        }
-        if ( ref($ns_list) =~ /Namespace/ ) {
-            $override_ns = $ns_list;
-        } else {
-            if ( ref $ns_list eq 'HASH' ) {
-                $override_ns = XML::Atom::Namespace->new(%$ns_list);
-            }
-            elsif ( not ref $ns_list and $ns_list ) {
-                $override_ns = $ns_list;
-            }
-        } 
-    }
-
-    no strict 'refs';
-    for my $elem ( @list ) {
+    my(@list) = @_;
+    no strict 'refs';
+    for my $elem (@list) {
         (my $meth = $elem) =~ tr/\-/_/;
         *{"${class}::$meth"} = sub {
             my $obj = shift;
             if (@_) {
-                return $obj->set( $override_ns || $obj->ns, $elem, $_[0]);
+                return $obj->set($obj->ns, $elem, $_[0]);
             } else {
-                return $obj->get( $override_ns || $obj->ns, $elem);
+                return $obj->get($obj->ns, $elem);
             }
         };
     }
@@ -325,7 +293,7 @@
         my($stuff) = @_;
 
         my $ns_uri = $ext_class->element_ns || $obj->ns;
-        my $elem = (ref $stuff && UNIVERSAL::isa($stuff, $ext_class)) ?
+        my $elem = ref $stuff eq $ext_class ?
             $stuff->elem : create_element($ns_uri, $name);
         $obj->elem->appendChild($elem);
 
@@ -353,11 +321,7 @@
 
 sub as_xml_utf8 {
     my $obj = shift;
-    my $xml = $obj->as_xml;
-    if (utf8::is_utf8($xml)) {
-        return Encode::encode_utf8($xml);
-    }
-    return $xml;
+    Encode::encode_utf8($obj->as_xml);
 }
 
 1;

Modified: trunk/libxml-atom-perl/t/04-person.t
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/t/04-person.t?rev=7691&op=diff
==============================================================================
--- trunk/libxml-atom-perl/t/04-person.t (original)
+++ trunk/libxml-atom-perl/t/04-person.t Tue Sep 18 07:48:09 2007
@@ -2,7 +2,7 @@
 
 use strict;
 
-use Test::More tests => 10;
+use Test::More tests => 9;
 use XML::Atom::Person;
 
 my $person;
@@ -22,5 +22,5 @@
 my $xml = $person->as_xml;
 like $xml, qr/^<\?xml version="1.0" encoding="utf-8"\?>/;
 like $xml, qr/<author xmlns="http:\/\/purl.org\/atom\/ns#">/;
-like $xml, qr/<name(?: xmlns="http:\/\/purl.org\/atom\/ns#")?>Baz Quux<\/name>/;
-like $xml, qr/<email(?: xmlns="http:\/\/purl.org\/atom\/ns#")?>foo\@bar.com<\/email>/;
+like $xml, qr/<name xmlns="http:\/\/purl.org\/atom\/ns#">Baz Quux<\/name>/;
+like $xml, qr/<email xmlns="http:\/\/purl.org\/atom\/ns#">foo\@bar.com<\/email>/;

Modified: trunk/libxml-atom-perl/t/19-ext.t
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/t/19-ext.t?rev=7691&op=diff
==============================================================================
--- trunk/libxml-atom-perl/t/19-ext.t (original)
+++ trunk/libxml-atom-perl/t/19-ext.t Tue Sep 18 07:48:09 2007
@@ -1,8 +1,8 @@
-# $Id: /mirror/code/XML-Atom/trunk/t/19-ext.t 6810 2007-06-20T19:20:38.705942Z miyagawa  $
+# $Id: /mirror/code/XML-Atom/trunk/t/19-ext.t 5803 2006-09-19T22:35:49.408282Z btrott  $
 
 use strict;
 use FindBin;
-use Test::More tests => 10;
+use Test::More tests => 9;
 
 use XML::Atom::Feed;
 
@@ -11,7 +11,7 @@
 $foo->bar(1);
 is $foo->bar, 1;
 like $foo->as_xml, qr/<foo xmlns="http:\/\/www.example.com\/ns\/">/;
-like $foo->as_xml, qr/<bar(?: xmlns="http:\/\/www.example.com\/ns\/")?>1<\/bar>/;
+like $foo->as_xml, qr/<bar xmlns="http:\/\/www.example.com\/ns\/">1<\/bar>/;
 
 my $feed = XML::Atom::Feed->new;
 $feed->foo($foo);

Modified: trunk/libxml-atom-perl/t/23-category.t
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/t/23-category.t?rev=7691&op=diff
==============================================================================
--- trunk/libxml-atom-perl/t/23-category.t (original)
+++ trunk/libxml-atom-perl/t/23-category.t Tue Sep 18 07:48:09 2007
@@ -47,7 +47,7 @@
     is $cat[1]->term, "bar";
 
     my $xml = $entry->as_xml;
-    like $xml, qr!<category(?: xmlns="http://www.w3.org/2005/Atom")? term="foo" scheme="http://example.org/foo#" label="foo bar"/>!;
-    like $xml, qr!<category(?: xmlns="http://www.w3.org/2005/Atom")? term="bar" scheme="http://example.org/bar#"/>!;
+    like $xml, qr!<category xmlns="http://www.w3.org/2005/Atom" term="foo" scheme="http://example.org/foo#" label="foo bar"/>!;
+    like $xml, qr!<category xmlns="http://www.w3.org/2005/Atom" term="bar" scheme="http://example.org/bar#"/>!;
 }
 

Modified: trunk/libxml-atom-perl/t/25-utf8-create.t
URL: http://svn.debian.org/wsvn/trunk/libxml-atom-perl/t/25-utf8-create.t?rev=7691&op=diff
==============================================================================
--- trunk/libxml-atom-perl/t/25-utf8-create.t (original)
+++ trunk/libxml-atom-perl/t/25-utf8-create.t Tue Sep 18 07:48:09 2007
@@ -6,7 +6,6 @@
 my $feed = XML::Atom::Feed->new(Version => 1.0);
 $feed->version; # 1.0
 $feed->title("Dicion\xc3\xa1rios");
-is $feed->title, "Dicion\xc3\xa1rios";
 
 my $out = "$FindBin::Bin/utf8-create.xml";
 open my $fh, ">", $out;

More information about the Pkg-perl-cvs-commits mailing list