[arch-commits] Commit in xorg-xclipboard/trunk (PKGBUILD copyright.patch)

[Jan de Groot]

    Date: Sunday, November 14, 2010 @ 11:13:22
  Author: jgc
Revision: 99360

upgpkg: xorg-xclipboard 1.1.1-1
Update to 1.1.1, use upstream copyright without patching

Modified:
  xorg-xclipboard/trunk/PKGBUILD
Deleted:
  xorg-xclipboard/trunk/copyright.patch

-----------------+
 PKGBUILD        |    9 +++------
 copyright.patch |   43 -------------------------------------------
 2 files changed, 3 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-14 16:11:41 UTC (rev 99359)
+++ PKGBUILD	2010-11-14 16:13:22 UTC (rev 99360)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=xorg-xclipboard
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="X clipboard manager"
 arch=(i686 x86_64)
@@ -10,14 +10,11 @@
 license=('custom')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
 makedepends=('xorg-util-macros')
-source=(http://xorg.freedesktop.org/archive/individual/app/xclipboard-${pkgver}.tar.bz2
-        copyright.patch)
-sha1sums=('d1ec94f032174f5d011e33817cb7f48e3cd957be'
-          '2edaeac61d65442fb3b8273c1218048dadd6c1c5')
+source=(http://xorg.freedesktop.org/archive/individual/app/xclipboard-${pkgver}.tar.bz2)
+sha1sums=('922ddf89acd0781156e9ccdf191a3e0c6376415a')
 
 build() {
   cd "${srcdir}/xclipboard-${pkgver}"
-  patch -Np1 -i "${srcdir}/copyright.patch"
   ./configure --prefix=/usr
   make
   make DESTDIR="${pkgdir}" install

Deleted: copyright.patch
===================================================================
--- copyright.patch	2010-11-14 16:11:41 UTC (rev 99359)
+++ copyright.patch	2010-11-14 16:13:22 UTC (rev 99360)
@@ -1,43 +0,0 @@
-From 2fa9cd45301c6f56a89845776fb88b5d9922d811 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith at oracle.com>
-Date: Fri, 06 Aug 2010 15:37:48 +0000
-Subject: Fill in COPYING file with copyright notices from source code
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
----
-diff --git a/COPYING b/COPYING
-index 7f33cbf..75c3ec5 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, 1994, 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