r26248 - in /trunk/librose-db-perl: Changes META.yml Makefile.PL debian/changelog debian/control debian/copyright debian/rules lib/Rose/DB.pm lib/Rose/DB/Oracle.pm t/rosedbrc t/setup.t
rmayorga-guest at users.alioth.debian.org
rmayorga-guest at users.alioth.debian.org
Sun Oct 26 07:11:25 UTC 2008
Author: rmayorga-guest
Date: Sun Oct 26 07:10:52 2008
New Revision: 26248
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=26248
Log:
* New upstream release
* debian/control
+ Add myslef as uploader
+ move perl from B-D to B-D-I
+ wrap long lines
* debian/rules - refresh using dh-make-perl templates
* debian/copyright
+ convert to (new)format
+ refresh Upstream's copyright year
Modified:
trunk/librose-db-perl/Changes
trunk/librose-db-perl/META.yml
trunk/librose-db-perl/Makefile.PL
trunk/librose-db-perl/debian/changelog
trunk/librose-db-perl/debian/control
trunk/librose-db-perl/debian/copyright
trunk/librose-db-perl/debian/rules
trunk/librose-db-perl/lib/Rose/DB.pm
trunk/librose-db-perl/lib/Rose/DB/Oracle.pm
trunk/librose-db-perl/t/rosedbrc
trunk/librose-db-perl/t/setup.t
Modified: trunk/librose-db-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/Changes?rev=26248&op=diff
==============================================================================
--- trunk/librose-db-perl/Changes (original)
+++ trunk/librose-db-perl/Changes Sun Oct 26 07:10:52 2008
@@ -1,3 +1,12 @@
+0.747 (10.22.2008) - Justin Ellison <justin at techadvise.com>
+
+ * Changed to require YAML instead of YAML::Syck, though YAML::Syck
+ will be used in preference to YAML if it's present. (RT 31535)
+
+0.746 (09.16.2008) - Justin Ellison <justin at techadvise.com>
+
+ * Fixed support for TIMESTAMP WITH TIME ZONE column in Oracle.
+
0.745 (09.12.2008) - John Siracusa <siracusa at gmail.com>
* Added support for Oracle date/time column keywords.
Modified: trunk/librose-db-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/META.yml?rev=26248&op=diff
==============================================================================
--- trunk/librose-db-perl/META.yml (original)
+++ trunk/librose-db-perl/META.yml Sun Oct 26 07:10:52 2008
@@ -1,25 +1,36 @@
--- #YAML:1.0
-name: Rose-DB
-version: 0.745
-abstract: ~
-license: ~
-author: ~
-generated_by: ExtUtils::MakeMaker version 6.44
-distribution_type: module
-requires:
- Bit::Vector::Overload: 6.4
- Clone::PP: 0
- DateTime::Duration: 0
- DateTime::Format::MySQL: 0
- DateTime::Format::Pg: 0.11
- DBI: 0
- Rose::DateTime::Util: 0.532
- Rose::Object: 0.82
- Scalar::Util: 0
- SQL::ReservedWords: 0
- Test::More: 0
- Time::Clock: 0
- YAML::Syck: 0
+name: Rose-DB
+version: 0.747
+abstract: ~
+author: []
+license: perl
+distribution_type: module
+configure_requires:
+ ExtUtils::MakeMaker: 0
+requires:
+ Bit::Vector::Overload: 6.4
+ Clone::PP: 0
+ DateTime::Duration: 0
+ DateTime::Format::MySQL: 0
+ DateTime::Format::Pg: 0.11
+ DBI: 0
+ Rose::DateTime::Util: 0.532
+ Rose::Object: 0.82
+ Scalar::Util: 0
+ SQL::ReservedWords: 0
+ Test::More: 0
+ Time::Clock: 0
+resources:
+ bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=Rose-DB
+ homepage: http://rose.googlecode.com/
+ license: http://dev.perl.org/licenses/
+ MailingList: http://groups.google.com/group/rose-db-object
+ repository: http://rose.googlecode.com/svn/trunk/modules/Rose-DB
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.47_02
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.3.html
- version: 1.3
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: trunk/librose-db-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/Makefile.PL?rev=26248&op=diff
==============================================================================
--- trunk/librose-db-perl/Makefile.PL (original)
+++ trunk/librose-db-perl/Makefile.PL Sun Oct 26 07:10:52 2008
@@ -1,6 +1,14 @@
require 5.006;
use ExtUtils::MakeMaker;
+
+my $MM_Version = $ExtUtils::MakeMaker::VERSION;
+
+if($MM_Version =~ /_/) # dev version
+{
+ $MM_Version = eval $MM_Version;
+ die $@ if($@);
+}
WriteMakefile(NAME => 'Rose::DB',
PMLIBDIRS => [ 'lib' ],
@@ -20,7 +28,20 @@
'Rose::DateTime::Util' => 0.532,
'Time::Clock' => 0,
'SQL::ReservedWords' => 0,
- 'YAML::Syck' => 0,
'Scalar::Util' => 0,
},
- clean => { FILES => "t/*.db" });
+ clean => { FILES => "t/*.db" },
+ ($MM_Version >= 6.48 ? (MIN_PERL_VERSION => '5.6.0') : ()),
+ ($MM_Version >= 6.31 ? (LICENSE => 'perl') : ()),
+ ($MM_Version <= 6.44 ? () :
+ (META_MERGE =>
+ {
+ resources =>
+ {
+ license => 'http://dev.perl.org/licenses/',
+ homepage => 'http://rose.googlecode.com/',
+ bugtracker => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=Rose-DB',
+ repository => 'http://rose.googlecode.com/svn/trunk/modules/Rose-DB',
+ MailingList => 'http://groups.google.com/group/rose-db-object',
+ },
+ })));
Modified: trunk/librose-db-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/debian/changelog?rev=26248&op=diff
==============================================================================
--- trunk/librose-db-perl/debian/changelog (original)
+++ trunk/librose-db-perl/debian/changelog Sun Oct 26 07:10:52 2008
@@ -1,3 +1,17 @@
+librose-db-perl (0.747-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control
+ + Add myslef as uploader
+ + move perl from B-D to B-D-I
+ + wrap long lines
+ * debian/rules - refresh using dh-make-perl templates
+ * debian/copyright
+ + convert to (new)format
+ + refresh Upstream's copyright year
+
+ -- Rene Mayorga <rmayorga at debian.org.sv> Sun, 26 Oct 2008 00:36:18 -0600
+
librose-db-perl (0.745-1) unstable; urgency=low
* New upstream release
Modified: trunk/librose-db-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/debian/control?rev=26248&op=diff
==============================================================================
--- trunk/librose-db-perl/debian/control (original)
+++ trunk/librose-db-perl/debian/control Sun Oct 26 07:10:52 2008
@@ -1,9 +1,13 @@
Source: librose-db-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl (>= 5.8.8-7), libdatetime-format-mysql-perl, libyaml-syck-perl, libbit-vector-perl (>= 6.4), libdatetime-perl, libdatetime-format-pg-perl (>= 0.11), libdbi-perl, libsql-reservedwords-perl, librose-datetime-perl, libclone-pp-perl, libtime-clock-perl
-Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>
+Build-Depends: debhelper (>= 7), perl (>= 5.8.8-7)
+Build-Depends-Indep: libdatetime-format-mysql-perl, libyaml-syck-perl,
+ libbit-vector-perl (>= 6.4), libdatetime-perl,
+ libdatetime-format-pg-perl (>= 0.11), libdbi-perl, libsql-reservedwords-perl,
+ librose-datetime-perl, libclone-pp-perl, libtime-clock-perl
+Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
+ Rene Mayorga <rmayorga at debian.org.sv>
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Homepage: http://search.cpan.org/dist/Rose::DB/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/librose-db-perl/
@@ -13,7 +17,11 @@
Package: librose-db-perl
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libdatetime-format-mysql-perl, libyaml-syck-perl, libbit-vector-perl (>= 6.4), libdatetime-perl, libdatetime-format-pg-perl (>= 0.11), libdbi-perl, libsql-reservedwords-perl, librose-datetime-perl, libclone-pp-perl, libtime-clock-perl
+Depends: ${perl:Depends}, ${misc:Depends}, libdatetime-format-mysql-perl,
+ libyaml-syck-perl, libbit-vector-perl (>= 6.4), libdatetime-perl,
+ libdatetime-format-pg-perl (>= 0.11), libdbi-perl,
+ libsql-reservedwords-perl, librose-datetime-perl, libclone-pp-perl,
+ libtime-clock-perl
Description: A DBI wrapper and abstraction layer
Rose::DB is a wrapper and abstraction layer for DBI-related functionality.
A Rose::DB object "has a" DBI object; it is not a subclass of DBI.
Modified: trunk/librose-db-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/debian/copyright?rev=26248&op=diff
==============================================================================
--- trunk/librose-db-perl/debian/copyright (original)
+++ trunk/librose-db-perl/debian/copyright Sun Oct 26 07:10:52 2008
@@ -1,25 +1,29 @@
-This is the debian package for the Rose-DB module.
-It was created by Krzysztof Krzyzaniak (eloy) <eloy at debian.org> using dh-make-perl.
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: John C. Siracusa <siracusa at mindspring.com>
+Upstream-Source: http://search.cpan.org/dist/Rose-DB/
+Upstream-Name: Rose-DB
-It was downloaded from http://search.cpan.org/dist/Rose-DB/
+Files: *
+Copyright: 2007-2008 John C. Siracusa <siracusa at mindspring.com>
+License-Alias: Perl
+License: Artistic | GPL-1+
-The upstream author is:
+Files: debian/*
+Copyright: 2007-2008, various members of the Debian Perl Group, cf.
+ debian/changelog
+License: Artistic | GPL-1+
-John C. Siracusa (siracusa at mindspring.com).
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in /usr/share/common-licenses/Artistic
-Copyright (c) 2007 by John C. Siracusa. All rights reserved.
-
-This program is free software, you can redistribute it and/or modify it under
-the same terms as Perl itself.
-
-Perl is distributed under licenses:
-
- a) the GNU General Public License as published by the Free Software
- Foundation; either version 1, or (at your option) any later
- version, or
-
- b) the "Artistic License" which comes with Perl.
-
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in /usr/share/common-licenses/GPL' and
- the Artistic Licence in /usr/share/common-licenses/Artistic'.
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
Modified: trunk/librose-db-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/debian/rules?rev=26248&op=diff
==============================================================================
--- trunk/librose-db-perl/debian/rules (original)
+++ trunk/librose-db-perl/debian/rules Sun Oct 26 07:10:52 2008
@@ -1,18 +1,23 @@
#!/usr/bin/make -f
-build:
+build: build-stamp
+build-stamp:
dh build
+ touch $@
clean:
- dh clean
+ dh $@
-install: build
+install: install-stamp
+install-stamp: build-stamp
dh install
+ touch $@
-binary-arch: install
- # nothing
+binary-arch:
binary-indep: install
- dh binary-indep
+ dh $@
binary: binary-arch binary-indep
+
+.PHONY: binary binary-arch binary-indep install clean build
Modified: trunk/librose-db-perl/lib/Rose/DB.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/lib/Rose/DB.pm?rev=26248&op=diff
==============================================================================
--- trunk/librose-db-perl/lib/Rose/DB.pm (original)
+++ trunk/librose-db-perl/lib/Rose/DB.pm Sun Oct 26 07:10:52 2008
@@ -20,7 +20,7 @@
our $Error;
-our $VERSION = '0.745';
+our $VERSION = '0.747';
our $Debug = 0;
@@ -2186,16 +2186,34 @@
# g3db:
# password: myothersecret
+our $YAML_Class;
+
sub load_yaml_fixup_file
{
my($class, $file) = @_;
my $registry = $class->registry;
- require YAML::Syck;
+ unless($YAML_Class)
+ {
+ eval { require YAML::Syck };
+
+ if($@)
+ {
+ require YAML;
+ #warn "# Using YAML\n";
+ $YAML_Class = 'YAML';
+ }
+ else
+ {
+ #warn "# Using YAML::Syck\n";
+ $YAML_Class = 'YAML::Syck';
+ }
+ }
$Debug && warn "$class - Loading fixups from $file...\n";
- my @data = YAML::Syck::LoadFile($file);
+ no strict 'refs';
+ my @data = &{"${YAML_Class}::LoadFile"}($file);
foreach my $data (@data)
{
@@ -2607,7 +2625,9 @@
The path to the fix-up file is determined by the C<ROSEDBRC> environment variable. If this variable is not set, or if the file it points to does not exist, then it defaults to C</etc/rosedbrc>.
-This file should be in YAML format with the following structure:
+This file should be in YAML format. To read this file, you must have either L<YAML::Syck> or some reasonably modern version of L<YAML> installed (0.66 or later recommended). L<YAML::Syck> will be preferred if both are installed.
+
+The C<ROSEDBRC> file's contents have the following structure:
---
somedomain:
Modified: trunk/librose-db-perl/lib/Rose/DB/Oracle.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/lib/Rose/DB/Oracle.pm?rev=26248&op=diff
==============================================================================
--- trunk/librose-db-perl/lib/Rose/DB/Oracle.pm (original)
+++ trunk/librose-db-perl/lib/Rose/DB/Oracle.pm Sun Oct 26 07:10:52 2008
@@ -8,7 +8,7 @@
our $Debug = 0;
-our $VERSION = '0.745';
+our $VERSION = '0.746';
use Rose::Class::MakeMethods::Generic
(
@@ -19,7 +19,8 @@
(
[
q(ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'),
- q(ALTER SESSION SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SSxFF')
+ q(ALTER SESSION SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SSxFF'),
+ q(ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SSxFF')
]
);
@@ -345,6 +346,7 @@
ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'
ALTER SESSION SET NLS_TIMESTAMP_FORMAT='YYYY-MM-DD HH24:MI:SSxFF'
+ ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SSxFF'
These statements enable date/time column value parsing and formatting to work correctly.
Modified: trunk/librose-db-perl/t/rosedbrc
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/rosedbrc?rev=26248&op=diff
==============================================================================
--- trunk/librose-db-perl/t/rosedbrc (original)
+++ trunk/librose-db-perl/t/rosedbrc Sun Oct 26 07:10:52 2008
@@ -6,4 +6,4 @@
otherdomain:
othertype:
host: othervalue
- port: 1234
+ port: 1234
Modified: trunk/librose-db-perl/t/setup.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-db-perl/t/setup.t?rev=26248&op=diff
==============================================================================
--- trunk/librose-db-perl/t/setup.t (original)
+++ trunk/librose-db-perl/t/setup.t Sun Oct 26 07:10:52 2008
@@ -6,7 +6,18 @@
use lib "$Bin/lib";
-use Test::More tests => 4;
+use Test::More;
+
+eval { require YAML::Syck };
+
+if($@)
+{
+ eval { require YAML };
+
+ plan(skip_all => 'YAML or YAML::Syck required for setup tests') if($@);
+}
+
+Test::More->import(tests => 4);
$ENV{'ROSEDBRC'} = "$Bin/rosedbrc";
$ENV{'ROSEDB_DEVINIT'} = rand > 0.5 ? 'My::FixUp' : "$Bin/lib/My/FixUp.pm";
More information about the Pkg-perl-cvs-commits
mailing list