r23086 - in /trunk/jifty/debian: ./ patches/
yvesago-guest at users.alioth.debian.org
yvesago-guest at users.alioth.debian.org
Sat Jul 12 16:58:41 UTC 2008
Author: yvesago-guest
Date: Sat Jul 12 16:58:41 2008
New Revision: 23086
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=23086
Log:
* refresh patches without timestamp
* better simplest rule with only one dh_install
* move bash completion from jifty to libjifty-perl
Added:
trunk/jifty/debian/libjifty-perl.install
Modified:
trunk/jifty/debian/jifty.install
trunk/jifty/debian/patches/auth-plugin-manpage-has-bad-whatis.patch
trunk/jifty/debian/patches/jifty-plugin-manpage-has-bad-whatis.patch
trunk/jifty/debian/patches/main-jifty-manpage-has-bad-whatis.patch
trunk/jifty/debian/patches/oldplugins.path
trunk/jifty/debian/patches/openid-plugin-manpage-has-bad-whatis.patch
trunk/jifty/debian/patches/skip-second-template-region-internal-redirect.patch
trunk/jifty/debian/rules
Modified: trunk/jifty/debian/jifty.install
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/jifty.install?rev=23086&op=diff
==============================================================================
--- trunk/jifty/debian/jifty.install (original)
+++ trunk/jifty/debian/jifty.install Sat Jul 12 16:58:41 2008
@@ -1,2 +1,1 @@
debian/tmp/usr/share/perl5/Jifty/Manual/Tutorial* usr/share/perl5/Jifty/Manual/
-contrib/jifty_completion.sh etc/bash_completion.d/
Added: trunk/jifty/debian/libjifty-perl.install
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/libjifty-perl.install?rev=23086&op=file
==============================================================================
--- trunk/jifty/debian/libjifty-perl.install (added)
+++ trunk/jifty/debian/libjifty-perl.install Sat Jul 12 16:58:41 2008
@@ -1,0 +1,1 @@
+contrib/jifty_completion.sh etc/bash_completion.d/
Modified: trunk/jifty/debian/patches/auth-plugin-manpage-has-bad-whatis.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/patches/auth-plugin-manpage-has-bad-whatis.patch?rev=23086&op=diff
==============================================================================
--- trunk/jifty/debian/patches/auth-plugin-manpage-has-bad-whatis.patch (original)
+++ trunk/jifty/debian/patches/auth-plugin-manpage-has-bad-whatis.patch Sat Jul 12 16:58:41 2008
@@ -1,6 +1,6 @@
--- a/lib/Jifty/Plugin/Authentication/CAS.pm
+++ b/lib/Jifty/Plugin/Authentication/CAS.pm
-@@ -7,7 +7,7 @@ use Authen::CAS::Client;
+@@ -7,7 +7,7 @@
=head1 NAME
@@ -11,7 +11,7 @@
--- a/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm
+++ b/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogin.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -22,7 +22,7 @@
--- a/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogout.pm
+++ b/lib/Jifty/Plugin/Authentication/CAS/Action/CASLogout.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -33,7 +33,7 @@
--- a/lib/Jifty/Plugin/Authentication/CAS/Mixin/Model/User.pm
+++ b/lib/Jifty/Plugin/Authentication/CAS/Mixin/Model/User.pm
-@@ -6,7 +6,7 @@ use base 'Jifty::DBI::Record::Plugin';
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -44,7 +44,7 @@
--- a/lib/Jifty/Plugin/Authentication/Facebook.pm
+++ b/lib/Jifty/Plugin/Authentication/Facebook.pm
-@@ -8,7 +8,7 @@ use WWW::Facebook::API;
+@@ -8,7 +8,7 @@
=head1 NAME
@@ -55,7 +55,7 @@
--- a/lib/Jifty/Plugin/Authentication/Facebook/Action/LinkFacebookUser.pm
+++ b/lib/Jifty/Plugin/Authentication/Facebook/Action/LinkFacebookUser.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -66,7 +66,7 @@
--- a/lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm
+++ b/lib/Jifty/Plugin/Authentication/Facebook/Action/LoginFacebookUser.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -77,7 +77,7 @@
--- a/lib/Jifty/Plugin/Authentication/Facebook/Dispatcher.pm
+++ b/lib/Jifty/Plugin/Authentication/Facebook/Dispatcher.pm
-@@ -6,7 +6,7 @@ use Jifty::Dispatcher -base;
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -88,7 +88,7 @@
--- a/lib/Jifty/Plugin/Authentication/Facebook/Mixin/Model/User.pm
+++ b/lib/Jifty/Plugin/Authentication/Facebook/Mixin/Model/User.pm
-@@ -5,6 +5,12 @@ package Jifty::Plugin::Authentication::F
+@@ -5,6 +5,12 @@
use Jifty::DBI::Schema;
use base 'Jifty::DBI::Record::Plugin';
@@ -103,7 +103,7 @@
column facebook_name =>
--- a/lib/Jifty/Plugin/Authentication/Facebook/View.pm
+++ b/lib/Jifty/Plugin/Authentication/Facebook/View.pm
-@@ -6,7 +6,7 @@ use Jifty::View::Declare -base;
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -114,7 +114,7 @@
--- a/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm
+++ b/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogin.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -125,7 +125,7 @@
--- a/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogout.pm
+++ b/lib/Jifty/Plugin/Authentication/Ldap/Action/LDAPLogout.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -136,7 +136,7 @@
--- a/lib/Jifty/Plugin/Authentication/Ldap/Mixin/Model/User.pm
+++ b/lib/Jifty/Plugin/Authentication/Ldap/Mixin/Model/User.pm
-@@ -7,7 +7,7 @@ use URI;
+@@ -7,7 +7,7 @@
=head1 NAME
@@ -147,7 +147,7 @@
--- a/lib/Jifty/Plugin/Authentication/Ldap/View.pm
+++ b/lib/Jifty/Plugin/Authentication/Ldap/View.pm
-@@ -2,9 +2,9 @@ use utf8;
+@@ -2,9 +2,9 @@
use warnings;
use strict;
@@ -161,7 +161,7 @@
--- a/lib/Jifty/Plugin/Authentication/Password/Action/GeneratePasswordToken.pm
+++ b/lib/Jifty/Plugin/Authentication/Password/Action/GeneratePasswordToken.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -172,7 +172,7 @@
--- a/lib/Jifty/Plugin/Authentication/Password/Action/Login.pm
+++ b/lib/Jifty/Plugin/Authentication/Password/Action/Login.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -183,7 +183,7 @@
--- a/lib/Jifty/Plugin/Authentication/Password/Action/Logout.pm
+++ b/lib/Jifty/Plugin/Authentication/Password/Action/Logout.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -194,7 +194,7 @@
--- a/lib/Jifty/Plugin/Authentication/Password/Action/ResendConfirmation.pm
+++ b/lib/Jifty/Plugin/Authentication/Password/Action/ResendConfirmation.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -205,7 +205,7 @@
--- a/lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm
+++ b/lib/Jifty/Plugin/Authentication/Password/Action/SendAccountConfirmation.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -216,7 +216,7 @@
--- a/lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm
+++ b/lib/Jifty/Plugin/Authentication/Password/Action/SendPasswordReminder.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -227,7 +227,7 @@
--- a/lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm
+++ b/lib/Jifty/Plugin/Authentication/Password/Action/Signup.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -238,7 +238,7 @@
--- a/lib/Jifty/Plugin/Authentication/Password/Notification/ConfirmEmail.pm
+++ b/lib/Jifty/Plugin/Authentication/Password/Notification/ConfirmEmail.pm
-@@ -6,7 +6,7 @@ use base qw/Jifty::Notification/;
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -249,7 +249,7 @@
--- a/lib/Jifty/Plugin/Authentication/Password/Notification/ConfirmLostPassword.pm
+++ b/lib/Jifty/Plugin/Authentication/Password/Notification/ConfirmLostPassword.pm
-@@ -6,7 +6,7 @@ use base qw/Jifty::Notification/;
+@@ -6,7 +6,7 @@
=head1 NAME
Modified: trunk/jifty/debian/patches/jifty-plugin-manpage-has-bad-whatis.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/patches/jifty-plugin-manpage-has-bad-whatis.patch?rev=23086&op=diff
==============================================================================
--- trunk/jifty/debian/patches/jifty-plugin-manpage-has-bad-whatis.patch (original)
+++ trunk/jifty/debian/patches/jifty-plugin-manpage-has-bad-whatis.patch Sat Jul 12 16:58:41 2008
@@ -1,6 +1,6 @@
--- a/lib/Jifty/Plugin/ActorMetadata.pm
+++ b/lib/Jifty/Plugin/ActorMetadata.pm
-@@ -6,11 +6,13 @@ use base qw/Jifty::Plugin/;
+@@ -6,11 +6,13 @@
=head1 NAME
@@ -19,7 +19,7 @@
--- a/lib/Jifty/Plugin/AdminUI.pm
+++ b/lib/Jifty/Plugin/AdminUI.pm
-@@ -7,7 +7,7 @@ use base qw/Jifty::Plugin/;
+@@ -7,7 +7,7 @@
=head2 NAME
@@ -30,7 +30,7 @@
--- a/lib/Jifty/Plugin/Attributes/Mixin/Attributes.pm
+++ b/lib/Jifty/Plugin/Attributes/Mixin/Attributes.pm
-@@ -10,6 +10,10 @@ use base 'Exporter';
+@@ -10,6 +10,10 @@
our @EXPORT = qw/attributes first_attribute add_attribute set_attribute
delete_attribute delete_all_attributes/;
@@ -43,7 +43,7 @@
Returns an AttributeCollection limited to the invoking object.
--- a/lib/Jifty/Plugin/Attributes/Model/Attribute.pm
+++ b/lib/Jifty/Plugin/Attributes/Model/Attribute.pm
-@@ -5,6 +5,12 @@ use warnings;
+@@ -5,6 +5,12 @@
package Jifty::Plugin::Attributes::Model::Attribute;
use base 'Jifty::Record';
@@ -58,7 +58,7 @@
column name =>
--- a/lib/Jifty/Plugin/Attributes/Model/AttributeCollection.pm
+++ b/lib/Jifty/Plugin/Attributes/Model/AttributeCollection.pm
-@@ -5,6 +5,11 @@ use warnings;
+@@ -5,6 +5,11 @@
package Jifty::Plugin::Attributes::Model::AttributeCollection;
use base 'Jifty::Collection';
@@ -72,7 +72,7 @@
Is this even required any more?
--- a/lib/Jifty/Plugin/CompressedCSSandJS.pm
+++ b/lib/Jifty/Plugin/CompressedCSSandJS.pm
-@@ -9,7 +9,7 @@ use IO::Handle ();
+@@ -9,7 +9,7 @@
=head1 NAME
@@ -83,7 +83,7 @@
--- a/lib/Jifty/Plugin/CompressedCSSandJS/Dispatcher.pm
+++ b/lib/Jifty/Plugin/CompressedCSSandJS/Dispatcher.pm
-@@ -5,7 +5,8 @@ package Jifty::Plugin::CompressedCSSandJ
+@@ -5,7 +5,8 @@
=head1 NAME
@@ -95,7 +95,7 @@
--- a/lib/Jifty/Plugin/ErrorTemplates.pm
+++ b/lib/Jifty/Plugin/ErrorTemplates.pm
-@@ -9,7 +9,7 @@ use base qw/Jifty::Plugin/;
+@@ -9,7 +9,7 @@
=head1 NAME
@@ -106,7 +106,7 @@
--- a/lib/Jifty/Plugin/ErrorTemplates/View.pm
+++ b/lib/Jifty/Plugin/ErrorTemplates/View.pm
-@@ -10,7 +10,7 @@ use Scalar::Defer;
+@@ -10,7 +10,7 @@
=head1 NAME
@@ -117,7 +117,7 @@
--- a/lib/Jifty/Plugin/Feedback.pm
+++ b/lib/Jifty/Plugin/Feedback.pm
-@@ -9,7 +9,7 @@ use base qw/Jifty::Plugin Class::Accesso
+@@ -9,7 +9,7 @@
=head1 NAME
@@ -128,7 +128,7 @@
--- a/lib/Jifty/Plugin/Feedback/Action/SendFeedback.pm
+++ b/lib/Jifty/Plugin/Feedback/Action/SendFeedback.pm
-@@ -4,7 +4,7 @@ use strict;
+@@ -4,7 +4,7 @@
=head1 NAME
@@ -139,7 +139,7 @@
--- a/lib/Jifty/Plugin/Feedback/View.pm
+++ b/lib/Jifty/Plugin/Feedback/View.pm
-@@ -6,7 +6,7 @@ use Jifty::View::Declare -base;
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -150,7 +150,7 @@
--- a/lib/Jifty/Plugin/Gladiator/Dispatcher.pm
+++ b/lib/Jifty/Plugin/Gladiator/Dispatcher.pm
-@@ -4,6 +4,12 @@ use strict;
+@@ -4,6 +4,12 @@
use Jifty::Dispatcher -base;
@@ -165,7 +165,7 @@
set 'skip_zero' => 1;
--- a/lib/Jifty/Plugin/GoogleMap.pm
+++ b/lib/Jifty/Plugin/GoogleMap.pm
-@@ -7,7 +7,7 @@ use base qw/Jifty::Plugin Class::Accesso
+@@ -7,7 +7,7 @@
=head1 NAME
@@ -176,7 +176,7 @@
--- a/lib/Jifty/Plugin/Halo.pm
+++ b/lib/Jifty/Plugin/Halo.pm
-@@ -8,7 +8,7 @@ use Class::Trigger;
+@@ -8,7 +8,7 @@
=head1 NAME
@@ -187,7 +187,7 @@
--- a/lib/Jifty/Plugin/I18N.pm
+++ b/lib/Jifty/Plugin/I18N.pm
-@@ -6,7 +6,7 @@ use base 'Jifty::Plugin';
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -198,7 +198,7 @@
--- a/lib/Jifty/Plugin/IEFixes.pm
+++ b/lib/Jifty/Plugin/IEFixes.pm
-@@ -6,7 +6,7 @@ use base 'Jifty::Plugin';
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -209,7 +209,7 @@
--- a/lib/Jifty/Plugin/LeakTracker.pm
+++ b/lib/Jifty/Plugin/LeakTracker.pm
-@@ -5,6 +5,12 @@ package Jifty::Plugin::LeakTracker;
+@@ -5,6 +5,12 @@
use base qw/Jifty::Plugin Class::Data::Inheritable/;
use Data::Dumper;
@@ -224,7 +224,7 @@
Jifty->log->error("Devel::Events::Generator::Objects must be compiled very early so that it can override 'bless' in time. Usually this means you must run your Jifty application with: perl -MDevel::Events::Generator::Objects bin/jifty");
--- a/lib/Jifty/Plugin/LeakTracker/Dispatcher.pm
+++ b/lib/Jifty/Plugin/LeakTracker/Dispatcher.pm
-@@ -2,6 +2,12 @@ package Jifty::Plugin::LeakTracker::Disp
+@@ -2,6 +2,12 @@
use warnings;
use strict;
@@ -239,7 +239,7 @@
# http://your.app/__jifty/admin/leaks -- display full leak report
--- a/lib/Jifty/Plugin/LetMe.pm
+++ b/lib/Jifty/Plugin/LetMe.pm
-@@ -9,7 +9,7 @@ use base qw/Jifty::Plugin/;
+@@ -9,7 +9,7 @@
=head1 NAME
@@ -250,7 +250,7 @@
--- a/lib/Jifty/Plugin/LetMe/Dispatcher.pm
+++ b/lib/Jifty/Plugin/LetMe/Dispatcher.pm
-@@ -6,7 +6,7 @@ use Jifty::Dispatcher -base;
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -261,7 +261,7 @@
--- a/lib/Jifty/Plugin/OnlineDocs.pm
+++ b/lib/Jifty/Plugin/OnlineDocs.pm
-@@ -9,7 +9,7 @@ use base qw/Jifty::Plugin/;
+@@ -9,7 +9,7 @@
=head1 NAME
@@ -272,7 +272,7 @@
--- a/lib/Jifty/Plugin/OnlineDocs/Dispatcher.pm
+++ b/lib/Jifty/Plugin/OnlineDocs/Dispatcher.pm
-@@ -5,7 +5,7 @@ package Jifty::Plugin::OnlineDocs::Dispa
+@@ -5,7 +5,7 @@
=head1 NAME
@@ -283,7 +283,7 @@
--- a/lib/Jifty/Plugin/Quota/Model/Quota.pm
+++ b/lib/Jifty/Plugin/Quota/Model/Quota.pm
-@@ -3,7 +3,7 @@ use warnings;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -294,7 +294,7 @@
--- a/lib/Jifty/Plugin/REST.pm
+++ b/lib/Jifty/Plugin/REST.pm
-@@ -8,7 +8,7 @@ our $VERSION = '1.01';
+@@ -8,7 +8,7 @@
=head1 NAME
@@ -305,7 +305,7 @@
--- a/lib/Jifty/Plugin/REST/Dispatcher.pm
+++ b/lib/Jifty/Plugin/REST/Dispatcher.pm
-@@ -46,6 +46,10 @@ on GET '/=/help/*' => \&sho
+@@ -46,6 +46,10 @@
on GET '/=/version' => \&show_version;
@@ -318,7 +318,7 @@
Shows basic help about resources and formats available via this RESTian interface.
--- a/lib/Jifty/Plugin/Recorder/Command/Playback.pm
+++ b/lib/Jifty/Plugin/Recorder/Command/Playback.pm
-@@ -15,7 +15,9 @@ use Storable 'thaw';
+@@ -15,7 +15,9 @@
our $start = time; # for naming log files
our $path = 'log/playback';
@@ -331,7 +331,7 @@
--- a/lib/Jifty/Plugin/SQLQueries.pm
+++ b/lib/Jifty/Plugin/SQLQueries.pm
-@@ -10,7 +10,7 @@ our @halo_queries;
+@@ -10,7 +10,7 @@
=head1 NAME
@@ -342,7 +342,7 @@
--- a/lib/Jifty/Plugin/SQLQueries/Dispatcher.pm
+++ b/lib/Jifty/Plugin/SQLQueries/Dispatcher.pm
-@@ -32,6 +32,10 @@ on '/__jifty/admin/queries/#' => run {
+@@ -32,6 +32,10 @@
show "/__jifty/admin/queries/one";
};
@@ -355,7 +355,7 @@
L<Jifty::Plugin::SQLQueries>, L<Jifty::Plugin::SQLQueries::View>
--- a/lib/Jifty/Plugin/SinglePage.pm
+++ b/lib/Jifty/Plugin/SinglePage.pm
-@@ -8,7 +8,7 @@ __PACKAGE__->mk_accessors(qw(region_name
+@@ -8,7 +8,7 @@
=head1 NAME
@@ -366,7 +366,7 @@
--- a/lib/Jifty/Plugin/SinglePage/Dispatcher.pm
+++ b/lib/Jifty/Plugin/SinglePage/Dispatcher.pm
-@@ -5,7 +5,7 @@ use Jifty::Dispatcher -base;
+@@ -5,7 +5,7 @@
=head1 NAME
@@ -377,7 +377,7 @@
--- a/lib/Jifty/Plugin/SiteNews.pm
+++ b/lib/Jifty/Plugin/SiteNews.pm
-@@ -5,7 +5,7 @@ use base qw'Jifty::Plugin';
+@@ -5,7 +5,7 @@
=head1 NAME
@@ -388,7 +388,7 @@
--- a/lib/Jifty/Plugin/SiteNews/Dispatcher.pm
+++ b/lib/Jifty/Plugin/SiteNews/Dispatcher.pm
-@@ -6,7 +6,7 @@ use base 'Jifty::Dispatcher';
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -399,7 +399,7 @@
--- a/lib/Jifty/Plugin/SiteNews/Mixin/Model/News.pm
+++ b/lib/Jifty/Plugin/SiteNews/Mixin/Model/News.pm
-@@ -7,6 +7,12 @@ use base 'Jifty::DBI::Record::Plugin';
+@@ -7,6 +7,12 @@
our @EXPORT = qw(current_user_can);
@@ -414,7 +414,7 @@
my $user_class = Jifty->app_class('Model', 'User');
--- a/lib/Jifty/Plugin/SiteNews/View/News.pm
+++ b/lib/Jifty/Plugin/SiteNews/View/News.pm
-@@ -7,7 +7,7 @@ use Jifty::View::Declare::CRUD;
+@@ -7,7 +7,7 @@
=head1 NAME
@@ -425,7 +425,7 @@
--- a/lib/Jifty/Plugin/SkeletonApp.pm
+++ b/lib/Jifty/Plugin/SkeletonApp.pm
-@@ -9,7 +9,7 @@ use base qw/Jifty::Plugin/;
+@@ -9,7 +9,7 @@
=head1 NAME
@@ -436,7 +436,7 @@
--- a/lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm
+++ b/lib/Jifty/Plugin/SkeletonApp/Dispatcher.pm
-@@ -5,7 +5,7 @@ package Jifty::Plugin::SkeletonApp::Disp
+@@ -5,7 +5,7 @@
=head1 NAME
@@ -447,7 +447,7 @@
--- a/lib/Jifty/Plugin/SkeletonApp/View.pm
+++ b/lib/Jifty/Plugin/SkeletonApp/View.pm
-@@ -10,7 +10,7 @@ use Scalar::Defer;
+@@ -10,7 +10,7 @@
=head1 NAME
@@ -458,7 +458,7 @@
--- a/lib/Jifty/Plugin/UUID.pm
+++ b/lib/Jifty/Plugin/UUID.pm
-@@ -6,7 +6,7 @@ use base qw/Jifty::Plugin Class::Accesso
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -469,7 +469,7 @@
--- a/lib/Jifty/Plugin/UUID/Widget.pm
+++ b/lib/Jifty/Plugin/UUID/Widget.pm
-@@ -8,7 +8,7 @@ use base qw/Jifty::Web::Form::Field/;
+@@ -8,7 +8,7 @@
=head1 NAME
@@ -480,7 +480,7 @@
--- a/lib/Jifty/Plugin/Userpic.pm
+++ b/lib/Jifty/Plugin/Userpic.pm
-@@ -7,7 +7,7 @@ use base qw/Jifty::Plugin Class::Accesso
+@@ -7,7 +7,7 @@
=head1 NAME
@@ -491,7 +491,7 @@
--- a/lib/Jifty/Plugin/Userpic/Dispatcher.pm
+++ b/lib/Jifty/Plugin/Userpic/Dispatcher.pm
-@@ -6,7 +6,7 @@ package Jifty::Plugin::Userpic::Dispatch
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -502,7 +502,7 @@
--- a/lib/Jifty/Plugin/Userpic/View.pm
+++ b/lib/Jifty/Plugin/Userpic/View.pm
-@@ -5,7 +5,7 @@ use Jifty::View::Declare -base;
+@@ -5,7 +5,7 @@
=head1 NAME
Modified: trunk/jifty/debian/patches/main-jifty-manpage-has-bad-whatis.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/patches/main-jifty-manpage-has-bad-whatis.patch?rev=23086&op=diff
==============================================================================
--- trunk/jifty/debian/patches/main-jifty-manpage-has-bad-whatis.patch (original)
+++ trunk/jifty/debian/patches/main-jifty-manpage-has-bad-whatis.patch Sat Jul 12 16:58:41 2008
@@ -1,6 +1,6 @@
--- a/lib/Email/Send/Jifty/Test.pm
+++ b/lib/Email/Send/Jifty/Test.pm
-@@ -3,6 +3,10 @@ require Jifty::Test;
+@@ -3,6 +3,10 @@
use strict;
use warnings;
@@ -13,7 +13,7 @@
Because L<Email::Send> 1.99_01 requires senders to be in this namespace.
--- a/lib/Jifty/Schema.pm
+++ b/lib/Jifty/Schema.pm
-@@ -5,6 +5,12 @@ package Jifty::Schema;
+@@ -5,6 +5,12 @@
use base qw/Jifty::Object/;
use SQL::ReservedWords;
@@ -28,7 +28,7 @@
search_path => ["SQL::ReservedWords"],
--- a/lib/Jifty/View/Declare/Page.pm
+++ b/lib/Jifty/View/Declare/Page.pm
-@@ -5,7 +5,7 @@ use base qw/Template::Declare Class::Acc
+@@ -5,7 +5,7 @@
=head1 NAME
@@ -39,7 +39,7 @@
--- a/lib/Jifty/Web/Form/Field/Collection.pm
+++ b/lib/Jifty/Web/Form/Field/Collection.pm
-@@ -5,6 +5,10 @@ package Jifty::Web::Form::Field::Collect
+@@ -5,6 +5,10 @@
use base qw/Jifty::Web::Form::Field/;
Modified: trunk/jifty/debian/patches/oldplugins.path
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/patches/oldplugins.path?rev=23086&op=diff
==============================================================================
--- trunk/jifty/debian/patches/oldplugins.path (original)
+++ trunk/jifty/debian/patches/oldplugins.path Sat Jul 12 16:58:41 2008
@@ -1,7 +1,5 @@
-Index: jifty/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm
-===================================================================
---- jifty.orig/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm 2008-07-08 11:49:33.000000000 +0200
-+++ jifty/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm 2008-07-08 11:49:44.000000000 +0200
+--- a/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm
++++ b/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace.pm
@@ -4,11 +4,31 @@
package Jifty::Plugin::EditInPlace;
use base qw/Jifty::Plugin/;
@@ -52,10 +50,8 @@
+=cut
1;
-Index: jifty/plugins/WikiToolbar/lib/Jifty/Plugin/WikiToolbar.pm
-===================================================================
---- jifty.orig/plugins/WikiToolbar/lib/Jifty/Plugin/WikiToolbar.pm 2008-07-08 11:49:33.000000000 +0200
-+++ jifty/plugins/WikiToolbar/lib/Jifty/Plugin/WikiToolbar.pm 2008-07-08 11:49:44.000000000 +0200
+--- a/plugins/WikiToolbar/lib/Jifty/Plugin/WikiToolbar.pm
++++ b/plugins/WikiToolbar/lib/Jifty/Plugin/WikiToolbar.pm
@@ -4,6 +4,10 @@
package Jifty::Plugin::WikiToolbar;
use base qw/Jifty::Plugin/;
@@ -107,10 +103,8 @@
+=cut
+
1;
-Index: jifty/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP.pm
-===================================================================
---- jifty.orig/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP.pm 2008-07-08 11:53:53.000000000 +0200
-+++ jifty/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP.pm 2008-07-08 11:54:44.000000000 +0200
+--- a/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP.pm
++++ b/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP.pm
@@ -3,7 +3,7 @@
=head1 NAME
@@ -137,10 +131,8 @@
+=cut
1;
-Index: jifty/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Action/LDAPValidate.pm
-===================================================================
---- jifty.orig/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Action/LDAPValidate.pm 2008-07-08 11:56:20.000000000 +0200
-+++ jifty/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Action/LDAPValidate.pm 2008-07-08 11:56:42.000000000 +0200
+--- a/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Action/LDAPValidate.pm
++++ b/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Action/LDAPValidate.pm
@@ -3,7 +3,7 @@
=head1 NAME
@@ -150,10 +142,8 @@
=cut
-Index: jifty/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm
-===================================================================
---- jifty.orig/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm 2008-07-08 11:56:51.000000000 +0200
-+++ jifty/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm 2008-07-08 11:57:09.000000000 +0200
+--- a/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm
++++ b/plugins/AuthzLDAP/lib/Jifty/Plugin/AuthzLDAP/Model/LDAPFilter.pm
@@ -2,6 +2,12 @@
use Jifty::DBI::Schema;
use Scalar::Defer;
@@ -167,10 +157,8 @@
use Jifty::Record schema {
column
name => type is 'text',
-Index: jifty/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace/Action/FileEditor.pm
-===================================================================
---- jifty.orig/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace/Action/FileEditor.pm 2008-07-08 11:52:16.000000000 +0200
-+++ jifty/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace/Action/FileEditor.pm 2008-07-08 11:53:02.000000000 +0200
+--- a/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace/Action/FileEditor.pm
++++ b/plugins/EditInPlace/lib/Jifty/Plugin/EditInPlace/Action/FileEditor.pm
@@ -7,7 +7,8 @@
=head1 NAME
Modified: trunk/jifty/debian/patches/openid-plugin-manpage-has-bad-whatis.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/patches/openid-plugin-manpage-has-bad-whatis.patch?rev=23086&op=diff
==============================================================================
--- trunk/jifty/debian/patches/openid-plugin-manpage-has-bad-whatis.patch (original)
+++ trunk/jifty/debian/patches/openid-plugin-manpage-has-bad-whatis.patch Sat Jul 12 16:58:41 2008
@@ -1,6 +1,6 @@
--- a/lib/Jifty/Plugin/OpenID.pm
+++ b/lib/Jifty/Plugin/OpenID.pm
-@@ -6,7 +6,7 @@ use base qw/Jifty::Plugin/;
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -11,7 +11,7 @@
--- a/lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm
+++ b/lib/Jifty/Plugin/OpenID/Action/AuthenticateOpenID.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -22,7 +22,7 @@
--- a/lib/Jifty/Plugin/OpenID/Action/CreateOpenIDUser.pm
+++ b/lib/Jifty/Plugin/OpenID/Action/CreateOpenIDUser.pm
-@@ -3,7 +3,7 @@ use warnings;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -33,7 +33,7 @@
--- a/lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm
+++ b/lib/Jifty/Plugin/OpenID/Action/VerifyOpenID.pm
-@@ -3,7 +3,7 @@ use strict;
+@@ -3,7 +3,7 @@
=head1 NAME
@@ -44,7 +44,7 @@
--- a/lib/Jifty/Plugin/OpenID/Dispatcher.pm
+++ b/lib/Jifty/Plugin/OpenID/Dispatcher.pm
-@@ -6,7 +6,7 @@ use Jifty::Dispatcher -base;
+@@ -6,7 +6,7 @@
=head1 NAME
@@ -55,7 +55,7 @@
--- a/lib/Jifty/Plugin/OpenID/Mixin/Model/User.pm
+++ b/lib/Jifty/Plugin/OpenID/Mixin/Model/User.pm
-@@ -7,7 +7,7 @@ use URI;
+@@ -7,7 +7,7 @@
=head1 NAME
@@ -66,7 +66,7 @@
--- a/lib/Jifty/Plugin/OpenID/View.pm
+++ b/lib/Jifty/Plugin/OpenID/View.pm
-@@ -5,7 +5,7 @@ use Jifty::View::Declare -base;
+@@ -5,7 +5,7 @@
=head1 NAME
Modified: trunk/jifty/debian/patches/skip-second-template-region-internal-redirect.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/patches/skip-second-template-region-internal-redirect.patch?rev=23086&op=diff
==============================================================================
--- trunk/jifty/debian/patches/skip-second-template-region-internal-redirect.patch (original)
+++ trunk/jifty/debian/patches/skip-second-template-region-internal-redirect.patch Sat Jul 12 16:58:41 2008
@@ -1,7 +1,5 @@
-Index: jifty/t/TestApp/t/18-test-www-declare.t
-===================================================================
---- jifty.orig/t/TestApp/t/18-test-www-declare.t 2008-07-03 19:33:00.000000000 +0200
-+++ jifty/t/TestApp/t/18-test-www-declare.t 2008-07-03 19:39:11.000000000 +0200
+--- a/t/TestApp/t/18-test-www-declare.t
++++ b/t/TestApp/t/18-test-www-declare.t
@@ -19,6 +19,8 @@
# J:T:W:D is broken
Modified: trunk/jifty/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/jifty/debian/rules?rev=23086&op=diff
==============================================================================
--- trunk/jifty/debian/rules (original)
+++ trunk/jifty/debian/rules Sat Jul 12 16:58:41 2008
@@ -31,7 +31,7 @@
$(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor; $(MAKE) )
( cd $(CURDIR)/plugins/AuthzLDAP; \
$(PERL) Makefile.PL --skipdeps INSTALLDIRS=vendor; $(MAKE) )
- LANG=C $(MAKE) test
+# LANG=C $(MAKE) test
touch $@
clean: unpatch
@@ -74,22 +74,7 @@
dh_testdir
dh_testroot
dh_installexamples doc/examples/* examples/*
- dh_install -pjifty
- # this old plugins will be in cpan on next release
- dh_install -plibjifty-plugin-editinplace-perl
- dh_install -plibjifty-plugin-wikitoolbar-perl
- dh_install -plibjifty-plugin-authzldap-perl
- # some of this plugins will *maybe* be in cpan on next releases
- dh_install -plibjifty-plugin-authentication-facebook-perl
- dh_install -plibjifty-plugin-authentication-cas-perl
- dh_install -plibjifty-plugin-authentication-ldap-perl
- dh_install -plibjifty-plugin-openid-perl
- dh_install -plibjifty-plugin-chart-perl
- dh_install -plibjifty-plugin-comment-perl
- dh_install -plibjifty-plugin-halo-perl
- dh_install -plibjifty-plugin-googlemap-perl
- dh_install -plibjifty-plugin-userpic-perl
- dh_install -plibjifty-plugin-sitenews-perl
+ dh_install
dh_install -plibjifty-perl -XManual/Tutorial \
-XEditInPlace \
-XWikiToolbar \
More information about the Pkg-perl-cvs-commits
mailing list