[arch-commits] Commit in archlinux-artwork/repos (3 files)

[Eric Belanger]

    Date: Saturday, October 18, 2008 @ 16:31:34
  Author: eric
Revision: 15771

Merged revisions 8129,15670 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/archlinux-artwork/trunk

........
  r8129 | thayer | 2008-08-06 20:26:26 -0400 (Wed, 06 Aug 2008) | 1 line
  
  removing archlinux-themes-ksplash package
........
  r15670 | thayer | 2008-10-16 20:45:43 -0400 (Thu, 16 Oct 2008) | 2 lines
  
  upgpkg: archlinux-artwork 1.1-2
      license clarification
........

Modified:
  archlinux-artwork/repos/extra-x86_64/	(properties)
  archlinux-artwork/repos/extra-x86_64/ChangeLog
  archlinux-artwork/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |    9 ++++-----
 PKGBUILD  |    6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)


Property changes on: archlinux-artwork/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /archlinux-artwork/trunk:1-2506
   + /archlinux-artwork/trunk:1-15770

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-10-18 16:46:04 UTC (rev 15770)
+++ extra-x86_64/ChangeLog	2008-10-18 20:31:34 UTC (rev 15771)
@@ -1,19 +1,18 @@
-2008-06-04 Thayer Williams <thayer at archlinux.org>
+2008-10-16 Thayer Williams <thayer at archlinux.org>
+	* 1.1-2 :
+	license clarification
 
+2008-06-04 Thayer Williams <thayer at archlinux.org>
 	* 1.1-1 :
 	add more versions of Arch logo
 	added TRADEMARKS file
 	added awesome wm logo courtesy of Branko "foxbunny" Vukelic
 
 2008-05-10 Thayer Williams <thayer at archlinux.org>
-
 	* 1.0-3 :
 	more package cleanup
 	
 2008-05-08 Thayer Williams <thayer at archlinux.org>
-
-	* 1.0-3 :
-	more package cleanup
 	* 1.0-2 :
 	package maintenance
 	fixed post-install message

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-10-18 16:46:04 UTC (rev 15770)
+++ extra-x86_64/PKGBUILD	2008-10-18 20:31:34 UTC (rev 15771)
@@ -3,11 +3,11 @@
 
 pkgname=archlinux-artwork
 pkgver=1.1
-pkgrel=1
-pkgdesc="Official logos, icons, CD labels and other artwork for Archlinux"
+pkgrel=2
+pkgdesc="Official logos, icons, CD labels and other artwork for Arch Linux"
 arch=(i686 x86_64)
 url="http://www.archlinux.org/"
-license=('GPL')
+license=('CCPL:cc-by-sa')
 install=archlinux-artwork.install
 source=(ftp://ftp.archlinux.org/other/artwork/${pkgname}-${pkgver}.tar.gz)
 md5sums=('66b457dcc9f52590e4910695f09142e5')