[arch-commits] Commit in licenses/trunk (LICENSE.ralink-firmware.txt PKGBUILD)

[Dan McGee]

    Date: Thursday, March 17, 2011 @ 13:11:49
  Author: dan
Revision: 115292

upgpkg: licenses 2.7-1
Add perl artistic 2.0 (FS#21167), drop ralink

Modified:
  licenses/trunk/PKGBUILD
Deleted:
  licenses/trunk/LICENSE.ralink-firmware.txt

-----------------------------+
 LICENSE.ralink-firmware.txt |   39 ---------------------------------------
 PKGBUILD                    |   17 +++++++++--------
 2 files changed, 9 insertions(+), 47 deletions(-)

Deleted: LICENSE.ralink-firmware.txt
===================================================================
--- LICENSE.ralink-firmware.txt	2011-03-17 17:11:36 UTC (rev 115291)
+++ LICENSE.ralink-firmware.txt	2011-03-17 17:11:49 UTC (rev 115292)
@@ -1,39 +0,0 @@
-Copyright (c) 2007, Ralink Technology Corporation 
-All rights reserved.
-
-Redistribution.  Redistribution and use in binary form, without 
-modification, are permitted provided that the following conditions are 
-met:
-
-* Redistributions must reproduce the above copyright notice and the 
-  following disclaimer in the documentation and/or other materials 
-  provided with the distribution. 
-* Neither the name of Ralink Technology Corporation nor the names of its
-  suppliers may be used to endorse or promote products derived from this
-  software without specific prior written permission. 
-* No reverse engineering, decompilation, or disassembly of this software 
-  is permitted.
-
-Limited patent license. Ralink Technology Corporation grants a world-wide, 
-royalty-free, non-exclusive license under patents it now or hereafter 
-owns or controls to make, have made, use, import, offer to sell and 
-sell ("Utilize") this software, but solely to the extent that any 
-such patent is necessary to Utilize the software alone, or in 
-combination with an operating system licensed under an approved Open 
-Source license as listed by the Open Source Initiative at 
-http://opensource.org/licenses.  The patent license shall not apply to 
-any other combinations which include this software.  No hardware per 
-se is licensed hereunder.
-
-DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, 
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND 
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS 
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE 
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH 
-DAMAGE.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-17 17:11:36 UTC (rev 115291)
+++ PKGBUILD	2011-03-17 17:11:49 UTC (rev 115292)
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=licenses
-pkgver=2.6
+pkgver=2.7
 pkgrel=1
 pkgdesc="The standard licenses distribution package"
 arch=('any')
@@ -28,11 +28,11 @@
         http://www.latex-project.org/lppl.txt
         http://www.mozilla.org/MPL/MPL-1.1.txt
         perlartistic.txt
+        http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt
         php-3.0.txt::http://www.php.net/license/3_0.txt
         ruby-license.txt::http://www.ruby-lang.org/en/LICENSE.txt
         cpl-1.0.txt
         python-2.txt
-        LICENSE.ralink-firmware.txt
         ZopePublicLicense.txt)
 md5sums=('3b83ef96387f14655fc854ddc3c6bd57'
          'ffb24d1bbf8b83d373f0b8edc3feb0c6'
@@ -53,11 +53,11 @@
          '9f4337828d782bdea41f03dd2ad1b808'
          'bfe1f75d606912a4111c90743d6c7325'
          'd09c120ca7db95ef2aeecec0cb08293b'
+         'b4a94da2a1f918b217ef5156634fc9e0'
          'a45bb1bbeed9e26b26c5763df1d3913d'
          '68d59ff8306e3a9f5f1c01462c77a317'
          'f083e41c43db25e18f36c91e57750b64'
          'a055911c32fb4ed6e96c453ceaeba857'
-         '682eac07428a4e8f138bc082f090ecac'
          'dc8502850eab9e1ff330a12d7ca18a19')
 
 build() {
@@ -65,9 +65,13 @@
   mkdir -p usr/share/licenses/common
   cd usr/share/licenses/common
 
-  mkdir APACHE
-  cp $srcdir/apache-2.0.txt APACHE/license.txt
+  mkdir Apache
+  cp $srcdir/apache-2.0.txt Apache/license.txt
+  ln -s Apache APACHE
 
+  mkdir Artistic2.0
+  cp $srcdir/artistic-2_0.txt Artistic2.0/license.txt
+
   mkdir CCPL
   cp $srcdir/cc-by-3.0.txt CCPL/
   cp $srcdir/cc-by-nc-3.0.txt CCPL/
@@ -116,9 +120,6 @@
   mkdir PSF
   cp $srcdir/python-2.txt PSF/license.txt
 
-  mkdir RALINK
-  cp $srcdir/LICENSE.ralink-firmware.txt RALINK/license.txt
-
   mkdir RUBY
   cp $srcdir/ruby-license.txt RUBY/license.txt