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

[Thayer Williams]

    Date: Wednesday, June 4, 2008 @ 11:41:20
  Author: thayer
Revision: 2507

Merged revisions 1471-2506 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/archlinux-artwork/trunk

........
  r2228 | thayer | 2008-05-29 15:01:56 -0700 (Thu, 29 May 2008) | 3 lines
  
  Initial build of archlinux-themes-kde.
  PKGBUILD description cleanup.
........
  r2505 | thayer | 2008-06-04 08:38:48 -0700 (Wed, 04 Jun 2008) | 2 lines
  
  upgpkg: archlinux-artwork 1.1-1
      new logos added. see changelog for details
........

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

-----------+
 ChangeLog |   14 +++++++++++++-
 PKGBUILD  |   15 ++++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)


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

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-06-04 15:39:18 UTC (rev 2506)
+++ extra-x86_64/ChangeLog	2008-06-04 15:41:20 UTC (rev 2507)
@@ -1,7 +1,19 @@
-2008-05-07 Thayer Williams <thayer at archlinux.org>
+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-06-04 15:39:18 UTC (rev 2506)
+++ extra-x86_64/PKGBUILD	2008-06-04 15:41:20 UTC (rev 2507)
@@ -2,21 +2,22 @@
 # Maintainer: Thayer Williams <thayer at archlinux.org>
 
 pkgname=archlinux-artwork
-pkgver=1.0
-pkgrel=3
-pkgdesc="Official logos, icons, CD labels and other artwork for Arch Linux"
+pkgver=1.1
+pkgrel=1
+pkgdesc="Official logos, icons, CD labels and other artwork for Archlinux"
 arch=(i686 x86_64)
 url="http://www.archlinux.org/"
-license=('CCPL:by-nc-sa')
+license=('GPL')
 install=archlinux-artwork.install
 source=(ftp://ftp.archlinux.org/other/artwork/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f8ffcf460f592d1b1e001575943d5a84')
+md5sums=('66b457dcc9f52590e4910695f09142e5')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  mkdir -p ${startdir}/pkg/usr/share/archlinux/{cd-labels,icons,logos,wmlogos}
+  mkdir -p ${startdir}/pkg/usr/share/archlinux/{docs,cd-labels,icons,logos,wmlogos}
 
-  install -m644 FONTS ${startdir}/pkg/usr/share/archlinux/
+  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/