[arch-commits] Commit in xorg-server-utils/repos (9 files)

Eric Bélanger eric at archlinux.org
Sun Apr 26 23:47:29 UTC 2009


    Date: Sunday, April 26, 2009 @ 19:47:29
  Author: eric
Revision: 36708

Merged revisions 36707 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xorg-server-utils/trunk

........
  r36707 | eric | 2009-04-26 19:47:14 -0400 (Sun, 26 Apr 2009) | 2 lines
  
  upgpkg: xorg-server-utils 7.4-5
      Added license
........

Added:
  xorg-server-utils/repos/extra-x86_64/LICENSE.iceauth
    (from rev 36707, xorg-server-utils/trunk/LICENSE.iceauth)
  xorg-server-utils/repos/extra-x86_64/LICENSE.xcmsdb
    (from rev 36707, xorg-server-utils/trunk/LICENSE.xcmsdb)
  xorg-server-utils/repos/extra-x86_64/LICENSE.xrdb
    (from rev 36707, xorg-server-utils/trunk/LICENSE.xrdb)
  xorg-server-utils/repos/extra-x86_64/LICENSE.xrefresh
    (from rev 36707, xorg-server-utils/trunk/LICENSE.xrefresh)
  xorg-server-utils/repos/extra-x86_64/LICENSE.xset
    (from rev 36707, xorg-server-utils/trunk/LICENSE.xset)
  xorg-server-utils/repos/extra-x86_64/LICENSE.xsetroot
    (from rev 36707, xorg-server-utils/trunk/LICENSE.xsetroot)
  xorg-server-utils/repos/extra-x86_64/LICENSE.xvidtune
    (from rev 36707, xorg-server-utils/trunk/LICENSE.xvidtune)
Modified:
  xorg-server-utils/repos/extra-x86_64/	(properties)
  xorg-server-utils/repos/extra-x86_64/PKGBUILD

------------------+
 LICENSE.iceauth  |   25 +++++++++++++++++++++++++
 LICENSE.xcmsdb   |   18 ++++++++++++++++++
 LICENSE.xrdb     |   24 ++++++++++++++++++++++++
 LICENSE.xrefresh |   42 ++++++++++++++++++++++++++++++++++++++++++
 LICENSE.xset     |   21 +++++++++++++++++++++
 LICENSE.xsetroot |   24 ++++++++++++++++++++++++
 LICENSE.xvidtune |   25 +++++++++++++++++++++++++
 PKGBUILD         |   40 +++++++++++++++++++++-------------------
 8 files changed, 200 insertions(+), 19 deletions(-)


Property changes on: xorg-server-utils/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /xorg-server-utils/trunk:1-34604
   + /xorg-server-utils/trunk:1-36707

Copied: xorg-server-utils/repos/extra-x86_64/LICENSE.iceauth (from rev 36707, xorg-server-utils/trunk/LICENSE.iceauth)
===================================================================
--- extra-x86_64/LICENSE.iceauth	                        (rev 0)
+++ extra-x86_64/LICENSE.iceauth	2009-04-26 23:47:29 UTC (rev 36708)
@@ -0,0 +1,25 @@
+  Copyright 1989, 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.
+   * *
+   * Original Author of "xauth" : Jim Fulton, MIT X Consortium
+   * Modified into "iceauth"    : Ralph Mor, X Consortium
+   */

Copied: xorg-server-utils/repos/extra-x86_64/LICENSE.xcmsdb (from rev 36707, xorg-server-utils/trunk/LICENSE.xcmsdb)
===================================================================
--- extra-x86_64/LICENSE.xcmsdb	                        (rev 0)
+++ extra-x86_64/LICENSE.xcmsdb	2009-04-26 23:47:29 UTC (rev 36708)
@@ -0,0 +1,18 @@
+   (c) Copyright 1990 Tektronix Inc.
+   	All Rights Reserved
+   
+   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 Tektronix not be used
+   in advertising or publicity pertaining to distribution of the software
+   without specific, written prior permission.
+   
+   Tektronix disclaims all warranties with regard to this software, including
+   all implied warranties of merchantability and fitness, in no event shall
+   Tektronix 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.

Copied: xorg-server-utils/repos/extra-x86_64/LICENSE.xrdb (from rev 36707, xorg-server-utils/trunk/LICENSE.xrdb)
===================================================================
--- extra-x86_64/LICENSE.xrdb	                        (rev 0)
+++ extra-x86_64/LICENSE.xrdb	2009-04-26 23:47:29 UTC (rev 36708)
@@ -0,0 +1,24 @@
+   		  COPYRIGHT 1987, 1991
+   	   DIGITAL EQUIPMENT CORPORATION
+   	       MAYNARD, MASSACHUSETTS
+   	   MASSACHUSETTS INSTITUTE OF TECHNOLOGY
+   	       CAMBRIDGE, MASSACHUSETTS
+   		ALL RIGHTS RESERVED.
+  
+  THE INFORMATION IN THIS SOFTWARE IS SUBJECT TO CHANGE WITHOUT NOTICE AND
+  SHOULD NOT BE CONSTRUED AS A COMMITMENT BY DIGITAL EQUIPMENT CORPORATION.
+  DIGITAL MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THIS SOFTWARE FOR
+  ANY PURPOSE.  IT IS SUPPLIED "AS IS" WITHOUT EXPRESS OR IMPLIED WARRANTY.
+  
+  IF THE SOFTWARE IS MODIFIED IN A MANNER CREATING DERIVATIVE COPYRIGHT RIGHTS,
+  APPROPRIATE LEGENDS MAY BE PLACED ON THE DERIVATIVE WORK IN ADDITION TO THAT
+  SET FORTH ABOVE.
+  
+  
+  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 Digital Equipment Corporation not be
+  used in advertising or publicity pertaining to distribution of the software
+  without specific, written prior permission.

Copied: xorg-server-utils/repos/extra-x86_64/LICENSE.xrefresh (from rev 36707, xorg-server-utils/trunk/LICENSE.xrefresh)
===================================================================
--- extra-x86_64/LICENSE.xrefresh	                        (rev 0)
+++ extra-x86_64/LICENSE.xrefresh	2009-04-26 23:47:29 UTC (rev 36708)
@@ -0,0 +1,42 @@
+  Copyright 1987, 1988, 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.
+  
+  
+  Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
+  
+                          All Rights Reserved
+  
+  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 Digital not be
+  used in advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.  
+  
+  DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+  DIGITAL 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.

Copied: xorg-server-utils/repos/extra-x86_64/LICENSE.xset (from rev 36707, xorg-server-utils/trunk/LICENSE.xset)
===================================================================
--- extra-x86_64/LICENSE.xset	                        (rev 0)
+++ extra-x86_64/LICENSE.xset	2009-04-26 23:47:29 UTC (rev 36708)
@@ -0,0 +1,21 @@
+  Copyright 1985, 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.

Copied: xorg-server-utils/repos/extra-x86_64/LICENSE.xsetroot (from rev 36707, xorg-server-utils/trunk/LICENSE.xsetroot)
===================================================================
--- extra-x86_64/LICENSE.xsetroot	                        (rev 0)
+++ extra-x86_64/LICENSE.xsetroot	2009-04-26 23:47:29 UTC (rev 36708)
@@ -0,0 +1,24 @@
+  Copyright 1987, 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.
+   */
+   *  Author:	Mark Lillibridge, MIT Project Athena
+   *		11-Jun-87

Copied: xorg-server-utils/repos/extra-x86_64/LICENSE.xvidtune (from rev 36707, xorg-server-utils/trunk/LICENSE.xvidtune)
===================================================================
--- extra-x86_64/LICENSE.xvidtune	                        (rev 0)
+++ extra-x86_64/LICENSE.xvidtune	2009-04-26 23:47:29 UTC (rev 36708)
@@ -0,0 +1,25 @@
+  Copyright (c) 1995  Kaleb S. KEITHLEY
+  
+  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, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+  
+  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 Kaleb S. KEITHLEY 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 Kaleb S. KEITHLEY 
+  shall not be used in advertising or otherwise to promote the sale, use 
+  or other dealings in this Software without prior written authorization
+  from Kaleb S. KEITHLEY.

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-26 23:47:14 UTC (rev 36707)
+++ extra-x86_64/PKGBUILD	2009-04-26 23:47:29 UTC (rev 36708)
@@ -3,10 +3,11 @@
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xorg-server-utils
 pkgver=7.4
-pkgrel=4
+pkgrel=5
 pkgdesc="X.Org utilities required by xorg-server"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
+license=('custom')
 depends=('libxfontcache' 'libxi' 'libxaw' 'libxxf86misc' 'libxrandr' 'libxxf86vm' 'mcpp>=2.6')
 makedepends=('pkgconfig' 'xbitmaps' 'bigreqsproto' 'xtrans')
 groups=('xorg')
@@ -25,26 +26,24 @@
         ${url}/releases/individual/app/xset-1.0.4.tar.bz2
         ${url}/releases/individual/app/xsetmode-1.0.0.tar.bz2
         ${url}/releases/individual/app/xsetroot-1.0.2.tar.bz2
-	${url}/releases/individual/app/xvidtune-1.0.1.tar.bz2)
-md5sums=('7ab8b64edf0212a9d9a3c8129901a450'
-         '44ea16cc3104de6401bc74035f642357'
-         '839e968d7197b9563f0fd8a5a3aac2e3'
-         '8579d5f50ba7f0c4a5bf16b9670fea01'
-         '51b4a1c0ae2b3bd77417306fd78a3e94'
-         'f13ddedaa63a608d3b025d326f4f5b5d'
-         'f746aba36f075ae4cae313d849a94f4e'
-         '47c854a63cc2a50d45d6d9a2289ece07'
-         '626731003ec22a74ecf9e44ed098bbdf'
-         '616612a15711a4422e71be6acc42ca3c'
-         '9c30b8e1709d5367beb7706146640c07'
-         '1228f890f86148e4e6ae22aa73118cbb'
-         '2f41fd983ba4d89419204854936025e2'
-         'd074e79d380b031d2f60e4cd56538c93'
-         '9af7db9f3052aef0b11636720b3101dd'
-         'e0744594f4e5969b20df28d897781318')
+	${url}/releases/individual/app/xvidtune-1.0.1.tar.bz2
+        LICENSE.iceauth LICENSE.xcmsdb LICENSE.xrdb LICENSE.xrefresh 
+        LICENSE.xset LICENSE.xsetroot LICENSE.xvidtune)
+md5sums=('7ab8b64edf0212a9d9a3c8129901a450' '44ea16cc3104de6401bc74035f642357'\
+         '839e968d7197b9563f0fd8a5a3aac2e3' '8579d5f50ba7f0c4a5bf16b9670fea01'\
+         '51b4a1c0ae2b3bd77417306fd78a3e94' 'f13ddedaa63a608d3b025d326f4f5b5d'\
+         'f746aba36f075ae4cae313d849a94f4e' '47c854a63cc2a50d45d6d9a2289ece07'\
+         '626731003ec22a74ecf9e44ed098bbdf' '616612a15711a4422e71be6acc42ca3c'\
+         '9c30b8e1709d5367beb7706146640c07' '1228f890f86148e4e6ae22aa73118cbb'\
+         '2f41fd983ba4d89419204854936025e2' 'd074e79d380b031d2f60e4cd56538c93'\
+         '9af7db9f3052aef0b11636720b3101dd' 'e0744594f4e5969b20df28d897781318'\
+         '65695dc24c24958190724a23655ffda7' 'b6235416dca2205f0ba83c0c4b3ddeb8'\
+         'd0a9bf9f958d238583af763819d64b5f' '008d85623476ccad16e056809ed43807'\
+         '19fa75322c9c3a40c20787c07ed3f8af' '3485f0bcea219af946adf6492f55b54c'\
+         '4e6babde6334e3c5cb4a3136526aa564')
 
 build() {
-  cd ${startdir}/src
+  cd "${srcdir}"
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
@@ -58,7 +57,10 @@
       esac
       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
 }




More information about the arch-commits mailing list