[Jifty-commit] r2213 - in jifty/branches/template-declare: . debian

[jifty-commit at lists.jifty.org]

Author: audreyt
Date: Wed Nov 29 03:34:10 2006
New Revision: 2213

Modified:
   jifty/branches/template-declare/   (props changed)
   jifty/branches/template-declare/Makefile.PL
   jifty/branches/template-declare/debian/control
   jifty/branches/template-declare/lib/Jifty/Action.pm
   jifty/branches/template-declare/lib/Jifty/DateTime.pm

Log:
* Merge again from trunk to t-d branch.* Merge again from trunk to t-d branch.* Merge again from trunk to t-d branch.* Merge again from trunk to t-d branch.* Merge again from trunk to t-d branch.* Merge again from trunk to t-d branch.* Merge again from trunk to t-d branch.* Merge again from trunk to t-d branch.

Modified: jifty/branches/template-declare/Makefile.PL
==============================================================================
--- jifty/branches/template-declare/Makefile.PL	(original)
+++ jifty/branches/template-declare/Makefile.PL	Wed Nov 29 03:34:10 2006
@@ -14,7 +14,7 @@
 requires('Crypt::Rijndael');
 requires('Compress::Zlib');
 requires('CSS::Squish' => 0.05 );
-#requires('DBD::SQLite' => 1.11 );
+requires('DBD::SQLite' => 1.11 );
 requires('Data::Page');
 requires('DateTime');
 requires('Date::Manip');

Modified: jifty/branches/template-declare/debian/control
==============================================================================
--- jifty/branches/template-declare/debian/control	(original)
+++ jifty/branches/template-declare/debian/control	Wed Nov 29 03:34:10 2006
@@ -46,36 +46,42 @@
 Package: libjifty-perl
 Section: perl
 Architecture: all
-Depends: ${perl:Depends}, libapp-cli-perl (>> 0.03),
- libcache-cache-perl, libcalendar-simple-perl,
- libclass-accessor-perl, libclass-container-perl,
- libclass-data-inheritable-perl,
- libcgi-cookie-splitter-perl, libcrypt-cbc-perl,
- libcrypt-rijndael-perl, libcompress-zlib-perl,
- libcss-squish-perl (>> 0.05), libdata-page-perl,
+Depends: ${perl:Depends},Depends: ${perl:Depends},perl (>> 5.8.3),
+ libapp-cli-perl (>> 0.03), libcache-cache-perl,
+ libcalendar-simple-perl, libclass-accessor-perl,
+ libclass-container-perl, libclass-data-inheritable-perl,
+ perl-modules, libcgi-cookie-splitter-perl,
+ libcrypt-cbc-perl, libcrypt-rijndael-perl,
+ libcompress-zlib-perl, libcss-squish-perl (>>
+ 0.05), libdbd-sqlite3-perl, libdata-page-perl,
  libdatetime-perl, libdate-manip-perl, libemail-folder-perl,
  libemail-localdelivery-perl, libemail-mime-perl,
  libemail-mime-creator-perl, libemail-mime-contenttype-perl,
- libemail-send-perl (>> 1.99_01),
- libemail-simple-perl, libemail-simple-creator-perl,
- libexporter-lite-perl, libfile-find-rule-perl,
- libfile-mmagic-perl, libfile-sharedir-perl (>> 0.04),
- libhtml-lint-perl, libhtml-mason-perl (>> 1.3101),
- libhttp-server-simple-perl (>> 0.20),
- libhttp-server-simple-recorder-perl, libhash-merge-perl,
- libhook-lexwrap-perl, libipc-pubsub-perl (>> 0.11),
- liblocale-maketext-lexicon-perl (>>0.60), liblog-log4perl-perl,
- libmime-types-perl,libmodule-pluggable-perl (>> 2.95),
- libmodule-corelist-perl, libmodule-scandeps-perl,
- libobject-declare-perl (>> 0.13), libparams-validate-perl,
- libscalar-defer-perl (>> 0.06), libstring-koremutake-perl,
- libsql-reservedwords-perl, libuniversal-require-perl,
- liburi-perl, libxml-simple-perl, libxml-xpath-perl,
- libversion-perl, libyaml-perl (>> 0.35), libyaml-syck-perl (>> 0.67)
- libcgi-perl, libhtml-parser-perl, libwww-perl,
- libjifty-dbi-perl (>> 0.29), libxml-writer-perl (>> 0.600)
-Recommends: libdbd-sqlite3-perl, libwww-mechanize-perl,
- libmodule-refresh-perl (>> 0.09)
+ libemail-send-perl (>> 1.99_01), libemail-simple-perl,
+ libemail-simple-creator-perl, libexporter-lite-perl,
+ libfile-find-rule-perl, libfile-mmagic-perl,
+ libfile-sharedir-perl (>> 0.04), libhtml-parser-perl,
+ libhtml-lint-perl, libhtml-mason-perl (>>
+ 1.3101), libwww-perl, libhttp-server-simple-perl
+ (>> 0.20), libhttp-server-simple-recorder-perl,
+ libhash-merge-perl, libhook-lexwrap-perl,
+ libipc-pubsub-perl (>> 0.11), libjifty-dbi-perl (>> 0.29),
+ liblocale-maketext-lexicon-perl, liblog-log4perl-perl,
+ libmime-types-perl, libmodule-pluggable-perl (>> 2.95),
+ libmodule-corelist-perl, libmodule-refresh-perl,
+ libmodule-scandeps-perl, libobject-declare-perl (>> 0.13),
+ libparams-validate-perl, libscalar-defer-perl (>> 0.06),
+ libstring-koremutake-perl, libsql-reservedwords-perl,
+ libtest-base-perl, libuniversal-require-perl, liburi-perl,
+ libxml-writer-perl (>> 0.601), libxml-simple-perl,
+ libxml-xpath-perl, libversion-perl, libyaml-syck-perl (>>
+ 0.71), libyaml-perl (>> 0.35), libjson-perl (>> 0.01),
+ libpod-simple-perl
+Recommends: libmodule-install-perl,
+ libtest-pod-coverage-perl, libtest-www-mechanize-perl
+ (>> 1.04), libwww-mechanize-perl (>> 1.12),
+ libclass-accessor-named-perl, libdevel-cover-perl,
+ libmodule-install-perl, libpar-dist-fromcpan-perl
 Description: Jifty perl libraries
  Yet another web framework.
  .

Modified: jifty/branches/template-declare/lib/Jifty/Action.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/Action.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/Action.pm	Wed Nov 29 03:34:10 2006
@@ -552,7 +552,10 @@
 Create and render a button.  It functions nearly identically like
 L<Jifty::Web/link>, except it takes C<arguments> in addition to
 C<parameters>, and defaults to submitting this L<Jifty::Action>.
-Returns nothing.
+Returns nothing. 
+
+Recommended reading: L<Jifty::Web::Form::Element>, where most of 
+the cool options to button and other things of its ilk are documented.
 
 =cut
 

Modified: jifty/branches/template-declare/lib/Jifty/DateTime.pm
==============================================================================
--- jifty/branches/template-declare/lib/Jifty/DateTime.pm	(original)
+++ jifty/branches/template-declare/lib/Jifty/DateTime.pm	Wed Nov 29 03:34:10 2006
@@ -79,7 +79,7 @@
         if($string =~ /^\s* (?:monday|tuesday|wednesday|thursday|friday|saturday|sunday)$/xi) {
             $string = "next $string";
         }
-        local $ENV{'TZ'} = "GMT";
+        Date::Manip::Date_Init("TZ=GMT");
         $now = Date::Manip::UnixDate( $string, "%o" );
     }
     return undef unless $now;