r56853 - in /trunk/libxml-writer-perl: Changes LICENSE META.yml Makefile.PL Writer.pm debian/changelog t/01_main.t

franck at users.alioth.debian.org franck at users.alioth.debian.org
Sun Apr 25 10:25:09 UTC 2010 

Author: franck
Date: Sun Apr 25 10:24:52 2010
New Revision: 56853

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=56853
Log:
Integrating new upstream release into trunk.

Modified:
    trunk/libxml-writer-perl/Changes
    trunk/libxml-writer-perl/LICENSE
    trunk/libxml-writer-perl/META.yml
    trunk/libxml-writer-perl/Makefile.PL
    trunk/libxml-writer-perl/Writer.pm
    trunk/libxml-writer-perl/debian/changelog
    trunk/libxml-writer-perl/t/01_main.t

Modified: trunk/libxml-writer-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-writer-perl/Changes?rev=56853&op=diff
==============================================================================
--- trunk/libxml-writer-perl/Changes (original)
+++ trunk/libxml-writer-perl/Changes Sun Apr 25 10:24:52 2010
@@ -1,5 +1,8 @@
 Revision history for Perl extension XML::Writer.
 
+0.611 Thu Apr 22 13:09:12 BST 2010    <joe at kafsemo.org>
+        - Adopt rewritten license text to explicitly allow modification.
+           
 0.610 Mon Mar 29 02:29:32 BST 2010    <joe at kafsemo.org>
         - Add a CHECK_PRINT constructor parameter to check the output print
            success (#50465). It will croak when printing to output fails.

Modified: trunk/libxml-writer-perl/LICENSE
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-writer-perl/LICENSE?rev=56853&op=diff
==============================================================================
--- trunk/libxml-writer-perl/LICENSE (original)
+++ trunk/libxml-writer-perl/LICENSE Sun Apr 25 10:24:52 2010
@@ -4,4 +4,5 @@
 Copyright (c) 2003 Ed Avis <ed at membled.com>
 Copyright (c) 2004-2010 Joseph Walton <joe at kafsemo.org>
 
-No warranty.  Commercial and non-commercial use freely permitted.
+Redistribution and use in source and compiled forms, with or without
+modification, are permitted under any circumstances.  No warranty.

Modified: trunk/libxml-writer-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-writer-perl/META.yml?rev=56853&op=diff
==============================================================================
--- trunk/libxml-writer-perl/META.yml (original)
+++ trunk/libxml-writer-perl/META.yml Sun Apr 25 10:24:52 2010
@@ -3,7 +3,7 @@
   version: 1.4
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
 name:         XML-Writer
-version:      0.610
+version:      0.611
 abstract:     Easily generate well-formed, namespace-aware XML.
 author:
   - David Megginson <david at megginson.com>

Modified: trunk/libxml-writer-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-writer-perl/Makefile.PL?rev=56853&op=diff
==============================================================================
--- trunk/libxml-writer-perl/Makefile.PL (original)
+++ trunk/libxml-writer-perl/Makefile.PL Sun Apr 25 10:24:52 2010
@@ -7,7 +7,7 @@
 # the contents of the Makefile that is written.
 WriteMakefile(
     'NAME'    => 'XML::Writer',
-    'VERSION' => '0.610',
+    'VERSION' => '0.611',
 
     # A manually-created META.yml has all the other metadata;
     #  we don't want it overwritten

Modified: trunk/libxml-writer-perl/Writer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-writer-perl/Writer.pm?rev=56853&op=diff
==============================================================================
--- trunk/libxml-writer-perl/Writer.pm (original)
+++ trunk/libxml-writer-perl/Writer.pm Sun Apr 25 10:24:52 2010
@@ -3,7 +3,8 @@
 # Copyright (c) 1999 by Megginson Technologies.
 # Copyright (c) 2003 Ed Avis <ed at membled.com>
 # Copyright (c) 2004-2010 Joseph Walton <joe at kafsemo.org>
-# No warranty.  Commercial and non-commercial use freely permitted.
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances.  No warranty.
 ########################################################################
 
 package XML::Writer;
@@ -14,7 +15,7 @@
 use vars qw($VERSION);
 use Carp;
 use IO::Handle;
-$VERSION = "0.610";
+$VERSION = "0.611";
 
 
 

Modified: trunk/libxml-writer-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-writer-perl/debian/changelog?rev=56853&op=diff
==============================================================================
--- trunk/libxml-writer-perl/debian/changelog (original)
+++ trunk/libxml-writer-perl/debian/changelog Sun Apr 25 10:24:52 2010
@@ -1,8 +1,4 @@
-libxml-writer-perl (0.610-1) UNRELEASED; urgency=low
-
-  TODO:
-  Franck Joncourt: Currently checking the license with upstream.
-   It should be ok in 0.611.
+libxml-writer-perl (0.611-1) UNRELEASED; urgency=low
 
   [ Brian Cassidy ]
   * New upstream release.
@@ -26,8 +22,7 @@
   * Change my email address.
 
   [ Franck Joncourt ]
-  * New upstream release (0.607)
-    + Removed MIT license.
+  * New upstream release (0.607 and 0.611)
   * Used tiny dh template in d.rules.
   * Switch to dpkg-source 3.0 (quilt) format.
   * Added /me to Uploaders. (Refreshed both d.control and d.copyright
@@ -37,7 +32,7 @@
   * Set priority only in source package (removed dupliacte entry).
   * Bumped up Standards-Version to 3.8.4 (no changes).
 
- -- Nathan Handler <nhandler at ubuntu.com>  Mon, 29 Mar 2010 16:39:02 -0500
+ -- Franck Joncourt <franck at debian.org>  Sun, 25 Apr 2010 12:22:12 +0200
 
 libxml-writer-perl (0.605-1) unstable; urgency=low
 

Modified: trunk/libxml-writer-perl/t/01_main.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-writer-perl/t/01_main.t?rev=56853&op=diff
==============================================================================
--- trunk/libxml-writer-perl/t/01_main.t (original)
+++ trunk/libxml-writer-perl/t/01_main.t Sun Apr 25 10:24:52 2010
@@ -4,7 +4,8 @@
 # Copyright (c) 1999 by Megginson Technologies.
 # Copyright (c) 2003 Ed Avis <ed at membled.com>
 # Copyright (c) 2004-2010 Joseph Walton <joe at kafsemo.org>
-# No warranty.  Commercial and non-commercial use freely permitted.
+# Redistribution and use in source and compiled forms, with or without
+# modification, are permitted under any circumstances.  No warranty.
 ########################################################################
 
 # Before 'make install' is performed this script should be runnable with
@@ -14,7 +15,7 @@
 
 use Errno;
 
-use Test::More(tests => 223);
+use Test::More(tests => 225);
 
 
 # Catch warnings
@@ -1877,6 +1878,19 @@
 	$w->xmlDecl();
 };
 
+# getOutput() with CHECK_PRINT should get the underlying stream, not the wrapper
+TEST: {
+	initEnv(CHECK_PRINT => 1);
+
+	my $out = $w->getOutput();
+
+	$w->setOutput(\*STDERR);
+	is($w->getOutput(), \*STDERR, 'Changing output should be reflected in a subsequent get');
+
+	$w->setOutput($out);
+	is ($w->getOutput(), $out, 'Changing output back should succeed');
+};
+
 # Free test resources
 $outputFile->close() or die "Unable to close temporary file: $!";

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