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

[Eric Bélanger]

    Date: Sunday, March 29, 2009 @ 18:58:01
  Author: eric
Revision: 32271

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

........
  r32260 | eric | 2009-03-29 18:12:12 -0400 (Sun, 29 Mar 2009) | 2 lines
  
  upgpkg: cdlabelgen 4.1.0-2
      Added license
........

Added:
  cdlabelgen/repos/extra-i686/LICENSE
    (from rev 32260, cdlabelgen/trunk/LICENSE)
Modified:
  cdlabelgen/repos/extra-i686/	(properties)
  cdlabelgen/repos/extra-i686/PKGBUILD

----------+
 LICENSE  |   30 ++++++++++++++++++++++++++++++
 PKGBUILD |   16 ++++++++--------
 2 files changed, 38 insertions(+), 8 deletions(-)


Property changes on: cdlabelgen/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /cdlabelgen/trunk:1-22100
   + /cdlabelgen/trunk:1-32270

Copied: cdlabelgen/repos/extra-i686/LICENSE (from rev 32260, cdlabelgen/trunk/LICENSE)
===================================================================
--- extra-i686/LICENSE	                        (rev 0)
+++ extra-i686/LICENSE	2009-03-29 22:58:01 UTC (rev 32271)
@@ -0,0 +1,30 @@
+# -----------------------------------------------------------------------
+# Copyright (C) 2002 Avinash Chopde <avinash at acm.org> http://www.aczoom.com/
+#
+# All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+# ========================================================================

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-29 22:54:36 UTC (rev 32270)
+++ extra-i686/PKGBUILD	2009-03-29 22:58:01 UTC (rev 32271)
@@ -4,18 +4,18 @@
 
 pkgname=cdlabelgen
 pkgver=4.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Generates frontcards and traycards for CDs."
 arch=('i686' 'x86_64')
 url="http://www.aczoom.com/tools/cdinsert/"
+license=('MIT')
 depends=('perl')
-source=(http://www.aczoom.com/pub/tools/$pkgname-$pkgver.tgz)
-md5sums=('327673292732c1ad71ae15e0db13d0e4')
+source=(http://www.aczoom.com/pub/tools/$pkgname-$pkgver.tgz LICENSE)
+md5sums=('327673292732c1ad71ae15e0db13d0e4' '48166ff2bf32faab4b45c6b9981446ee')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  install -d $startdir/pkg/usr/share/man/man1
-  make BASE_DIR=$startdir/pkg/usr \
-       MAN_DIR=$startdir/pkg/usr/share/man install
+  cd $srcdir/$pkgname-$pkgver
+  install -d $pkgdir/usr/share/man/man1 
+  make BASE_DIR=$pkgdir/usr install || return 1
+  install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
-# vim: ts=2 sw=2 et ft=sh