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

[Thayer Williams]

    Date: Sunday, November 23, 2008 @ 23:07:45
  Author: thayer
Revision: 19483

Merged revisions 19482 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/archlinux-artwork/trunk

........
  r19482 | thayer | 2008-11-23 20:07:18 -0800 (Sun, 23 Nov 2008) | 2 lines
  
  upgpkg: archlinux-artwork 1.2-1
      license clarification
........

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

-----------------------+
 extra-i686/ChangeLog  |   21 ---------------------
 extra-i686/PKGBUILD   |   13 +++++++++----
 extra-x86_64/PKGBUILD |   16 ++++++++--------
 3 files changed, 17 insertions(+), 33 deletions(-)


Property changes on: archlinux-artwork/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /archlinux-artwork/trunk:1-19449
   + /archlinux-artwork/trunk:1-19482

Deleted: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2008-11-24 04:07:18 UTC (rev 19482)
+++ extra-i686/ChangeLog	2008-11-24 04:07:45 UTC (rev 19483)
@@ -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-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-24 04:07:18 UTC (rev 19482)
+++ extra-i686/PKGBUILD	2008-11-24 04:07:45 UTC (rev 19483)
@@ -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/
 }
 

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-24 04:07:18 UTC (rev 19482)
+++ extra-x86_64/PKGBUILD	2008-11-24 04:07:45 UTC (rev 19483)
@@ -13,14 +13,14 @@
 md5sums=('66b457dcc9f52590e4910695f09142e5')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  mkdir -p ${startdir}/pkg/usr/share/archlinux/{docs,cd-labels,icons,logos,wmlogos}
+  cd $srcdir/$pkgname-$pkgver
+  mkdir -p $pkgdir/usr/share/archlinux/{docs,cd-labels,icons,logos,wmlogos}
 
-  install -m644 FONTS ${startdir}/pkg/usr/share/archlinux/docs/
-  install -m644 TRADEMARKS ${startdir}/pkg/usr/share/archlinux/docs/
-  install -m644 cd-labels/* ${startdir}/pkg/usr/share/archlinux/cd-labels/
-  install -m644 icons/* ${startdir}/pkg/usr/share/archlinux/icons/
-  install -m644 logos/* ${startdir}/pkg/usr/share/archlinux/logos/
-  install -m644 wmlogos/* ${startdir}/pkg/usr/share/archlinux/wmlogos/
+  install -m644 FONTS $pkgdir/usr/share/archlinux/docs/
+  install -m644 TRADEMARKS $pkgdir/usr/share/archlinux/docs/
+  install -m644 cd-labels/* $pkgdir/usr/share/archlinux/cd-labels/
+  install -m644 icons/* $pkgdir/usr/share/archlinux/icons/
+  install -m644 logos/* $pkgdir/usr/share/archlinux/logos/
+  install -m644 wmlogos/* $pkgdir/usr/share/archlinux/wmlogos/
 }