[arch-commits] Commit in xorg-xkb-utils/trunk (4 files)

Jan de Groot jgc at archlinux.org
Thu Mar 10 10:20:44 UTC 2011


    Date: Thursday, March 10, 2011 @ 05:20:43
  Author: jgc
Revision: 113630

upgpkg: xorg-xkb-utils 7.6-1
Replace with transition package

Modified:
  xorg-xkb-utils/trunk/PKGBUILD
Deleted:
  xorg-xkb-utils/trunk/LICENSE.setxkbmap
  xorg-xkb-utils/trunk/LICENSE.xkbevd
  xorg-xkb-utils/trunk/LICENSE.xkbutils

-------------------+
 LICENSE.setxkbmap |   22 ----------------------
 LICENSE.xkbevd    |   22 ----------------------
 LICENSE.xkbutils  |   22 ----------------------
 PKGBUILD          |   39 ++++++---------------------------------
 4 files changed, 6 insertions(+), 99 deletions(-)

Deleted: LICENSE.setxkbmap
===================================================================
--- LICENSE.setxkbmap	2011-03-10 10:15:12 UTC (rev 113629)
+++ LICENSE.setxkbmap	2011-03-10 10:20:43 UTC (rev 113630)
@@ -1,22 +0,0 @@
-   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.

Deleted: LICENSE.xkbevd
===================================================================
--- LICENSE.xkbevd	2011-03-10 10:15:12 UTC (rev 113629)
+++ LICENSE.xkbevd	2011-03-10 10:20:43 UTC (rev 113630)
@@ -1,22 +0,0 @@
-  Copyright (c) 1995 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.

Deleted: LICENSE.xkbutils
===================================================================
--- LICENSE.xkbutils	2011-03-10 10:15:12 UTC (rev 113629)
+++ LICENSE.xkbutils	2011-03-10 10:20:43 UTC (rev 113630)
@@ -1,22 +0,0 @@
-  Copyright (c) 1995 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: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-10 10:15:12 UTC (rev 113629)
+++ PKGBUILD	2011-03-10 10:20:43 UTC (rev 113630)
@@ -2,41 +2,14 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-xkb-utils
-pkgver=7.5
-pkgrel=2
-pkgdesc="X.org keyboard utilities"
-arch=(i686 x86_64)
+pkgver=7.6
+pkgrel=1
+pkgdesc="Transition package depending on various X keyboard utilities"
+arch=(any)
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libxaw>=1.0.5' 'libxkbfile')
-makedepends=(pkgconfig inputproto)
-source=(${url}/releases/individual/app/xkbutils-1.0.2.tar.bz2
-        ${url}/releases/individual/app/xkbcomp-1.1.1.tar.bz2
-        ${url}/releases/individual/app/xkbevd-1.1.0.tar.bz2
-        ${url}/releases/individual/app/setxkbmap-1.1.0.tar.bz2
-        ${url}/releases/individual/app/xkbprint-1.0.2.tar.bz2
-        LICENSE.setxkbmap LICENSE.xkbevd LICENSE.xkbutils)
-md5sums=('369a21641b7ca983d6641298e51d97f8'
-         '38c387bacdc01038c8ac280588792bcf'
-         '8d3c1485c2dd62ea7395a37377958a39'
-         '2f902e0a89aaf2b19e06e7f26c6efb3a'
-         '3d3eb10466442354d6b73b503b9829db'
-         '7c20baa6a26c32a04b1b1d6cbaa626a7'
-         '7b1fc39455375a25afe6f9594ff979ac'
-         '7b1fc39455375a25afe6f9594ff979ac')
+depends=('xorg-xkbutils' 'xorg-xkbcomp' 'xorg-xkbevd' 'xorg-setxkbmap')
 
 build() {
-  cd "${srcdir}"
-  for i in *; do
-    if [ -d "${i}" ]; then
-      pushd "${i}"
-      ./configure --prefix=/usr --mandir=/usr/share/man || return 1
-      make || return 1
-      make DESTDIR="${pkgdir}" install || return 1
-      install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE.${i%-*}  || return 1
-      popd
-    fi
-  done
-# Replacing stub license files
-  install -D -m644 "${srcdir}"/LICENSE.* "${pkgdir}/usr/share/licenses/${pkgname}/"  || return 1
+  return 0
 }




More information about the arch-commits mailing list