This is an automated email from the git hooks/post-receive script. dod pushed a commit to branch master in repository devscripts.
commit 0128e36f520a2c49cf877bb3a6ab2f90d62c6ba8 Author: Dominique Dumont <[email protected]> Date: Sat Dec 26 11:23:20 2015 +0100 licensecheck: improved detection of artistic 2.0 license --- debian/changelog | 1 + scripts/licensecheck.pl | 2 +- test/licensecheck/artistic-2-0-modules.pm | 239 ++++++++++++++++++++++++++++++ test/licensecheck/artistic-2-0.txt | 206 +++++++++++++++++++++++++ test/test_licensecheck | 5 + 5 files changed, 452 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 074ff7a..91052af 100644 --- a/debian/changelog +++ b/debian/changelog @@ -54,6 +54,7 @@ devscripts (2.15.10) UNRELEASED; urgency=medium + added LLGPL license (part of #806424) + also parse last 5kb of a file * tweaked to parse Artistic 2.0 license file + * improved detection of artistic 2.0 licenses [ Osamu Aoki ] * uscan: diff --git a/scripts/licensecheck.pl b/scripts/licensecheck.pl index f4a627a..dbfa25b 100755 --- a/scripts/licensecheck.pl +++ b/scripts/licensecheck.pl @@ -669,7 +669,7 @@ sub parselicense { # match when either: # - the text *begins* with "The Artistic license v2.0" which is (hopefully) the actual artistic license v2.0 text. # - a license grant is found. i.e something like "this is free software, licensed under the artistic license v2.0" - if ($licensetext =~ /(?:^|(?:This is free software, licensed|Released) under (?:the terms of )?)[Tt]he Artistic License ([v\d.]+)/) { + if ($licensetext =~ /(?:^\s*|(?:This is free software, licensed|Released|be used|use and modify this (?:module|software)) under (?:the terms of )?)[Tt]he Artistic License ([v\d.]*\d)/) { $license = "Artistic (v$1) $license"; } diff --git a/test/licensecheck/artistic-2-0-modules.pm b/test/licensecheck/artistic-2-0-modules.pm new file mode 100644 index 0000000..39abb76 --- /dev/null +++ b/test/licensecheck/artistic-2-0-modules.pm @@ -0,0 +1,239 @@ +use SVG::Box; + +enum SVG::Plot::AxisPosition <Zero SmallestValue LargestValue>; + +unit class SVG::Plot; +has $.height = 300; +has $.width = 500; +has $.fill-width = 0.80; +has $.label-font-size = 12; +has $.legend-font-size = $!label-font-size; + +has @.legends is rw; +has @.values is rw; +has @.x is rw; # only used in 'xy' variants +has @.labels is rw = @!values[0].keys; +has @.links is rw; + +has $.plot-width = $!width * 0.80; +has $.plot-height = $!height * (@!legends ?? 0.5 !! 0.65); + +has $.title = ''; + +has &.x-tick-step = -> $max { + 10 ** $max.log10.floor / 2 +} + +has &.y-tick-step = -> $max { + 10 ** $max.log10.floor / 2 +} + +has $.max-x-labels = $!plot-width / (1.5 * $!label-font-size); + +has $.label-spacing = ($!height - $!plot-height) / 20; + +has @.colors = <#3333ff #ffdd66 #aa2222 #228844 #eebb00 #8822bb>; + +has $.min-y-axis = Inf; + +multi method plot(:$full = True, :$stacked-bars!) { + + my $label-skip = ceiling(@.values[0] / $.max-x-labels); + my $max_x = @.values[0].elems; + + # maximum value of the sum over each column + my $max_y = [max] @.values[0].keys.map: { + [+] @.values.map: -> $a { $a[$_] } + }; + my $datasets = [email protected]; + + my $step_x = $.plot-width / $max_x; + my $step_y = $.plot-height / $max_y; + + my @svg_d = gather { + my $bar-width = $.fill-width * $step_x; + for flat @.values[0].keys Z @.labels -> $k, $l { + my $y-offset = 0; + for ^$datasets -> $d { + my $v = @.values[$d][$k]; + my $p = 'rect' => [ + :y(-$v * $step_y - $y-offset), + :x($k * $step_x), + :width($bar-width), + :height($v * $step_y), + :style("fill:{ @.colors[$d % *] }; stroke: none"), + ]; + $y-offset += $v * $step_y; + take |$.linkify($k, $p); + } + } + + $.plot-x-labels(:$step_x, :$label-skip); + $.y-ticks(0, $max_y, $step_y); + } + + my $svg = $.apply-standard-transform( + @svg_d, + @.eyecandy(), + ); + + @.wrap-in-svg-header-if-necessary($svg, :wrap($full)); +} + +# snip... + +=begin Pod + +=head1 NAME + +SVG::Plot - simple SVG bar charts + +=head1 VERSION + +$very_early + +=head1 SYNOPSIS + + use SVG; + use SVG::Plot; + + my @d1 = (0..100).map: { sin($_ / 10.0) }; + my @d2 = (0..100).map: { cos($_ / 10.0) }; + say SVG.serialize: + SVG::Plot.new( + width => 400, + height => 250, + values => ([@d1], [@d2]), + title => 'sin(x/10), cos(x/10)', + ).plot(:lines); + + +=head1 DESCRIPTION + +SVG::Plot turns a set of data points (and optionally labels) into a data +structure which Carl Mäsak's module L<SVG> serializes into SVG, and displays a +bar chart of the data. + +See L<http://perlgeek.de/blog-en/perl-6/svg-adventures.html> for the initial +announcement and future plans. + +Note that the module itself does not depend on SVG.pm, only the examples (and +maybe in future the tests). + +=head1 A WORD OF WARNING + +Please note that the interface of this module is still in flux, and might +change without further notice. If you actually use it, send the author an +email to inform him, maybe he'll try to keep the interface backwards +compatible, or notify you on incompatible changes. + +=head1 METHODS + +=head2 new(*%options) +Constructs a L<SVG::Plot> object. You can set various attributes as options, +see their documentation below. No attribute is mandatory. + +=head2 multi method plot(:$type!, :$full = True) +If the argument C<$!full> is provided, the returned data structure contains +only the body of the SVG, not the C<< <svg xmlns=...> >> header. + +Each multi method renders one type of chart, and has a mandatory named +parameter with the name of the type. Currently available are C<bars>, +C<stacked-bars>, C<lines> and C<points>. + +=head1 Attributes + +The following attributes can be set with the C<new> constructor, and can be +queried later on (those marked with C<is rw> can also be set later on). + +=head2 @.values is rw +The values to be plotted + +=head2 @.labels is rw +The labels printed below the bars. Note that this must be either left empty +(in which case C<@.values.keys> is used as a default), or of the same length +as C<@.values>. To suppress printing of labels just set them all to the empty +string, C<$svg.labels = ('' xx $svg.values.elems)>. + +=head2 @.links is rw +If some values of @.links are set to defined values, the corresponding bars +and labels will be turned into links + +=head2 $.width +=head2 $.height + +The overall size of the image (what is called the I<canvas> in SVG jargon). +SVG::Plot tries not to draw outside the canvas. + +=head2 $.plot-width +=head2 $.plot-height + +The size of the area to which the chart is plotted (the rest is taken up by +ticks, labels and in future probably captions). The behaviour is undefined if +C<< $.plot-width < $.width >> or C<< $.plot-height >>. + +Note that if you chose C<$.plot-width> or C<$.plot-height> too big in +comparison to C<$.width> and C<$.height>, label texts and ticks might +exceed the total size, and be either clipped to or drawn outside the canvas, +depending on your SVG renderer. + +=head2 $.fill-width +(Might be renamed to a more meaning name in future) For each bar in the bar +chart a certain width is allocated, but only a ratio of C<$.fill-width> is +actually filled with a bar. Set to value between 0 and 1 to get spaces between +your bars, or to 1 if you don't want spaces. + +=head2 $.label-font-size +Font size for the axis labels + +=head2 &.y-tick-step +Closure which computes the step size in which ticks and labels on the y axis +are drawn. It receives the maximal C<y> value as a single positional argument. + +=head2 &.x-tick-step +Closure which computes the step size in which ticks and labels on the x axis +are drawn. It receives the maximal C<x> value as a single positional argument. + +=head2 $.max-x-labels +Maximal number of plotted labels in C<x> direction. If you experience +overlapping labels you might set this to a smaller value. The default is +dependent on C<$.plot-width> and C<$.label-font-size>. + +=head2 $.label-spacing + +Distance between I<x> axis and labels. Also affects width of I<y> ticks and +distance of labels and I<y> ticks. + +=head2 $.min-y-axis + +By default the C<y> axis is scaled between the minimum and maximum y values. +Set this if you want the C<y> axis to scale off of a different lower bound. +Only has an effect if the C<$.min-y-axis> value is less then the minimum C<y> +value. + +=head1 LICENSE AND COPYRIGHT + +Copyright (C) 2009 by Moritz Lenz and the SVG::Plot contributors (see file +F<AUTHORS>), all rights reserved. + +You may distribute, use and modify this module under the terms of the Artistic +License 2.0 as published by The Perl Foundation. See the F<LICENSE> file for +details. + +The example code in the F<examples> directory and the examples from the +documentation can be used, modified and distributed freely without any +restrictions (think "public domain", except that by German law the author +can't place things into the public domain). + +=head1 WARRANTY EXCLUSION + +This software is provided as-is, in the hope that it is useful to somebody. +Not fitness for a particular purpose or any kind of guarantuee of +functionality is implied. + +No responsibilities are taken by author to the extend allowed by applicable +law. + +=end Pod + +# vim: ft=perl6 diff --git a/test/licensecheck/artistic-2-0.txt b/test/licensecheck/artistic-2-0.txt new file mode 100644 index 0000000..f645025 --- /dev/null +++ b/test/licensecheck/artistic-2-0.txt @@ -0,0 +1,206 @@ +This software is Copyright (c) 2000 by Testophilus Testownik <[email protected]>. + +This is free software, licensed under: + + The Artistic License 2.0 (GPL Compatible) + The Artistic License 2.0 + + Copyright (c) 2000-2006, The Perl Foundation. + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +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. + + "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: + + (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 --git a/test/test_licensecheck b/test/test_licensecheck index 74583ca..0547545 100755 --- a/test/test_licensecheck +++ b/test/test_licensecheck @@ -43,6 +43,11 @@ testBoost() { license "boost.h" "BSL" } +testArtistic() { + license2 "-m --copyright" "artistic-2-0-modules.pm" "Artistic (v2.0) 2009 Moritz Lenz and the SVG::Plot contributors (see file" + license2 "-m --copyright" "artistic-2-0.txt" "Artistic (v2.0) 2000-2006, The Perl Foundation / 2000 Testophilus Testownik <[email protected]>" +} + testAcademic() { license "academic.h" "AFL-3.0" } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
