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

[Thayer Williams]

    Date: Monday, November 24, 2008 @ 11:41:19
  Author: thayer
Revision: 19491

archrelease: new repo x86_64

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

-----------+
 ChangeLog |   21 ---------------------
 PKGBUILD  |   13 +++++++++----
 2 files changed, 9 insertions(+), 25 deletions(-)


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

Deleted: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-11-24 16:18:43 UTC (rev 19490)
+++ extra-x86_64/ChangeLog	2008-11-24 16:41:19 UTC (rev 19491)
@@ -1,21 +0,0 @@
-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-2 :
-	package maintenance
-	fixed post-install message
-	* 1.0-1 :
-	initial release.
-

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-24 16:18:43 UTC (rev 19490)
+++ extra-x86_64/PKGBUILD	2008-11-24 16:41:19 UTC (rev 19491)
@@ -1,16 +1,17 @@
 # $Id$
+# Contributor: Thayer Williams <thayer at archlinux.org>
 # Maintainer: Thayer Williams <thayer at archlinux.org>
 
 pkgname=archlinux-artwork
-pkgver=1.1
-pkgrel=2
+pkgver=1.2
+pkgrel=1
 pkgdesc="Official logos, icons, CD labels and other artwork for Arch Linux"
 arch=(i686 x86_64)
 url="http://www.archlinux.org/"
-license=('CCPL:cc-by-sa')
+license=('CCPL:cc-by-nc-sa' 'custom:TRADEMARKS')
 install=archlinux-artwork.install
 source=(ftp://ftp.archlinux.org/other/artwork/${pkgname}-${pkgver}.tar.gz)
-md5sums=('66b457dcc9f52590e4910695f09142e5')
+md5sums=('9ce126e83a15a21e24eedcd4bdcd0741')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -22,5 +23,9 @@
   install -m644 icons/* $pkgdir/usr/share/archlinux/icons/
   install -m644 logos/* $pkgdir/usr/share/archlinux/logos/
   install -m644 wmlogos/* $pkgdir/usr/share/archlinux/wmlogos/
+
+  # add the custom license
+  mkdir -p $pkgdir/usr/share/licenses/custom/$pkgname/
+  install -m644 TRADEMARKS $pkgdir/usr/share/licenses/custom/$pkgname/
 }