r32731 - in /trunk/libdbd-sqlite3-perl: Changes MANIFEST META.yml Makefile.PL debian/changelog inc/ lib/DBD/SQLite.pm t/12_unicode.t t/30_auto_rollback.t t/lib/Test.pm t/rt_21406_auto_finish.t t/rt_25371_asymmetric_unicode.t t/rt_29058_group_by.t

eloy at users.alioth.debian.org eloy at users.alioth.debian.org
Tue Apr 7 21:25:35 UTC 2009


Author: eloy
Date: Tue Apr  7 21:25:30 2009
New Revision: 32731

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=32731
Log:
new upstream version

Added:
    trunk/libdbd-sqlite3-perl/inc/
      - copied from r32730, branches/upstream/libdbd-sqlite3-perl/current/inc/
    trunk/libdbd-sqlite3-perl/t/rt_25371_asymmetric_unicode.t
      - copied unchanged from r32730, branches/upstream/libdbd-sqlite3-perl/current/t/rt_25371_asymmetric_unicode.t
Modified:
    trunk/libdbd-sqlite3-perl/Changes
    trunk/libdbd-sqlite3-perl/MANIFEST
    trunk/libdbd-sqlite3-perl/META.yml
    trunk/libdbd-sqlite3-perl/Makefile.PL
    trunk/libdbd-sqlite3-perl/debian/changelog
    trunk/libdbd-sqlite3-perl/lib/DBD/SQLite.pm
    trunk/libdbd-sqlite3-perl/t/12_unicode.t
    trunk/libdbd-sqlite3-perl/t/30_auto_rollback.t
    trunk/libdbd-sqlite3-perl/t/lib/Test.pm
    trunk/libdbd-sqlite3-perl/t/rt_21406_auto_finish.t
    trunk/libdbd-sqlite3-perl/t/rt_29058_group_by.t

Modified: trunk/libdbd-sqlite3-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/Changes?rev=32731&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/Changes (original)
+++ trunk/libdbd-sqlite3-perl/Changes Tue Apr  7 21:25:30 2009
@@ -1,4 +1,10 @@
 Changes for Perl extension DBD-SQLite.
+
+1.20 to be released
+    - Moving to the first production release of the new era.
+    - Check DBI version in Makefile.PL (CHORNY)
+    - Bundling Test::NoWarings into /inc to remove a dependency (ADAMK)
+    - Correcting use 5.00503 to 5.006 in SQLite.pm (ADAMK)
 
 1.19_10 Mon  6 Apr 2009
     - A few more tests moved to Test::More (ADAMK)

Modified: trunk/libdbd-sqlite3-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/MANIFEST?rev=32731&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/MANIFEST (original)
+++ trunk/libdbd-sqlite3-perl/MANIFEST Tue Apr  7 21:25:30 2009
@@ -35,6 +35,8 @@
 hash.c
 hash.h
 hwtime.h
+inc/Test/NoWarnings.pm
+inc/Test/NoWarnings/Warning.pm
 insert.c
 journal.c
 keywordhash.h
@@ -128,6 +130,7 @@
 t/lib/Test.pm
 t/rt_15186_prepcached.t
 t/rt_21406_auto_finish.t
+t/rt_25371_asymmetric_unicode.t
 t/rt_25460_numeric_aggregate.t
 t/rt_27553_prepared_cache_and_analyze.t
 t/rt_29058_group_by.t

Modified: trunk/libdbd-sqlite3-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/META.yml?rev=32731&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/META.yml (original)
+++ trunk/libdbd-sqlite3-perl/META.yml Tue Apr  7 21:25:30 2009
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               DBD-SQLite
-version:            1.19_10
+version:            1.20
 abstract:           Self Contained SQLite RDBMS in a DBI Driver
 author:
     - Adam Kennedy <adamk at cpan.org>
@@ -11,13 +11,13 @@
     ExtUtils::MakeMaker:  6.48
     File::Spec:           0.82
 build_requires:
-    Test::More:        0.42
-    Test::NoWarnings:  0.081
+    File::Spec:  0.82
+    Test::More:  0.42
 requires:
-    DBI:               1.43
-    perl:              5.006
-    Test::More:        0.42
-    Test::NoWarnings:  0.081
+    DBI:         1.57
+    File::Spec:  0.82
+    perl:        5.006
+    Test::More:  0.42
 resources:
     bugtracker:   http://rt.cpan.org/NoAuth/ReportBug.html?Queue=DBD-SQLite
     license:      http://dev.perl.org/licenses/

Modified: trunk/libdbd-sqlite3-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/Makefile.PL?rev=32731&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/Makefile.PL (original)
+++ trunk/libdbd-sqlite3-perl/Makefile.PL Tue Apr  7 21:25:30 2009
@@ -45,6 +45,17 @@
 		}
 	}
 };
+
+# Because DBI generates a postamble at configure-time, we need
+# the required version of DBI very early.
+my $DBI_required = 1.57;
+eval {
+	require DBI;
+};
+if ( $@ or DBI->VERSION < $DBI_required ) {
+	print "DBI 1.57 is required to configure this module, please install it or upgrade your CPAN/CPANPLUS shell\n";
+	exit(0);
+}
 
 # 2005/6/19, by rjray at blackperl.com
 #
@@ -192,9 +203,9 @@
 	ABSTRACT         => 'Self Contained SQLite RDBMS in a DBI Driver',
 	VERSION_FROM     => 'lib/DBD/SQLite.pm',
 	PREREQ_PM        => {
-		'DBI'              => '1.43',
+		'File::Spec'       => (WINLIKE ? '3.27' : '0.82'),
+		'DBI'              => $DBI_required,
 		'Test::More'       => '0.42',
-		'Test::NoWarnings' => '0.081',
 	},
 	OPTIONAL( '6.48',
 		MIN_PERL_VERSION => '5.006',
@@ -203,18 +214,19 @@
 		LICENSE => 'perl',	
 	),
 	OPTIONAL( '6.11',
-		AUTHOR  => 'Adam Kennedy <adamk at cpan.org>', # Maintainer
+		AUTHOR  => 'Adam Kennedy <adamk at cpan.org>', # Release manager (can this be an array?)
 	),
 	OPTIONAL( '6.46',
 		META_MERGE => {
 			configure_requires => {
 				'ExtUtils::MakeMaker' => '6.48',
-				'File::Spec'          => (WINLIKE ? '3.27' : '0.82'),
-				'DBI'                 => '1.57',
+				'File::Spec'          => '0.82', # This is not allowed to be computed
+				'DBI'                 => $DBI_required,
 			},
 			build_requires => {
+				'File::Spec'          => (WINLIKE ? '3.27' : '0.82'),
 				'Test::More'          => '0.42',
-				'Test::NoWarnings'    => '0.081',
+				# 'Test::NoWarnings'    => '0.081', # Bundled in /inc
 			},
 			resources => {
 				license     => 'http://dev.perl.org/licenses/',

Modified: trunk/libdbd-sqlite3-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/debian/changelog?rev=32731&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/changelog (original)
+++ trunk/libdbd-sqlite3-perl/debian/changelog Tue Apr  7 21:25:30 2009
@@ -1,3 +1,9 @@
+libdbd-sqlite3-perl (1.20-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Krzysztof Krzyżaniak (eloy) <eloy at debian.org>  Tue, 07 Apr 2009 23:17:21 +0200
+
 libdbd-sqlite3-perl (1.19~10-1) unstable; urgency=low
 
   * New upstream release, contains a fix for "libdbd-sqlite3-perl - FTBFS:

Modified: trunk/libdbd-sqlite3-perl/lib/DBD/SQLite.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/lib/DBD/SQLite.pm?rev=32731&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/lib/DBD/SQLite.pm (original)
+++ trunk/libdbd-sqlite3-perl/lib/DBD/SQLite.pm Tue Apr  7 21:25:30 2009
@@ -1,6 +1,6 @@
 package DBD::SQLite;
 
-use 5.00503;
+use 5.006;
 use strict;
 use DBI   1.57 ();
 use DynaLoader ();
@@ -8,7 +8,7 @@
 use vars qw($VERSION @ISA);
 use vars qw{$err $errstr $drh $sqlite_version};
 BEGIN {
-    $VERSION = '1.19_10';
+    $VERSION = '1.20';
     @ISA     = ('DynaLoader');
 
     # Driver singleton
@@ -95,10 +95,6 @@
 
 sub _get_version {
     return( DBD::SQLite::db::FETCH($_[0], 'sqlite_version') );
-}
-
-sub disconnect {
-	$DB::single = 1;
 }
 
 my %info = (

Modified: trunk/libdbd-sqlite3-perl/t/12_unicode.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/t/12_unicode.t?rev=32731&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/t/12_unicode.t (original)
+++ trunk/libdbd-sqlite3-perl/t/12_unicode.t Tue Apr  7 21:25:30 2009
@@ -9,9 +9,9 @@
 	$^W = 1;
 }
 
+use t::lib::Test;
 use Test::More tests => 16;
 use Test::NoWarnings;
-use t::lib::Test;
 
 #
 #   Include std stuff

Modified: trunk/libdbd-sqlite3-perl/t/30_auto_rollback.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/t/30_auto_rollback.t?rev=32731&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/t/30_auto_rollback.t (original)
+++ trunk/libdbd-sqlite3-perl/t/30_auto_rollback.t Tue Apr  7 21:25:30 2009
@@ -8,10 +8,9 @@
 	$^W = 1;
 }
 
-my $have_nowarnings;
-BEGIN{ eval 'use Test::NoWarnings; $have_nowarnings = 1;' };
-use Test::More tests => 5+($have_nowarnings || 0);
 use t::lib::Test;
+use Test::More tests => 6;
+use Test::NoWarnings;
 
 SCOPE: {
 	my $dbh = connect_ok( RaiseError => 1, PrintWarn => 0 );

Modified: trunk/libdbd-sqlite3-perl/t/lib/Test.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/t/lib/Test.pm?rev=32731&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/t/lib/Test.pm (original)
+++ trunk/libdbd-sqlite3-perl/t/lib/Test.pm Tue Apr  7 21:25:30 2009
@@ -9,9 +9,12 @@
 
 use vars qw{$VERSION @ISA @EXPORT};
 BEGIN {
-	$VERSION = '1.19_10';
+	$VERSION = '1.20';
 	@ISA     = qw{ Exporter };
 	@EXPORT  = qw{ connect_ok };
+
+	# Allow tests to load modules bundled in /inc
+	unshift @INC, 'inc';
 }
 
 # Always load the DBI module

Modified: trunk/libdbd-sqlite3-perl/t/rt_21406_auto_finish.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/t/rt_21406_auto_finish.t?rev=32731&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/t/rt_21406_auto_finish.t (original)
+++ trunk/libdbd-sqlite3-perl/t/rt_21406_auto_finish.t Tue Apr  7 21:25:30 2009
@@ -6,11 +6,9 @@
 	$^W = 1;
 }
 
-my $have_nowarnings;
-BEGIN{ eval 'use Test::NoWarnings; $have_nowarnings = 1;' };
-use Test::More tests => 10+($have_nowarnings || 0);
-
 use t::lib::Test;
+use Test::More tests => 11;
+use Test::NoWarnings;
 
 SCOPE: {
 	my $dbh = connect_ok( RaiseError => 1 );

Modified: trunk/libdbd-sqlite3-perl/t/rt_29058_group_by.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/t/rt_29058_group_by.t?rev=32731&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/t/rt_29058_group_by.t (original)
+++ trunk/libdbd-sqlite3-perl/t/rt_29058_group_by.t Tue Apr  7 21:25:30 2009
@@ -5,11 +5,9 @@
     $^W = 1;
 }
 
-my $have_nowarnings;
-BEGIN{ eval 'use Test::NoWarnings; $have_nowarnings = 1;' };
-use Test::More tests => 5+($have_nowarnings || 0);
-
 use t::lib::Test;
+use Test::More tests => 6;
+use Test::NoWarnings;
 
 my $dbh = connect_ok();
 $dbh->do('CREATE TABLE foo (bar TEXT, num INT)');




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