[arch-commits] Commit in xorg-server-utils/repos (6 files)
Jan de Groot
jgc at archlinux.org
Sun Nov 1 14:20:43 UTC 2009
Date: Sunday, November 1, 2009 @ 09:20:42
Author: jgc
Revision: 57678
Merged revisions 57677 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/xorg-server-utils/trunk
........
r57677 | jgc | 2009-11-01 15:20:04 +0100 (Sun, 01 Nov 2009) | 4 lines
upgpkg: xorg-server-utils 7.5-3
Fix xrdb (FS#16957, FS#16947)
Remove libxp dependency
Switch to included license files as much as possible
........
Modified:
xorg-server-utils/repos/extra-i686/ (properties)
xorg-server-utils/repos/extra-i686/PKGBUILD
Deleted:
xorg-server-utils/repos/extra-i686/LICENSE.xrdb
xorg-server-utils/repos/extra-i686/LICENSE.xrefresh
xorg-server-utils/repos/extra-i686/LICENSE.xset
xorg-server-utils/repos/extra-i686/LICENSE.xsetroot
------------------+
LICENSE.xrdb | 24 ------------------------
LICENSE.xrefresh | 42 ------------------------------------------
LICENSE.xset | 21 ---------------------
LICENSE.xsetroot | 24 ------------------------
PKGBUILD | 14 +++-----------
5 files changed, 3 insertions(+), 122 deletions(-)
Property changes on: xorg-server-utils/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /xorg-server-utils/trunk:1-56347
+ /xorg-server-utils/trunk:1-57677
Deleted: extra-i686/LICENSE.xrdb
===================================================================
--- extra-i686/LICENSE.xrdb 2009-11-01 14:20:04 UTC (rev 57677)
+++ extra-i686/LICENSE.xrdb 2009-11-01 14:20:42 UTC (rev 57678)
@@ -1,24 +0,0 @@
- 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.
Deleted: extra-i686/LICENSE.xrefresh
===================================================================
--- extra-i686/LICENSE.xrefresh 2009-11-01 14:20:04 UTC (rev 57677)
+++ extra-i686/LICENSE.xrefresh 2009-11-01 14:20:42 UTC (rev 57678)
@@ -1,42 +0,0 @@
- 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.
Deleted: extra-i686/LICENSE.xset
===================================================================
--- extra-i686/LICENSE.xset 2009-11-01 14:20:04 UTC (rev 57677)
+++ extra-i686/LICENSE.xset 2009-11-01 14:20:42 UTC (rev 57678)
@@ -1,21 +0,0 @@
- 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.
Deleted: extra-i686/LICENSE.xsetroot
===================================================================
--- extra-i686/LICENSE.xsetroot 2009-11-01 14:20:04 UTC (rev 57677)
+++ extra-i686/LICENSE.xsetroot 2009-11-01 14:20:42 UTC (rev 57678)
@@ -1,24 +0,0 @@
- 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
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-11-01 14:20:04 UTC (rev 57677)
+++ extra-i686/PKGBUILD 2009-11-01 14:20:42 UTC (rev 57678)
@@ -3,12 +3,12 @@
pkgname=xorg-server-utils
pkgver=7.5
-pkgrel=2
+pkgrel=3
pkgdesc="X.Org utilities required by xorg-server"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
-depends=('libxfontcache>=1.0.5' 'libxi>=1.3' 'libxaw>=1.0.6' 'libxxf86misc>=1.0.2' 'libxrandr>=1.3.0' 'libxxf86vm>=1.1.0' 'mcpp>=2.7.2' 'libxp>=1.0.0')
+depends=('libxfontcache>=1.0.5' 'libxi>=1.3' 'libxaw>=1.0.6' 'libxxf86misc>=1.0.2' 'libxrandr>=1.3.0' 'libxxf86vm>=1.1.0' 'mcpp>=2.7.2')
makedepends=('pkgconfig' 'xbitmaps' 'bigreqsproto' 'xtrans')
groups=('xorg')
source=(${url}/releases/individual/app/iceauth-1.0.3.tar.bz2
@@ -29,10 +29,6 @@
${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=('975ade3f238c1eb10705da0a91e6e8e7'
'44ea16cc3104de6401bc74035f642357'
@@ -52,10 +48,6 @@
'e0744594f4e5969b20df28d897781318'
'65695dc24c24958190724a23655ffda7'
'b6235416dca2205f0ba83c0c4b3ddeb8'
- 'd0a9bf9f958d238583af763819d64b5f'
- '008d85623476ccad16e056809ed43807'
- '19fa75322c9c3a40c20787c07ed3f8af'
- '3485f0bcea219af946adf6492f55b54c'
'4e6babde6334e3c5cb4a3136526aa564')
build() {
@@ -66,7 +58,7 @@
pushd "${i}"
case "${i}" in
xrdb*)
- ./configure --prefix=/usr --mandir=/usr/share/man --with-cpp=/usr/bin/mcpp\ - at old || return 1
+ ./configure --prefix=/usr --mandir=/usr/share/man --with-cpp=/usr/bin/mcpp || return 1
;;
*)
./configure --prefix=/usr --mandir=/usr/share/man || return 1
More information about the arch-commits
mailing list