Date: Monday, February 6, 2012 @ 03:27:47
Author: bisson
Revision: 149203
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
xorg-xlsfonts/repos/extra-i686/PKGBUILD
(from rev 149202, xorg-xlsfonts/trunk/PKGBUILD)
xorg-xlsfonts/repos/extra-i686/copyright.patch
(from rev 149202, xorg-xlsfonts/trunk/copyright.patch)
xorg-xlsfonts/repos/extra-x86_64/PKGBUILD
(from rev 149202, xorg-xlsfonts/trunk/PKGBUILD)
xorg-xlsfonts/repos/extra-x86_64/copyright.patch
(from rev 149202, xorg-xlsfonts/trunk/copyright.patch)
Deleted:
xorg-xlsfonts/repos/extra-i686/PKGBUILD
xorg-xlsfonts/repos/extra-i686/copyright.patch
xorg-xlsfonts/repos/extra-x86_64/PKGBUILD
xorg-xlsfonts/repos/extra-x86_64/copyright.patch
------------------------------+
extra-i686/PKGBUILD | 55 ++++++++++++++------------
extra-i686/copyright.patch | 86 ++++++++++++++++++++---------------------
extra-x86_64/PKGBUILD | 55 ++++++++++++++------------
extra-x86_64/copyright.patch | 86 ++++++++++++++++++++---------------------
4 files changed, 146 insertions(+), 136 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-06 08:27:26 UTC (rev 149202)
+++ extra-i686/PKGBUILD 2012-02-06 08:27:47 UTC (rev 149203)
@@ -1,25 +0,0 @@
-# $Id: $
-# Maintainer: Jan de Groot <j...@archlinux.org>
-
-pkgname=xorg-xlsfonts
-pkgver=1.0.3
-pkgrel=1
-pkgdesc="List X fonts available on X server"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
-license=('custom')
-depends=('libx11')
-makedepends=('xorg-util-macros')
-source=(http://xorg.freedesktop.org/archive/individual/app/xlsfonts-${pkgver}.tar.bz2
- copyright.patch)
-sha1sums=('9d4e0adbcb83362dd9234e90507c0528f60e309b'
- 'abedbde85cc391021901c069d086882c143ac621')
-
-build() {
- cd "${srcdir}/xlsfonts-${pkgver}"
- ./configure --prefix=/usr
- make
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xorg-xlsfonts/repos/extra-i686/PKGBUILD (from rev 149202,
xorg-xlsfonts/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-06 08:27:47 UTC (rev 149203)
@@ -0,0 +1,30 @@
+# $Id$
+# Contributor: Jan de Groot <j...@archlinux.org>
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+
+pkgname=xorg-xlsfonts
+pkgver=1.0.3
+pkgrel=2
+pkgdesc='List available X fonts'
+url='http://xorg.freedesktop.org/'
+license=('custom')
+arch=('i686' 'x86_64')
+depends=('libx11')
+makedepends=('xorg-util-macros')
+source=("http://xorg.freedesktop.org/archive/individual/app/xlsfonts-${pkgver}.tar.bz2";
+ 'copyright.patch')
+sha1sums=('9d4e0adbcb83362dd9234e90507c0528f60e309b'
+ 'abedbde85cc391021901c069d086882c143ac621')
+
+build() {
+ cd "${srcdir}/xlsfonts-${pkgver}"
+ patch -p1 -i ../copyright.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/xlsfonts-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
Deleted: extra-i686/copyright.patch
===================================================================
--- extra-i686/copyright.patch 2012-02-06 08:27:26 UTC (rev 149202)
+++ extra-i686/copyright.patch 2012-02-06 08:27:47 UTC (rev 149203)
@@ -1,43 +0,0 @@
-From 0e2aac955e2a3887cb2dcb356f296b58f9e3b5df Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersm...@oracle.com>
-Date: Fri, 06 Aug 2010 18:29:09 +0000
-Subject: Fill in COPYING file with copyright notices from source code
-
-Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
----
-diff --git a/COPYING b/COPYING
-index 7f33cbf..0ad0f43 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,21 @@
--This is a stub file. This package has not yet had its complete licensing
--information compiled. Please see the individual source files for details on
--your rights to use and modify this software.
-+Copyright 1989, 1993, 1998 The Open Group
-
--Please submit updated COPYING files to the Xorg bugzilla:
-+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.
-
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+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.
-
--http://lists.freedesktop.org/mailman/listinfo/xorg
-+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.
---
-cgit v0.8.3-6-g21f6
Copied: xorg-xlsfonts/repos/extra-i686/copyright.patch (from rev 149202,
xorg-xlsfonts/trunk/copyright.patch)
===================================================================
--- extra-i686/copyright.patch (rev 0)
+++ extra-i686/copyright.patch 2012-02-06 08:27:47 UTC (rev 149203)
@@ -0,0 +1,43 @@
+From 0e2aac955e2a3887cb2dcb356f296b58f9e3b5df Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri, 06 Aug 2010 18:29:09 +0000
+Subject: Fill in COPYING file with copyright notices from source code
+
+Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+---
+diff --git a/COPYING b/COPYING
+index 7f33cbf..0ad0f43 100644
+--- a/COPYING
++++ b/COPYING
+@@ -1,12 +1,21 @@
+-This is a stub file. This package has not yet had its complete licensing
+-information compiled. Please see the individual source files for details on
+-your rights to use and modify this software.
++Copyright 1989, 1993, 1998 The Open Group
+
+-Please submit updated COPYING files to the Xorg bugzilla:
++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.
+
+-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
+
+-All licensing questions regarding this software should be directed at the
+-Xorg mailing list:
++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.
+
+-http://lists.freedesktop.org/mailman/listinfo/xorg
++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.
+--
+cgit v0.8.3-6-g21f6
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-06 08:27:26 UTC (rev 149202)
+++ extra-x86_64/PKGBUILD 2012-02-06 08:27:47 UTC (rev 149203)
@@ -1,25 +0,0 @@
-# $Id: $
-# Maintainer: Jan de Groot <j...@archlinux.org>
-
-pkgname=xorg-xlsfonts
-pkgver=1.0.3
-pkgrel=1
-pkgdesc="List X fonts available on X server"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/";
-license=('custom')
-depends=('libx11')
-makedepends=('xorg-util-macros')
-source=(http://xorg.freedesktop.org/archive/individual/app/xlsfonts-${pkgver}.tar.bz2
- copyright.patch)
-sha1sums=('9d4e0adbcb83362dd9234e90507c0528f60e309b'
- 'abedbde85cc391021901c069d086882c143ac621')
-
-build() {
- cd "${srcdir}/xlsfonts-${pkgver}"
- ./configure --prefix=/usr
- make
- make DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
Copied: xorg-xlsfonts/repos/extra-x86_64/PKGBUILD (from rev 149202,
xorg-xlsfonts/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-06 08:27:47 UTC (rev 149203)
@@ -0,0 +1,30 @@
+# $Id$
+# Contributor: Jan de Groot <j...@archlinux.org>
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+
+pkgname=xorg-xlsfonts
+pkgver=1.0.3
+pkgrel=2
+pkgdesc='List available X fonts'
+url='http://xorg.freedesktop.org/'
+license=('custom')
+arch=('i686' 'x86_64')
+depends=('libx11')
+makedepends=('xorg-util-macros')
+source=("http://xorg.freedesktop.org/archive/individual/app/xlsfonts-${pkgver}.tar.bz2";
+ 'copyright.patch')
+sha1sums=('9d4e0adbcb83362dd9234e90507c0528f60e309b'
+ 'abedbde85cc391021901c069d086882c143ac621')
+
+build() {
+ cd "${srcdir}/xlsfonts-${pkgver}"
+ patch -p1 -i ../copyright.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/xlsfonts-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+}
Deleted: extra-x86_64/copyright.patch
===================================================================
--- extra-x86_64/copyright.patch 2012-02-06 08:27:26 UTC (rev 149202)
+++ extra-x86_64/copyright.patch 2012-02-06 08:27:47 UTC (rev 149203)
@@ -1,43 +0,0 @@
-From 0e2aac955e2a3887cb2dcb356f296b58f9e3b5df Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersm...@oracle.com>
-Date: Fri, 06 Aug 2010 18:29:09 +0000
-Subject: Fill in COPYING file with copyright notices from source code
-
-Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
----
-diff --git a/COPYING b/COPYING
-index 7f33cbf..0ad0f43 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,21 @@
--This is a stub file. This package has not yet had its complete licensing
--information compiled. Please see the individual source files for details on
--your rights to use and modify this software.
-+Copyright 1989, 1993, 1998 The Open Group
-
--Please submit updated COPYING files to the Xorg bugzilla:
-+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.
-
--https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-
--All licensing questions regarding this software should be directed at the
--Xorg mailing list:
-+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.
-
--http://lists.freedesktop.org/mailman/listinfo/xorg
-+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.
---
-cgit v0.8.3-6-g21f6
Copied: xorg-xlsfonts/repos/extra-x86_64/copyright.patch (from rev 149202,
xorg-xlsfonts/trunk/copyright.patch)
===================================================================
--- extra-x86_64/copyright.patch (rev 0)
+++ extra-x86_64/copyright.patch 2012-02-06 08:27:47 UTC (rev 149203)
@@ -0,0 +1,43 @@
+From 0e2aac955e2a3887cb2dcb356f296b58f9e3b5df Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersm...@oracle.com>
+Date: Fri, 06 Aug 2010 18:29:09 +0000
+Subject: Fill in COPYING file with copyright notices from source code
+
+Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
+---
+diff --git a/COPYING b/COPYING
+index 7f33cbf..0ad0f43 100644
+--- a/COPYING
++++ b/COPYING
+@@ -1,12 +1,21 @@
+-This is a stub file. This package has not yet had its complete licensing
+-information compiled. Please see the individual source files for details on
+-your rights to use and modify this software.
++Copyright 1989, 1993, 1998 The Open Group
+
+-Please submit updated COPYING files to the Xorg bugzilla:
++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.
+
+-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
+
+-All licensing questions regarding this software should be directed at the
+-Xorg mailing list:
++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.
+
+-http://lists.freedesktop.org/mailman/listinfo/xorg
++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.
+--
+cgit v0.8.3-6-g21f6
