[arch-commits] Commit in licenses/trunk (PKGBUILD)

[Dan McGee]

    Date: Friday, May 7, 2010 @ 09:49:02
  Author: dan
Revision: 79789

upgpkg: licenses 2.6-1
Fix FS#18857; general cleanup and file renaming

Modified:
  licenses/trunk/PKGBUILD

----------+
 PKGBUILD |   39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-07 04:04:19 UTC (rev 79788)
+++ PKGBUILD	2010-05-07 13:49:02 UTC (rev 79789)
@@ -2,14 +2,14 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=licenses
-pkgver=2.5
+pkgver=2.6
 pkgrel=1
 pkgdesc="The standard licenses distribution package"
 arch=('any')
 license=('custom:none')
 url="http://archlinux.org"
 groups=('base')
-source=(http://www.apache.org/licenses/LICENSE-2.0.txt
+source=(apache-2.0.txt::http://www.apache.org/licenses/LICENSE-2.0.txt
         cc-by-3.0.txt
         cc-by-nc-3.0.txt
         cc-by-nc-nd-3.0.txt
@@ -19,17 +19,17 @@
         cc-readme.txt
         cddl-1.0.txt
         eclipse-1.0.txt
-        http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+        http://www.gnu.org/licenses/gpl-2.0.txt
         http://www.gnu.org/licenses/gpl-3.0.txt
-        http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt
-        http://www.gnu.org/licenses/lgpl.txt
-        http://www.gnu.org/licenses/old-licenses/fdl-1.2.html
-        http://www.gnu.org/licenses/fdl.txt
+        http://www.gnu.org/licenses/lgpl-2.1.txt
+        http://www.gnu.org/licenses/lgpl-3.0.txt
+        http://www.gnu.org/licenses/fdl-1.2.txt
+        http://www.gnu.org/licenses/fdl-1.3.txt
         http://www.latex-project.org/lppl.txt
         http://www.mozilla.org/MPL/MPL-1.1.txt
         perlartistic.txt
-        http://www.php.net/license/3_0.txt
-        http://www.ruby-lang.org/en/LICENSE.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
@@ -44,11 +44,11 @@
          '019bc72509b18a804f0ea8fd2bab1932'
          '6cb35f3976cd093011967fa1abbce386'
          'f300afd598546add034364cd0a533261'
-         '751419260aa954499f7abaabaa882bbe'
+         'b234ee4d69f5fce4486a80fdaf4a4263'
          'd32239bcb673463ab874e80d47fae504'
-         '243b725d71bb5df4a1e5920b344b86ad'
-         'b52f2d57d10c4f7ee67a7eb9615d5d24'
-         '0a104fd5e8dd4324ceea2c30d774f311'
+         '4fbd65380cdd255951079008b364516c'
+         'e6a600fd5e1d9cbde2d983680233ad02'
+         '24ea4c7092233849b4394699333b5c56'
          '10b9de612d532fdeeb7fe8fcd1435cc6'
          '9f4337828d782bdea41f03dd2ad1b808'
          'bfe1f75d606912a4111c90743d6c7325'
@@ -56,7 +56,7 @@
          'a45bb1bbeed9e26b26c5763df1d3913d'
          '68d59ff8306e3a9f5f1c01462c77a317'
          'f083e41c43db25e18f36c91e57750b64'
-         '614f4f550910d90428a567cfaafe62a9'
+         'a055911c32fb4ed6e96c453ceaeba857'
          '682eac07428a4e8f138bc082f090ecac'
          'dc8502850eab9e1ff330a12d7ca18a19')
 
@@ -66,7 +66,7 @@
   cd usr/share/licenses/common
 
   mkdir APACHE
-  cp $startdir/src/LICENSE-2.0.txt APACHE/license.txt
+  cp $startdir/src/apache-2.0.txt APACHE/license.txt
 
   mkdir CCPL
   cp $startdir/src/cc-by-3.0.txt CCPL/
@@ -92,12 +92,13 @@
   ln -s GPL2 GPL
 
   mkdir {FDL1.2,FDL1.3}
-  cp $startdir/src/fdl.txt FDL1.3/license.txt
+  cp $startdir/src/fdl-1.2.txt FDL1.2/license.txt
+  cp $startdir/src/fdl-1.3.txt FDL1.3/license.txt
   ln -s FDL1.2 FDL
 
   mkdir {LGPL2.1,LGPL3}
   cp $startdir/src/lgpl-2.1.txt LGPL2.1/license.txt
-  cp $startdir/src/lgpl.txt LGPL3/license.txt
+  cp $startdir/src/lgpl-3.0.txt LGPL3/license.txt
   ln -s LGPL2.1 LGPL
 
   mkdir LPPL
@@ -110,7 +111,7 @@
   cp $startdir/src/perlartistic.txt PerlArtistic/license.txt
 
   mkdir PHP
-  cp $startdir/src/3_0.txt PHP/license.txt
+  cp $startdir/src/php-3.0.txt PHP/license.txt
   
   mkdir PSF
   cp $startdir/src/python-2.txt PSF/license.txt
@@ -119,7 +120,7 @@
   cp $startdir/src/LICENSE.ralink-firmware.txt RALINK/license.txt
 
   mkdir RUBY
-  cp $startdir/src/LICENSE.txt RUBY/license.txt
+  cp $startdir/src/ruby-license.txt RUBY/license.txt
 
   mkdir ZPL
   cp $startdir/src/ZopePublicLicense.txt ZPL/license.txt