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

Eric Bélanger eric at archlinux.org
Tue Apr 14 19:56:18 EDT 2009


    Date: Tuesday, April 14, 2009 @ 19:56:18
  Author: eric
Revision: 35640

Fixed svn conflict

Added:
  libxkbui/repos/extra-x86_64/LICENSE
    (from rev 35639, libxkbui/trunk/LICENSE)
Modified:
  libxkbui/repos/extra-x86_64/	(properties)
  libxkbui/repos/extra-x86_64/PKGBUILD

----------+
 LICENSE  |   25 +++++++++++++++++++++++++
 PKGBUILD |   10 ++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)


Property changes on: libxkbui/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /libxkbui/trunk:1-19188
   + /libxkbui/trunk:1-35639

Copied: libxkbui/repos/extra-x86_64/LICENSE (from rev 35639, libxkbui/trunk/LICENSE)
===================================================================
--- extra-x86_64/LICENSE	                        (rev 0)
+++ extra-x86_64/LICENSE	2009-04-14 23:56:18 UTC (rev 35640)
@@ -0,0 +1,25 @@
+/************************************************************
+ Copyright (c) 1996 by Silicon Graphics Computer Systems, Inc.
+
+ Permission to use, copy, modify, and distribute this
+ software and its documentation for any purpose and without
+ fee is hereby granted, provided that the above copyright
+ notice appear in all copies and that both that copyright
+ notice and this permission notice appear in supporting
+ documentation, and that the name of Silicon Graphics not be 
+ used in advertising or publicity pertaining to distribution 
+ of the software without specific prior written permission.
+ Silicon Graphics makes no representation about the suitability 
+ of this software for any purpose. It is provided "as is"
+ without any express or implied warranty.
+ 
+ SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+ AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+ GRAPHICS BE LIABLE FOR 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.
+
+ ********************************************************/

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-14 23:53:57 UTC (rev 35639)
+++ extra-x86_64/PKGBUILD	2009-04-14 23:56:18 UTC (rev 35640)
@@ -3,19 +3,21 @@
 
 pkgname=libxkbui
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 keyboard UI presentation library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=('libxt' 'libxkbfile')
 makedepends=('pkgconfig')
 options=(!libtool)
-source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('1143e456f7429e18e88f2eadb2f2b6b1')
+source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 LICENSE)
+md5sums=('1143e456f7429e18e88f2eadb2f2b6b1' 'd1efaa1271fc028cd5bec33f836ee9ef')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
+  install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }



More information about the arch-commits mailing list