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

[Eric Bélanger]

    Date: Saturday, May 2, 2009 @ 22:20:10
  Author: eric
Revision: 37565

Fixed svn conflict

Added:
  transset/repos/extra-x86_64/LICENSE
    (from rev 37564, transset/trunk/LICENSE)
Modified:
  transset/repos/extra-x86_64/	(properties)
  transset/repos/extra-x86_64/PKGBUILD
Deleted:
  transset/repos/extra-x86_64/transset-20050711.tar.bz2

----------+
 LICENSE  |   23 +++++++++++++++++++++++
 PKGBUILD |   14 ++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)


Property changes on: transset/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /transset/trunk:1
   + /transset/trunk:1-37564

Copied: transset/repos/extra-x86_64/LICENSE (from rev 37564, transset/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE	                        (rev 0)
+++ extra-x86_64/LICENSE	2009-05-03 02:20:10 UTC (rev 37565)
@@ -0,0 +1,23 @@
+Copyright 1993, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+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.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-03 02:18:45 UTC (rev 37564)
+++ extra-x86_64/PKGBUILD	2009-05-03 02:20:10 UTC (rev 37565)
@@ -4,18 +4,20 @@
 
 pkgname=transset
 pkgver=20050711
-pkgrel=2
+pkgrel=3
 pkgdesc="Translucency settings tool for X.org"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/Software/xapps"
 depends=('libxdamage' 'libxcomposite' 'libxrender')
+license=('custom')
 conflicts=('xapps')
-source=($pkgname-$pkgver.tar.bz2)
-md5sums=('bfb0fc7228636853711734c9a8049ef3')
+source=(ftp://ftp.archlinux.org/other/transset/$pkgname-$pkgver.tar.bz2 LICENSE)
+md5sums=('bfb0fc7228636853711734c9a8049ef3' '8fea8210c4b586c174e652e64d3e579d')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver
   make || return 1
-  install -D -m755 transset $startdir/pkg/usr/bin/transset
+  install -D -m755 transset $pkgdir/usr/bin/transset
+  install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 

Deleted: extra-x86_64/transset-20050711.tar.bz2
===================================================================
(Binary files differ)