[libdbix-class-perl] 03/09: Drop patches, all applied or fixed otherwise upstream.
gregor herrmann
gregoa at debian.org
Sat Feb 15 23:08:03 UTC 2014
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libdbix-class-perl.
commit d707c0700c862dd5eaa94ce01a09d928722396fb
Author: gregor herrmann <gregoa at debian.org>
Date: Sat Feb 15 23:55:12 2014 +0100
Drop patches, all applied or fixed otherwise upstream.
---
debian/patches/fix-doc-typos.patch | 141 ---------------------------------
debian/patches/pod-error.patch | 20 -----
debian/patches/series | 3 -
debian/patches/sqlite-exceptions.patch | 39 ---------
4 files changed, 203 deletions(-)
diff --git a/debian/patches/fix-doc-typos.patch b/debian/patches/fix-doc-typos.patch
deleted file mode 100644
index c5c1a87..0000000
--- a/debian/patches/fix-doc-typos.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Description: Fix documentation typos
-Bug: https://rt.cpan.org/Ticket/Display.html?id=85389
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=85389
-Author: Olly Betts <olly at survex.com>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-05-17
-
---- a/lib/DBIx/Class/Schema.pm
-+++ b/lib/DBIx/Class/Schema.pm
-@@ -1000,7 +1000,7 @@
-
- Clones the schema and its associated result_source objects and returns the
- copy. The resulting copy will have the same attributes as the source schema,
--except for those attributes explicitly overriden by the provided C<%attrs>.
-+except for those attributes explicitly overridden by the provided C<%attrs>.
-
- =cut
-
---- a/lib/DBIx/Class/Optional/Dependencies.pm
-+++ b/lib/DBIx/Class/Optional/Dependencies.pm
-@@ -897,7 +897,7 @@
- '=item Return Value: \%list_of_loaderrors_per_module',
- '=back',
- <<'EOD',
--Returns a hashref containing the actual errors that occured while attempting
-+Returns a hashref containing the actual errors that occurred while attempting
- to load each module in the requirement group.
- EOD
- '=head1 AUTHOR',
---- a/lib/DBIx/Class/Manual/Component.pod
-+++ b/lib/DBIx/Class/Manual/Component.pod
-@@ -27,7 +27,7 @@
-
- __PACKAGE__->load_components(qw/ +My::Component /);
-
--Once a component is loaded all of it's methods, or otherwise,
-+Once a component is loaded all of its methods, or otherwise,
- that it provides will be available in your class.
-
- The order in which is you load the components may be very
---- a/lib/DBIx/Class/Manual/Features.pod
-+++ b/lib/DBIx/Class/Manual/Features.pod
-@@ -258,7 +258,7 @@
-
- =head2 Populate
-
--Made for inserting lots of rows very quicky into database
-+Made for inserting lots of rows very quickly into database
-
- $schema->populate([ Users =>
- [qw( username password )],
-@@ -274,7 +274,7 @@
-
- =head2 Multicreate
-
--Create an object and it's related objects all at once
-+Create an object and its related objects all at once
-
- $schema->resultset('Author')->create({
- name => 'Stephen King',
---- a/lib/DBIx/Class/Manual/FAQ.pod
-+++ b/lib/DBIx/Class/Manual/FAQ.pod
-@@ -75,7 +75,7 @@
-
- =item .. use DBIx::Class across multiple databases?
-
--If your database server allows you to run querys across multiple
-+If your database server allows you to run queries across multiple
- databases at once, then so can DBIx::Class. All you need to do is make
- sure you write the database name as part of the
- L<DBIx::Class::ResultSource/table> call. Eg:
-@@ -314,7 +314,7 @@
-
- $row->discard_changes
-
--Discarding changes and refreshing from storage are two sides fo the same coin. When you
-+Discarding changes and refreshing from storage are two sides of the same coin. When you
- want to discard your local changes, just re-fetch the row from storage. When you want
- to get a new, fresh copy of the row, just re-fetch the row from storage.
- L<DBIx::Class::Row/discard_changes> does just that by re-fetching the row from storage
---- a/lib/DBIx/Class/Manual/Cookbook.pod
-+++ b/lib/DBIx/Class/Manual/Cookbook.pod
-@@ -1223,7 +1223,7 @@
-
- 1;
-
--By overridding the L<connection|DBIx::Class::Schama/connection>
-+By overriding the L<connection|DBIx::Class::Schama/connection>
- method and extracting a custom option from the provided \%attr hashref one can
- then simply iterate over all the Schema's ResultSources, renaming them as
- needed.
---- a/lib/DBIx/Class/Manual/Joining.pod
-+++ b/lib/DBIx/Class/Manual/Joining.pod
-@@ -17,12 +17,12 @@
- But I'll explain anyway. Assuming you have created your database in a
- more or less sensible way, you will end up with several tables that
- contain C<related> information. For example, you may have a table
--containing information about C<CD>s, containing the CD title and it's
-+containing information about C<CD>s, containing the CD title and its
- year of publication, and another table containing all the C<Track>s
- for the CDs, one track per row.
-
- When you wish to extract information about a particular CD and all
--it's tracks, You can either fetch the CD row, then make another query
-+its tracks, You can either fetch the CD row, then make another query
- to fetch the tracks, or you can use a join. Compare:
-
- SELECT ID, Title, Year FROM CD WHERE Title = 'Funky CD';
---- a/lib/DBIx/Class/Manual/Glossary.pod
-+++ b/lib/DBIx/Class/Manual/Glossary.pod
-@@ -127,7 +127,7 @@
-
- =head2 prefetch
-
--Similiar to a join, except the related result objects are fetched and
-+Similar to a join, except the related result objects are fetched and
- cached for future use, instead of used directly from the ResultSet. This
- allows you to jump to different relationships within a Result without
- worrying about generating a ton of extra SELECT statements.
---- a/lib/DBIx/Class/ResultSet.pm
-+++ b/lib/DBIx/Class/ResultSet.pm
-@@ -4643,7 +4643,7 @@
- =item dbic_colname
-
- Used to fill in missing sqlt_datatype and sqlt_size attributes (if they are
--explicitly specified they are never overriden). Also used by some weird DBDs,
-+explicitly specified they are never overridden). Also used by some weird DBDs,
- where the column name should be available at bind_param time (e.g. Oracle).
-
- =back
---- a/t/71mysql.t
-+++ b/t/71mysql.t
-@@ -210,7 +210,7 @@
- INNER JOIN `artist` `artist` ON `artist`.`artistid` = `me`.`artist`
- )',
- [],
-- 'overriden default join type works',
-+ 'overridden default join type works',
- );
- }
-
diff --git a/debian/patches/pod-error.patch b/debian/patches/pod-error.patch
deleted file mode 100644
index 6b1b3d2..0000000
--- a/debian/patches/pod-error.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: POD error about trailing whitespace in a link
-Author: Damyan Ivanov <dmn at debian.org>
-Forwarded: yes
-Bug: https://rt.cpan.org/Ticket/Display.html?id=92139
-
---- a/lib/DBIx/Class/Row.pm
-+++ b/lib/DBIx/Class/Row.pm
-@@ -48,9 +48,9 @@ relationship accessors of L<Result|DBIx:
- =head1 NOTE
-
- All "Row objects" derived from a Schema-attached L<DBIx::Class::ResultSet>
--object (such as a typical C<< L<search|DBIx::Class::ResultSet/search
-->->L<next|DBIx::Class::ResultSet/next> >> call) are actually Result
--instances, based on your application's
-+object (such as a typical C<<
-+L<search|DBIx::Class::ResultSet/search>->L<next|DBIx::Class::ResultSet/next> >>
-+call) are actually Result instances, based on your application's
- L<Result class|DBIx::Class::Manual::Glossary/Result_class>.
-
- L<DBIx::Class::Row> implements most of the row-based communication with the
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ece192c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-fix-doc-typos.patch
-sqlite-exceptions.patch
-pod-error.patch
diff --git a/debian/patches/sqlite-exceptions.patch b/debian/patches/sqlite-exceptions.patch
deleted file mode 100644
index fea4981..0000000
--- a/debian/patches/sqlite-exceptions.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: adapt to changes in sqlite3 errors when vialating a NOT NULL constraint
-Author: Damyan Ivanov <dmn at debian.org>
-Bug-Debian: https://bugs.debian.org/735024
-Bug: https://rt.cpan.org/Ticket/Display.html?id=92138
-Forwarded: yes
-
---- a/t/multi_create/standard.t
-+++ b/t/multi_create/standard.t
-@@ -444,7 +444,7 @@ throws_ok ( sub {
- #$t->cd($t->new_related('cd', { artist => undef } ) );
- #$t->{_rel_in_storage} = 0;
- $t->insert;
--}, qr/cd.artist may not be NULL/, "Exception propogated properly");
-+}, qr/cd.artist may not be NULL|NOT NULL constraint failed: cd.artist/, "Exception propogated properly");
-
- lives_ok ( sub {
- $schema->resultset('CD')->create ({
---- a/t/relationship/update_or_create_multi.t
-+++ b/t/relationship/update_or_create_multi.t
-@@ -69,7 +69,7 @@ throws_ok {
- year => 2020,
- title => 'the best thing since sliced bread',
- })
--} qr/\Qcd.artist may not be NULL/, 'ambiguous find + create failed';
-+} qr/\Qcd.artist may not be NULL\E|\QNOT NULL constraint failed: cd.artist/, 'ambiguous find + create failed';
-
- # expect a create, after a failed search using *only* the
- # *current* relationship and the unique column constraints
---- a/t/storage/error.t
-+++ b/t/storage/error.t
-@@ -15,7 +15,7 @@ warnings_are ( sub {
- sub {
- $schema->resultset('CD')->create({ title => 'vacation in antarctica' })
- },
-- qr/DBI Exception.+cd\.artist.+NULL/s
-+ qr/DBI Exception.+cd\.artist.+NULL|NOT NULL constraint failed: cd.artist/s
- ); # as opposed to some other error
- }, [], 'No warnings besides exception' );
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libdbix-class-perl.git
More information about the Pkg-perl-cvs-commits
mailing list