Merge lp:~mrazik/gtester2xunit/license into lp:gtester2xunit

[Martin Mrazik]

Adding a license file for gtester.xsl

[lp:~mrazik/gtester2xunit/license]

17. By Martin Mrazik on 2012-11-29

fixed the license year in gtester.xsl.license and modified debian/copyright to say "MIT/X11 (BSD like)"

18. By Martin Mrazik on 2012-11-29

fixed the long lines in gtester.xsl.license

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:16
http://s-jenkins:8080/job/gtester2xunit-ci/1/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/gtester2xunit-ci/./build=pbuilder,distribution=quantal,flavor=amd64/1/console
    SUCCESS: http://s-jenkins:8080/job/gtester2xunit-ci/./build=pbuilder,distribution=quantal,flavor=i386/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gtester2xunit-ci/1//rebuild/?

review: Approve (continuous-integration)

=== modified file 'debian/copyright'
--- debian/copyright	2012-10-31 07:43:18 +0000
+++ debian/copyright	2012-11-29 10:05:24 +0000
@@ -19,24 +19,21 @@
 
 Files: gtester.xsl
 Copyright: 2009 R. Tyler Croy <[e-mail]>
-License: Expat
- Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
- 
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- 
+License: MIT/X11 (BSD like)
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
  The above copyright notice and this permission notice shall be included
  in all copies or substantial portions of the Software.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+ NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+ USE OR OTHER DEALINGS IN THE SOFTWARE.

=== modified file 'debian/gtester2xunit.install'
--- debian/gtester2xunit.install	2012-10-28 10:35:23 +0000
+++ debian/gtester2xunit.install	2012-11-29 10:05:24 +0000
@@ -1,2 +1,3 @@
 gtester2xunit /usr/bin
 gtester.xsl /usr/share/gtester2xunit
+gtester.xsl.license /usr/share/gtester2xunit

=== added file 'gtester.xsl.license'
--- gtester.xsl.license	1970-01-01 00:00:00 +0000
+++ gtester.xsl.license	2012-11-29 10:05:24 +0000
@@ -0,0 +1,20 @@
+Copyright (C) 2009 R. Tyler Croy <[e-mail]>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.