Hello community, here is the log from the commit of package perl-WWW-Shorten for openSUSE:Factory checked in at 2012-05-29 14:14:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-WWW-Shorten (Old) and /work/SRC/openSUSE:Factory/.perl-WWW-Shorten.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-WWW-Shorten", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-WWW-Shorten/perl-WWW-Shorten.changes 2011-12-21 17:00:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-WWW-Shorten.new/perl-WWW-Shorten.changes 2012-05-29 14:14:47.000000000 +0200 @@ -1,0 +2,10 @@ +Mon May 28 13:40:37 UTC 2012 - [email protected] + +- updated to 3.03 + * MANIFEST, lib/WWW/Shorten/UserAgent.pm, lib/WWW/Shorten/generic.pm: Added a + WWW::Shorten::UserAgent object which dies if it receives an HTTP error + response. + + * relicensed to Aritistic-2.0 + +------------------------------------------------------------------- Old: ---- WWW-Shorten-3.02.tar.gz New: ---- WWW-Shorten-3.03.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-WWW-Shorten.spec ++++++ --- /var/tmp/diff_new_pack.PLojZ9/_old 2012-05-29 14:14:48.000000000 +0200 +++ /var/tmp/diff_new_pack.PLojZ9/_new 2012-05-29 14:14:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-WWW-Shorten # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,11 @@ Name: perl-WWW-Shorten -Version: 3.02 +Version: 3.03 Release: 0 %define cpan_name WWW-Shorten Summary: Interface to URL shortening sites. -License: Artistic-1.0 or GPL-1.0+ +License: Artistic-2.0 Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/WWW-Shorten/ Source: http://www.cpan.org/authors/id/D/DA/DAVECROSS/%{cpan_name}-%{version}.tar.gz @@ -34,6 +34,15 @@ BuildRequires: perl(LWP::UserAgent) >= 2.023 BuildRequires: perl(Module::Build) BuildRequires: perl(URI) >= 1.27 +#BuildRequires: perl(WWW::Shorten) +#BuildRequires: perl(WWW::Shorten::_dead) +#BuildRequires: perl(WWW::Shorten::generic) +#BuildRequires: perl(WWW::Shorten::LinkToolbot) +#BuildRequires: perl(WWW::Shorten::MakeAShorterLink) +#BuildRequires: perl(WWW::Shorten::Metamark) +#BuildRequires: perl(WWW::Shorten::TinyClick) +#BuildRequires: perl(WWW::Shorten::Tinylink) +#BuildRequires: perl(WWW::Shorten::UserAgent) Requires: perl(Config::Auto) Requires: perl(LWP) >= 5.75 Requires: perl(LWP::UserAgent) >= 2.023 @@ -65,6 +74,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Artistic AUTHORS ChangeLog.SPOON Changes COPYING CREDITS LICENCE README TODO +%doc Artistic AUTHORS ChangeLog.SPOON Changes CREDITS LICENCE README TODO %changelog ++++++ WWW-Shorten-3.02.tar.gz -> WWW-Shorten-3.03.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/Artistic new/WWW-Shorten-3.03/Artistic --- old/WWW-Shorten-3.02/Artistic 2010-12-06 15:32:20.000000000 +0100 +++ new/WWW-Shorten-3.03/Artistic 2012-04-06 18:44:00.000000000 +0200 @@ -2,130 +2,179 @@ - The "Artistic License" + The "Artistic License 2.0" - Preamble +Everyone is permitted to copy and distribute verbatim copies of this license +document, but changing it is not allowed. -The intent of this document is to state the conditions under which a -Package may be copied, such that the Copyright Holder maintains some -semblance of artistic control over the development of the package, -while giving the users of the package the right to use and distribute -the Package in a more-or-less customary fashion, plus the right to make -reasonable modifications. - -Definitions: - - "Package" refers to the collection of files distributed by the - Copyright Holder, and derivatives of that collection of files - created through textual modification. - - "Standard Version" refers to such a Package if it has not been - modified, or has been modified in accordance with the wishes - of the Copyright Holder as specified below. - - "Copyright Holder" is whoever is named in the copyright or - copyrights for the package. - - "You" is you, if you're thinking about copying or distributing - this Package. - - "Reasonable copying fee" is whatever you can justify on the - basis of media cost, duplication charges, time of people involved, - and so on. (You will not be required to justify it to the - Copyright Holder, but only to the computing community at large - as a market that must bear the fee.) - - "Freely Available" means that no fee is charged for the item - itself, though there may be fees involved in handling the item. - It also means that recipients of the item may redistribute it - under the same conditions they received it. - -1. You may make and give away verbatim copies of the source form of the -Standard Version of this Package without restriction, provided that you -duplicate all of the original copyright notices and associated disclaimers. - -2. You may apply bug fixes, portability fixes and other modifications -derived from the Public Domain or from the Copyright Holder. A Package -modified in such a way shall still be considered the Standard Version. - -3. You may otherwise modify your copy of this Package in any way, provided -that you insert a prominent notice in each changed file stating how and -when you changed that file, and provided that you do at least ONE of the -following: +Preamble + +This license establishes the terms under which a given free software Package +may be copied, modified, distributed, and/or redistributed. The intent is that +the Copyright Holder maintains some artistic control over the development of +that Package while still keeping the Package available as open source and free +software. + +You are always permitted to make arrangements wholly outside of this license +directly with the Copyright Holder of a given Package. If the terms of this +license do not permit the full use that you propose to make of the Package, you +should contact the Copyright Holder and seek a different licensing arrangement. + +Definitions + +"Copyright Holder" means the individual(s) or organization(s) named in the +copyright notice for the entire Package. + +"Contributor" means any party that has contributed code or other material to +the Package, in accordance with the Copyright Holder's procedures. + +"You" and "your" means any person who would like to copy, distribute, or modify +the Package. + +"Package" means the collection of files distributed by the Copyright Holder, +and derivatives of that collection and/or of those files. A given Package may +consist of either the Standard Version, or a Modified Version. + +"Distribute" means providing a copy of the Package or making it accessible to +anyone else, or in the case of a company or organization, to others outside of +your company or organization. + +"Distributor Fee" means any fee that you charge for Distributing this Package +or providing support for this Package to another party. It does not mean +licensing fees. + +"Standard Version" refers to the Package if it has not been modified, or has +been modified only in ways explicitly requested by the Copyright Holder. - a) place your modifications in the Public Domain or otherwise make them - Freely Available, such as by posting said modifications to Usenet or - an equivalent medium, or placing the modifications on a major archive - site such as uunet.uu.net, or by allowing the Copyright Holder to include - your modifications in the Standard Version of the Package. - - b) use the modified Package only within your corporation or organization. - - c) rename any non-standard executables so the names do not conflict - with standard executables, which must also be provided, and provide - a separate manual page for each non-standard executable that clearly - documents how it differs from the Standard Version. - - d) make other distribution arrangements with the Copyright Holder. - -4. You may distribute the programs of this Package in object code or -executable form, provided that you do at least ONE of the following: - - a) distribute a Standard Version of the executables and library files, - together with instructions (in the manual page or equivalent) on where - to get the Standard Version. - - b) accompany the distribution with the machine-readable source of - the Package with your modifications. - - c) give non-standard executables non-standard names, and clearly - document the differences in manual pages (or equivalent), together - with instructions on where to get the Standard Version. - - d) make other distribution arrangements with the Copyright Holder. - -5. You may charge a reasonable copying fee for any distribution of this -Package. You may charge any fee you choose for support of this -Package. You may not charge a fee for this Package itself. However, -you may distribute this Package in aggregate with other (possibly -commercial) programs as part of a larger (possibly commercial) software -distribution provided that you do not advertise this Package as a -product of your own. You may embed this Package's interpreter within -an executable of yours (by linking); this shall be construed as a mere -form of aggregation, provided that the complete Standard Version of the -interpreter is so embedded. - -6. The scripts and library files supplied as input to or produced as -output from the programs of this Package do not automatically fall -under the copyright of this Package, but belong to whoever generated -them, and may be sold commercially, and may be aggregated with this -Package. If such scripts or library files are aggregated with this -Package via the so-called "undump" or "unexec" methods of producing a -binary executable image, then distribution of such an image shall -neither be construed as a distribution of this Package nor shall it -fall under the restrictions of Paragraphs 3 and 4, provided that you do -not represent such an executable image as a Standard Version of this -Package. - -7. C subroutines (or comparably compiled subroutines in other -languages) supplied by you and linked into this Package in order to -emulate subroutines and variables of the language defined by this -Package shall not be considered part of this Package, but are the -equivalent of input as in Paragraph 6, provided these subroutines do -not change the language in any way that would cause it to fail the -regression tests for the language. - -8. Aggregation of this Package with a commercial distribution is always -permitted provided that the use of this Package is embedded; that is, -when no overt attempt is made to make this Package's interfaces visible -to the end user of the commercial distribution. Such use shall not be -construed as a distribution of this Package. - -9. The name of the Copyright Holder may not be used to endorse or promote -products derived from this software without specific prior written permission. - -10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. +"Modified Version" means the Package, if it has been changed, and such changes +were not explicitly requested by the Copyright Holder. + +"Original License" means this Artistic License as Distributed with the Standard +Version of the Package, in its current version or as it may be modified by The +Perl Foundation in the future. + +"Source" form means the source code, documentation source, and configuration +files for the Package. + +"Compiled" form means the compiled bytecode, object code, binary, or any other +form resulting from mechanical transformation or translation of the Source +form. + +Permission for Use and Modification Without Distribution + +(1) You are permitted to use the Standard Version and create and use Modified +Versions for any purpose without restriction, provided that you do not +Distribute the Modified Version. + +Permissions for Redistribution of the Standard Version + +(2) You may Distribute verbatim copies of the Source form of the Standard +Version of this Package in any medium without restriction, either gratis or for +a Distributor Fee, provided that you duplicate all of the original copyright +notices and associated disclaimers. At your discretion, such verbatim copies +may or may not include a Compiled form of the Package. + +(3) You may apply any bug fixes, portability changes, and other modifications +made available from the Copyright Holder. The resulting Package will still be +considered the Standard Version, and as such will be subject to the Original +License. + +Distribution of Modified Versions of the Package as Source + +(4) You may Distribute your Modified Version as Source (either gratis or for a +Distributor Fee, and with or without a Compiled form of the Modified Version) +provided that you clearly document how it differs from the Standard Version, +including, but not limited to, documenting any non-standard features, +executables, or modules, and provided that you do at least ONE of the +following: - The End +(a) make the Modified Version available to the Copyright Holder of the +Standard Version, under the Original License, so that the Copyright Holder may +include your modifications in the Standard Version. + +(b) ensure that installation of your Modified Version does not prevent the +user installing or running the Standard Version. In addition, the Modified +Version must bear a name that is different from the name of the Standard +Version. + +(c) allow anyone who receives a copy of the Modified Version to make the +Source form of the Modified Version available to others under + +(i) the Original License or + +(ii) a license that permits the licensee to freely copy, modify and +redistribute the Modified Version using the same licensing terms that apply to +the copy that the licensee received, and requires that the Source form of the +Modified Version, and of any works derived from it, be made freely available +in that license fees are prohibited but Distributor Fees are allowed. + +Distribution of Compiled Forms of the Standard Version or Modified Versions +without the Source + +(5) You may Distribute Compiled forms of the Standard Version without the +Source, provided that you include complete instructions on how to get the +Source of the Standard Version. Such instructions must be valid at the time of +your distribution. If these instructions, at any time while you are carrying +out such distribution, become invalid, you must provide new instructions on +demand or cease further distribution. If you provide valid instructions or +cease distribution within thirty days after you become aware that the +instructions are invalid, then you do not forfeit any of your rights under +this license. + +(6) You may Distribute a Modified Version in Compiled form without the Source, +provided that you comply with Section 4 with respect to the Source of the +Modified Version. + +Aggregating or Linking the Package + +(7) You may aggregate the Package (either the Standard Version or Modified +Version) with other packages and Distribute the resulting aggregation provided +that you do not charge a licensing fee for the Package. Distributor Fees are +permitted, and licensing fees for other components in the aggregation are +permitted. The terms of this license apply to the use and Distribution of the +Standard or Modified Versions as included in the aggregation. + +(8) You are permitted to link Modified and Standard Versions with other works, +to embed the Package in a larger work of your own, or to build stand-alone +binary or bytecode versions of applications that include the Package, and +Distribute the result without restriction, provided the result does not expose +a direct interface to the Package. + +Items That are Not Considered Part of a Modified Version + +(9) Works (including, but not limited to, modules and scripts) that merely +extend or make use of the Package, do not, by themselves, cause the Package to +be a Modified Version. In addition, such works are not considered parts of the +Package itself, and are not subject to the terms of this license. + +General Provisions + +(10) Any use, modification, and distribution of the Standard or Modified +Versions is governed by this Artistic License. By using, modifying or +distributing the Package, you accept this license. Do not use, modify, or +distribute the Package, if you do not accept this license. + +(11) If your Modified Version has been derived from a Modified Version made by +someone other than you, you are nevertheless required to ensure that your +Modified Version complies with the requirements of this license. + +(12) This license does not grant you the right to use any trademark, service +mark, tradename, or logo of the Copyright Holder. + +(13) This license includes the non-exclusive, worldwide, free-of-charge patent +license to make, have made, use, offer to sell, sell, import and otherwise +transfer the Package with respect to any patent claims licensable by the +Copyright Holder that are necessarily infringed by the Package. If you +institute patent litigation (including a cross-claim or counterclaim) against +any party alleging that the Package constitutes direct or contributory patent +infringement, then this Artistic License to you shall terminate on the date +that such litigation is filed. + +(14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER +AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE +IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR +NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. +UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY +OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH +DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/Build.PL new/WWW-Shorten-3.03/Build.PL --- old/WWW-Shorten-3.02/Build.PL 2010-12-06 15:32:20.000000000 +0100 +++ new/WWW-Shorten-3.03/Build.PL 2012-04-06 18:44:00.000000000 +0200 @@ -2,7 +2,7 @@ my $build = Module::Build->new( module_name => 'WWW::Shorten', - license => 'perl', + license => 'artistic_2', requires => { 'perl' => '5.006', 'LWP' => '5.75', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/COPYING new/WWW-Shorten-3.03/COPYING --- old/WWW-Shorten-3.02/COPYING 2010-12-06 15:32:20.000000000 +0100 +++ new/WWW-Shorten-3.03/COPYING 1970-01-01 01:00:00.000000000 +0100 @@ -1,342 +0,0 @@ - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> - - 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 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/Changes new/WWW-Shorten-3.03/Changes --- old/WWW-Shorten-3.02/Changes 2010-12-06 15:32:20.000000000 +0100 +++ new/WWW-Shorten-3.03/Changes 2012-04-06 18:44:00.000000000 +0200 @@ -1,5 +1,22 @@ +2012-04-06 Dave Cross <[email protected]> + + * Artistic, Build.PL, COPYING, LICENCE, MANIFEST, lib/WWW/Shorten.pm, + lib/WWW/Shorten/UserAgent.pm: Licensing clean-up. + + * MANIFEST: Added META.json to MANIFEST. + +2012-03-01 Dave Cross <[email protected]> + + * lib/WWW/Shorten/UserAgent.pm: Added documentation. + + * MANIFEST, lib/WWW/Shorten/UserAgent.pm, lib/WWW/Shorten/generic.pm: Added a + WWW::Shorten::UserAgent object which dies if it receives an HTTP error + response. + 2010-12-06 Dave Cross <[email protected]> + * bin/shorten: Better examples of using bin/shorten + * lib/WWW/Shorten.pm: Bump version number for release. * bin/shorten: Be far more intelligent about the code that allows the user to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/LICENCE new/WWW-Shorten-3.03/LICENCE --- old/WWW-Shorten-3.02/LICENCE 2010-12-06 15:32:20.000000000 +0100 +++ new/WWW-Shorten-3.03/LICENCE 2012-04-06 18:44:00.000000000 +0200 @@ -1,16 +1,16 @@ -LICENCE FOR WWW::Shorten 1.88 +LICENCE FOR WWW::Shorten 3.03 -WWW::Shorten::NotLong copyright � Eric Hammond <[email protected]>. +WWW::Shorten::NotLong copyright (c) Eric Hammond <[email protected]>. -WWW::Shorten::MakeAShorterLink copyright � Dave Cross <[email protected]>. +Other modules copyright (c) Magnum Solutions Ltd., 2007. All rights +reserved. Other modules copyright � Iain Truskett, 2002-2003. All rights reserved. -This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself, either Perl version 5.000 or, -at your option, any later version of Perl 5 you may have available. +This module is free software. You can redistribute it and/or +modify it under the terms of the Artistic License 2.0. -The full text of the licences can be found in the Artistic and -COPYING files included with this module, or in perlartistic and -perlgpl as supplied with Perl 5.8.1 and later. +This program is distributed in the hope that it will be useful, +but without any warranty; without even the implied warranty of +merchantability or fitness for a particular purpose. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/MANIFEST new/WWW-Shorten-3.03/MANIFEST --- old/WWW-Shorten-3.02/MANIFEST 2010-12-06 15:32:20.000000000 +0100 +++ new/WWW-Shorten-3.03/MANIFEST 2012-04-06 18:44:00.000000000 +0200 @@ -3,7 +3,6 @@ bin/shorten ChangeLog.SPOON Changes -COPYING CREDITS INSTALL lib/WWW/Shorten.pm @@ -16,6 +15,7 @@ lib/WWW/Shorten/TinyClick.pm lib/WWW/Shorten/Tinylink.pm lib/WWW/Shorten/TinyURL.pm +lib/WWW/Shorten/UserAgent.pm LICENCE Makefile.PL Build.PL @@ -40,3 +40,4 @@ t/tinylink.t t/tinyurl.t TODO +META.json diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/META.json new/WWW-Shorten-3.03/META.json --- old/WWW-Shorten-3.02/META.json 1970-01-01 01:00:00.000000000 +0100 +++ new/WWW-Shorten-3.03/META.json 2012-04-06 18:44:00.000000000 +0200 @@ -0,0 +1,83 @@ +{ + "abstract" : "Interface to URL shortening sites.", + "author" : [ + "Original Iain Truskett <[email protected]>", + "Based on WWW::MakeAShorterLink by Dave Cross <[email protected]>" + ], + "dynamic_config" : 1, + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.120630", + "license" : [ + "artistic_2" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";, + "version" : "2" + }, + "name" : "WWW-Shorten", + "prereqs" : { + "build" : { + "requires" : { + "Test::More" : "0.47" + } + }, + "configure" : { + "requires" : { + "Module::Build" : "0.38" + } + }, + "runtime" : { + "requires" : { + "Config::Auto" : "0", + "LWP" : "5.75", + "LWP::UserAgent" : "2.023", + "URI" : "1.27", + "perl" : "5.006" + } + } + }, + "provides" : { + "WWW::Shorten" : { + "file" : "lib/WWW/Shorten.pm", + "version" : "3.03" + }, + "WWW::Shorten::LinkToolbot" : { + "file" : "lib/WWW/Shorten/LinkToolbot.pm", + "version" : "1.90" + }, + "WWW::Shorten::Linkz" : { + "file" : "lib/WWW/Shorten/Linkz.pm", + "version" : "1.90" + }, + "WWW::Shorten::MakeAShorterLink" : { + "file" : "lib/WWW/Shorten/MakeAShorterLink.pm", + "version" : "1.90" + }, + "WWW::Shorten::Metamark" : { + "file" : "lib/WWW/Shorten/Metamark.pm", + "version" : "1.91" + }, + "WWW::Shorten::TinyClick" : { + "file" : "lib/WWW/Shorten/TinyClick.pm", + "version" : "1.90" + }, + "WWW::Shorten::TinyURL" : { + "file" : "lib/WWW/Shorten/TinyURL.pm", + "version" : "1.90" + }, + "WWW::Shorten::UserAgent" : { + "file" : "lib/WWW/Shorten/UserAgent.pm", + "version" : 0 + }, + "WWW::Shorten::generic" : { + "file" : "lib/WWW/Shorten/generic.pm", + "version" : "1.92" + } + }, + "release_status" : "stable", + "resources" : { + "license" : [ + "http://opensource.org/licenses/artistic-license-2.0.php"; + ] + }, + "version" : "3.03" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/META.yml new/WWW-Shorten-3.03/META.yml --- old/WWW-Shorten-3.02/META.yml 2010-12-06 15:32:20.000000000 +0100 +++ new/WWW-Shorten-3.03/META.yml 2012-04-06 18:44:00.000000000 +0200 @@ -6,9 +6,10 @@ build_requires: Test::More: 0.47 configure_requires: - Module::Build: 0.36 -generated_by: 'Module::Build version 0.3603' -license: perl + Module::Build: 0.38 +dynamic_config: 1 +generated_by: 'Module::Build version 0.38, CPAN::Meta::Converter version 2.120630' +license: artistic_2 meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 @@ -16,7 +17,7 @@ provides: WWW::Shorten: file: lib/WWW/Shorten.pm - version: 3.02 + version: 3.03 WWW::Shorten::LinkToolbot: file: lib/WWW/Shorten/LinkToolbot.pm version: 1.90 @@ -35,6 +36,9 @@ WWW::Shorten::TinyURL: file: lib/WWW/Shorten/TinyURL.pm version: 1.90 + WWW::Shorten::UserAgent: + file: lib/WWW/Shorten/UserAgent.pm + version: 0 WWW::Shorten::generic: file: lib/WWW/Shorten/generic.pm version: 1.92 @@ -45,5 +49,5 @@ URI: 1.27 perl: 5.006 resources: - license: http://dev.perl.org/licenses/ -version: 3.02 + license: http://opensource.org/licenses/artistic-license-2.0.php +version: 3.03 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/Makefile.PL new/WWW-Shorten-3.03/Makefile.PL --- old/WWW-Shorten-3.02/Makefile.PL 2010-12-06 15:32:20.000000000 +0100 +++ new/WWW-Shorten-3.03/Makefile.PL 2012-04-06 18:44:00.000000000 +0200 @@ -1,21 +1,21 @@ -# Note: this file was auto-generated by Module::Build::Compat version 0.3603 +# Note: this file was auto-generated by Module::Build::Compat version 0.3800 require 5.006; use ExtUtils::MakeMaker; WriteMakefile ( - 'NAME' => 'WWW::Shorten', - 'VERSION_FROM' => 'lib/WWW/Shorten.pm', - 'PREREQ_PM' => { - 'Config::Auto' => 0, - 'LWP' => '5.75', - 'LWP::UserAgent' => '2.023', - 'Test::More' => '0.47', - 'URI' => '1.27' - }, - 'INSTALLDIRS' => 'site', - 'EXE_FILES' => [ - 'bin/shorten' - ], - 'PL_FILES' => {} - ) + 'NAME' => 'WWW::Shorten', + 'VERSION_FROM' => 'lib/WWW/Shorten.pm', + 'PREREQ_PM' => { + 'Config::Auto' => 0, + 'LWP' => '5.75', + 'LWP::UserAgent' => '2.023', + 'Test::More' => '0.47', + 'URI' => '1.27' + }, + 'INSTALLDIRS' => 'site', + 'EXE_FILES' => [ + 'bin/shorten' + ], + 'PL_FILES' => {} +) ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/bin/shorten new/WWW-Shorten-3.03/bin/shorten --- old/WWW-Shorten-3.02/bin/shorten 2010-12-06 15:32:20.000000000 +0100 +++ new/WWW-Shorten-3.03/bin/shorten 2012-04-06 18:44:00.000000000 +0200 @@ -47,13 +47,24 @@ =head1 SYNOPSIS - % shorten books.perl.org/book/171 - http://tinyclick.com/?2x6nss + # Default shortening service is Metamark + $ shorten books.perl.org/book/171 + http://xrl.us/dv8 + + # Change with an environment variable + $ SHORTEN_SERVICE=TinyURL shorten books.perl.org/book/171 + http://tinyurl.com/ye7gjf4 + + # Change with command line option + $ shorten --service=TinyURL books.perl.org/book/171 + http://tinyurl.com/ye7gjf4 + + # Change using config file + $ cat ~/.shortenrc + service = TinyURL + $ shorten books.perl.org/book/171 + http://tinyurl.com/ye7gjf4 - # Or, if you specify a different service in your config file - - % shorten books.perl.org/book/171 - http://snurl.com/xc3 =head1 CONFIGURATION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/lib/WWW/Shorten/UserAgent.pm new/WWW-Shorten-3.03/lib/WWW/Shorten/UserAgent.pm --- old/WWW-Shorten-3.02/lib/WWW/Shorten/UserAgent.pm 1970-01-01 01:00:00.000000000 +0100 +++ new/WWW-Shorten-3.03/lib/WWW/Shorten/UserAgent.pm 2012-04-06 18:44:00.000000000 +0200 @@ -0,0 +1,79 @@ +package WWW::Shorten::UserAgent; + +use strict; +use warnings; + +use base 'LWP::UserAgent'; + +=head1 NAME + +WWW::Shorten::UserAgent - LWP::UserAgent subclass for WWW::Shorten modules. + +=head1 SYNOPSIS + + use WWW::Shorten::UserAgent; + + my $ua = WWW::Shorten::UserAgent->new; + + my $resp = eval { + $ua->get($url); + }; + +=head1 DESCRIPTION + +Subclass of LWP::UserAgent which works the same way as the supoerclass +except that it throws an exception if the C<get> or C<post> method returns +an error. + +See L<LWP::UserAgent> for the full documentation. + +=head1 METHODS + +=head2 get + +Makes an HTTP GET request and throws an exception on error. + +=cut + +sub get { + my $self = shift; + my $resp = $self->SUPER::get(@_); + + die $resp->status_line if $resp->is_error; + + return $resp; +} + +=head2 post + +Makes an HTTP POST request and throws an exception on error. + +=cut + +sub post { + my $self = shift; + my $resp = $self->SUPER::post(@_); + + die $resp->status_line if $resp->is_error; + + return $resp; +} + +1; + +=head1 LICENCE AND COPYRIGHT + +Copyright (c) Magnum Solutions Ltd., 2012. All rights reserved. + +This module is free software. You can redistribute it and/or +modify it under the terms of the Artistic License 2.0. + +This program is distributed in the hope that it will be useful, +but without any warranty; without even the implied warranty of +merchantability or fitness for a particular purpose. + +=head1 AUTHOR + +Dave Cross <[email protected]> + +=cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/lib/WWW/Shorten/generic.pm new/WWW-Shorten-3.03/lib/WWW/Shorten/generic.pm --- old/WWW-Shorten-3.02/lib/WWW/Shorten/generic.pm 2010-12-06 15:32:20.000000000 +0100 +++ new/WWW-Shorten-3.03/lib/WWW/Shorten/generic.pm 2012-04-06 18:44:00.000000000 +0200 @@ -23,7 +23,7 @@ our $VERSION = 1.92; -use LWP; +use WWW::Shorten::UserAgent; use Carp; my %name_sets = @@ -73,7 +73,7 @@ my $self = shift; return $ua if defined $ua; my $v = $self->VERSION(); - $ua = LWP::UserAgent->new( + $ua = WWW::Shorten::UserAgent->new( env_proxy => 1, timeout => 30, agent => "$self/$v", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/WWW-Shorten-3.02/lib/WWW/Shorten.pm new/WWW-Shorten-3.03/lib/WWW/Shorten.pm --- old/WWW-Shorten-3.02/lib/WWW/Shorten.pm 2010-12-06 15:32:20.000000000 +0100 +++ new/WWW-Shorten-3.03/lib/WWW/Shorten.pm 2012-04-06 18:44:00.000000000 +0200 @@ -58,7 +58,7 @@ use base qw(WWW::Shorten::generic); our @EXPORT = qw(makeashorterlink makealongerlink); -our $VERSION = '3.02'; +our $VERSION = '3.03'; our $DEFAULT_SERVICE = 'Metamark'; @@ -219,13 +219,12 @@ Other modules copyright (c) Magnum Solutions Ltd., 2007. All rights reserved. -This library is free software; you can redistribute it and/or modify -it under the same terms as Perl itself, either Perl version 5.000 or, -at your option, any later version of Perl 5 you may have available. - -The full text of the licences can be found in the F<Artistic> and -F<COPYING> files included with this module, or in L<perlartistic> and -L<perlgpl> as supplied with Perl 5.8.1 and later. +This module is free software. You can redistribute it and/or +modify it under the terms of the Artistic License 2.0. + +This program is distributed in the hope that it will be useful, +but without any warranty; without even the implied warranty of +merchantability or fitness for a particular purpose. =head1 AUTHOR -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
