[arch-commits] Commit in xorg-utils/repos (11 files)
Eric Bélanger
eric at archlinux.org
Sun Apr 26 23:43:09 UTC 2009
Date: Sunday, April 26, 2009 @ 19:43:08
Author: eric
Revision: 36706
Merged revisions 36705 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/xorg-utils/trunk
........
r36705 | eric | 2009-04-26 19:42:52 -0400 (Sun, 26 Apr 2009) | 2 lines
upgpkg: xorg-utils 7.4-4
Added license, Added glproto makedepends
........
Added:
xorg-utils/repos/extra-x86_64/LICENSE.xdpyinfo
(from rev 36705, xorg-utils/trunk/LICENSE.xdpyinfo)
xorg-utils/repos/extra-x86_64/LICENSE.xev
(from rev 36705, xorg-utils/trunk/LICENSE.xev)
xorg-utils/repos/extra-x86_64/LICENSE.xfd
(from rev 36705, xorg-utils/trunk/LICENSE.xfd)
xorg-utils/repos/extra-x86_64/LICENSE.xlsatoms
(from rev 36705, xorg-utils/trunk/LICENSE.xlsatoms)
xorg-utils/repos/extra-x86_64/LICENSE.xlsclients
(from rev 36705, xorg-utils/trunk/LICENSE.xlsclients)
xorg-utils/repos/extra-x86_64/LICENSE.xlsfonts
(from rev 36705, xorg-utils/trunk/LICENSE.xlsfonts)
xorg-utils/repos/extra-x86_64/LICENSE.xprop
(from rev 36705, xorg-utils/trunk/LICENSE.xprop)
xorg-utils/repos/extra-x86_64/LICENSE.xvinfo
(from rev 36705, xorg-utils/trunk/LICENSE.xvinfo)
xorg-utils/repos/extra-x86_64/LICENSE.xwininfo
(from rev 36705, xorg-utils/trunk/LICENSE.xwininfo)
Modified:
xorg-utils/repos/extra-x86_64/ (properties)
xorg-utils/repos/extra-x86_64/PKGBUILD
--------------------+
LICENSE.xdpyinfo | 26 ++++++++++++++++++++++++++
LICENSE.xev | 25 +++++++++++++++++++++++++
LICENSE.xfd | 25 +++++++++++++++++++++++++
LICENSE.xlsatoms | 24 ++++++++++++++++++++++++
LICENSE.xlsclients | 25 +++++++++++++++++++++++++
LICENSE.xlsfonts | 22 ++++++++++++++++++++++
LICENSE.xprop | 45 +++++++++++++++++++++++++++++++++++++++++++++
LICENSE.xvinfo | 24 ++++++++++++++++++++++++
LICENSE.xwininfo | 26 ++++++++++++++++++++++++++
PKGBUILD | 19 +++++++++++++++----
10 files changed, 257 insertions(+), 4 deletions(-)
Property changes on: xorg-utils/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /xorg-utils/trunk:1-34601
+ /xorg-utils/trunk:1-36705
Copied: xorg-utils/repos/extra-x86_64/LICENSE.xdpyinfo (from rev 36705, xorg-utils/trunk/LICENSE.xdpyinfo)
===================================================================
--- extra-x86_64/LICENSE.xdpyinfo (rev 0)
+++ extra-x86_64/LICENSE.xdpyinfo 2009-04-26 23:43:08 UTC (rev 36706)
@@ -0,0 +1,26 @@
+ Copyright 1988, 1998 The Open Group
+ Copyright 2005 Hitachi, Ltd.
+
+ 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: Jim Fulton, MIT X Consortium
+ */
+
Copied: xorg-utils/repos/extra-x86_64/LICENSE.xev (from rev 36705, xorg-utils/trunk/LICENSE.xev)
===================================================================
--- extra-x86_64/LICENSE.xev (rev 0)
+++ extra-x86_64/LICENSE.xev 2009-04-26 23:43:08 UTC (rev 36706)
@@ -0,0 +1,25 @@
+ Copyright (c) 1988 X Consortium
+
+ 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 THE X CONSORTIUM 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 X Consortium 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 X Consortium.
Copied: xorg-utils/repos/extra-x86_64/LICENSE.xfd (from rev 36705, xorg-utils/trunk/LICENSE.xfd)
===================================================================
--- extra-x86_64/LICENSE.xfd (rev 0)
+++ extra-x86_64/LICENSE.xfd 2009-04-26 23:43:08 UTC (rev 36706)
@@ -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.
+ * *
+ * Author: Jim Fulton, MIT X Consortium
+ */
+
Copied: xorg-utils/repos/extra-x86_64/LICENSE.xlsatoms (from rev 36705, xorg-utils/trunk/LICENSE.xlsatoms)
===================================================================
--- extra-x86_64/LICENSE.xlsatoms (rev 0)
+++ extra-x86_64/LICENSE.xlsatoms 2009-04-26 23:43:08 UTC (rev 36706)
@@ -0,0 +1,24 @@
+ 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.
+ *
+ * Author: Jim Fulton, MIT X Consortium
+
Copied: xorg-utils/repos/extra-x86_64/LICENSE.xlsclients (from rev 36705, xorg-utils/trunk/LICENSE.xlsclients)
===================================================================
--- extra-x86_64/LICENSE.xlsclients (rev 0)
+++ extra-x86_64/LICENSE.xlsclients 2009-04-26 23:43:08 UTC (rev 36706)
@@ -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.
+ * *
+ * Author: Jim Fulton, MIT X Consortium
+ */
+
Copied: xorg-utils/repos/extra-x86_64/LICENSE.xlsfonts (from rev 36705, xorg-utils/trunk/LICENSE.xlsfonts)
===================================================================
--- extra-x86_64/LICENSE.xlsfonts (rev 0)
+++ extra-x86_64/LICENSE.xlsfonts 2009-04-26 23:43:08 UTC (rev 36706)
@@ -0,0 +1,22 @@
+ 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.
+
Copied: xorg-utils/repos/extra-x86_64/LICENSE.xprop (from rev 36705, xorg-utils/trunk/LICENSE.xprop)
===================================================================
--- extra-x86_64/LICENSE.xprop (rev 0)
+++ extra-x86_64/LICENSE.xprop 2009-04-26 23:43:08 UTC (rev 36706)
@@ -0,0 +1,45 @@
+ Copyright 1990, 1998 The Open Group
+ Copyright (c) 2000 The XFree86 Project, Inc.
+
+ 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 2007 Kim woelders
+
+ 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, and
+ that the name of the copyright holders not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission. The copyright holders make no representations
+ about the suitability of this software for any purpose. It is provided "as
+ is" without express or implied warranty.
+
+ THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL THE COPYRIGHT HOLDERS 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-utils/repos/extra-x86_64/LICENSE.xvinfo (from rev 36705, xorg-utils/trunk/LICENSE.xvinfo)
===================================================================
--- extra-x86_64/LICENSE.xvinfo (rev 0)
+++ extra-x86_64/LICENSE.xvinfo 2009-04-26 23:43:08 UTC (rev 36706)
@@ -0,0 +1,24 @@
+ Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
+
+ 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 fur-
+ nished 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, FIT-
+ NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+ NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name of the XFree86 Project shall not
+ be used in advertising or otherwise to promote the sale, use or other deal-
+ ings in this Software without prior written authorization from the XFree86
+ Project.
+
Copied: xorg-utils/repos/extra-x86_64/LICENSE.xwininfo (from rev 36705, xorg-utils/trunk/LICENSE.xwininfo)
===================================================================
--- extra-x86_64/LICENSE.xwininfo (rev 0)
+++ extra-x86_64/LICENSE.xwininfo 2009-04-26 23:43:08 UTC (rev 36706)
@@ -0,0 +1,26 @@
+ Copyright 1987, 1998 The Open Group
+ Copyright 1999 Sun Microsystems, Inc.
+
+ 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
+ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR 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.
+
+ Except as contained in this notice, the name of a copyright holder
+ shall not be used in advertising or otherwise to promote the sale, use
+ or other dealings in this Software without prior written authorization
+ of the copyright holder.
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-04-26 23:42:52 UTC (rev 36705)
+++ extra-x86_64/PKGBUILD 2009-04-26 23:43:08 UTC (rev 36706)
@@ -3,13 +3,14 @@
# Contributor: Jan de Groot <jgc at archlinux.org>
pkgname=xorg-utils
pkgver=7.4
-pkgrel=3
+pkgrel=4
pkgdesc="Collection of client utilities used to query the X server"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
+license=('custom')
depends=('libxxf86dga' 'libxi' 'libxxf86misc' 'libxtst' 'libxinerama' 'libxv'
'libdmx' 'libxft' 'libxaw>=1.0.5' 'libgl')
-makedepends=('pkgconfig' 'mesa')
+makedepends=('pkgconfig' 'mesa' 'glproto')
groups=('xorg')
source=(${url}/releases/individual/app/xdpyinfo-1.0.3.tar.bz2
${url}/releases/individual/app/xdriinfo-1.0.2.tar.bz2
@@ -21,13 +22,20 @@
${url}/releases/individual/app/xlsfonts-1.0.2.tar.bz2
${url}/releases/individual/app/xprop-1.0.4.tar.bz2
${url}/releases/individual/app/xvinfo-1.0.2.tar.bz2
- ${url}/releases/individual/app/xwininfo-1.0.4.tar.bz2)
+ ${url}/releases/individual/app/xwininfo-1.0.4.tar.bz2
+ LICENSE.xdpyinfo LICENSE.xfd LICENSE.xlsclients
+ LICENSE.xprop LICENSE.xwininfo LICENSE.xev
+ LICENSE.xlsatoms LICENSE.xlsfonts LICENSE.xvinfo)
md5sums=('b7cbab6cbcd12bf7ad65dbc12d86e104' 'a5ec51ed9f0a55dc3462d90d52ff899c'\
'a9532c3d1683c99bb5df1895cb3a60b1' 'c72abd90f50ef459bc14b39ec9fcc7f8'\
'288fe4cf8a990e4e602aac16dd9109fb' '69adcda848479acc3b82b3928812d191'\
'44473b880d26bfbe8b3d4d72b183cba7' '28958248590ff60ecd70e8f590d977b7'\
'48aa8fd78802f477dcbf9ef0dfd9f783' 'e1e318436f49e2f0f3764593dadd9ad2'\
- 'e2a9bf5ab7f2a0866700a3b49dd8c6bf')
+ 'e2a9bf5ab7f2a0866700a3b49dd8c6bf' 'b43f731a9e2684728230ce8e33f63228'\
+ '9e8a82b7e9898f36c378b80509f170a6' '9e8a82b7e9898f36c378b80509f170a6'\
+ '801f9850b29dad506e995d011efe2914' '1c47d00801594a0e251694d70c7fb0b8'\
+ 'e84310edd65e120d85914350c795bfac' '9ee99bda91248e945186090905db25d8'\
+ '345d6e65d71fdde292cc27f93c15e4a1' '67ea6bb3b11620c82ce4d24e78b4a0a9')
build() {
cd "${srcdir}"
@@ -37,7 +45,10 @@
./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
}
More information about the arch-commits
mailing list