This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository libflickr-upload-perl.
commit 95d3d433d2c524e224740a88b46ef0a27947cabc Author: gregor herrmann <[email protected]> Date: Sun Sep 14 13:16:07 2014 +0200 Drop patches, merged upstream. --- debian/patches/failupload.patch | 16 --------- .../patches/manpage-has-errors-from-pod2man.patch | 38 ---------------------- debian/patches/series | 2 -- 3 files changed, 56 deletions(-) diff --git a/debian/patches/failupload.patch b/debian/patches/failupload.patch deleted file mode 100644 index c20c207..0000000 --- a/debian/patches/failupload.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Alex Muntada <[email protected]> -Description: Fixes dubious test when network is unavailable - Already merged upstream in - http://gitorious.org/projects/flickrupload/repos/mainline/commits/687838e8b1f5a8d1d533ae10a04b7aa72be4b539 - ---- a/Upload.pm -+++ b/Upload.pm -@@ -270,6 +270,8 @@ - - my $res = $self->request( $req ); - -+ return () unless defined $res; -+ - my $tree = XML::Parser::Lite::Tree::instance()->parse($res->decoded_content()); - return () unless defined $tree; - diff --git a/debian/patches/manpage-has-errors-from-pod2man.patch b/debian/patches/manpage-has-errors-from-pod2man.patch deleted file mode 100644 index 83722c7..0000000 --- a/debian/patches/manpage-has-errors-from-pod2man.patch +++ /dev/null @@ -1,38 +0,0 @@ -Author: Alex Muntada <[email protected]> -Description: fixes issues with =back in flickr_upload POD - Already merged upstream in - http://gitorious.org/projects/flickrupload/repos/mainline/commits/36f2a4434770d8cbdcdbceee985fc19d4bc3f9f9 - ---- a/flickr_upload -+++ b/flickr_upload -@@ -357,6 +357,10 @@ - Set to 1 to keep the photo in global search results, 2 to hide from public - earches. - -+=back -+ -+Note that options unknown to Flickr will result in undefined behaviour. -+ - =item --check - - Checks the authentication token via the flickr.auth.checkToken API call. -@@ -368,10 +372,6 @@ - Display a progress bar for each upload with L<Term::ProgressBar>. That - optional module will have to be installed on the system. - --=back 4 -- --Note that options unknown to Flickr will result in undefined behaviour. -- - =item --key <api_key> - - =item --secret <secret> -@@ -399,6 +399,8 @@ - wait around for that to complete, but be aware that delays of upwards - of thirty minutes have (rarely) been know to occur. - -+=back -+ - =head1 EXAMPLES - - First, you need to get an authentication token. This is a requirement diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 8db5695..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -failupload.patch -manpage-has-errors-from-pod2man.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libflickr-upload-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
