Author: dnusinow
Date: 2006-09-23 11:23:42 -0400 (Sat, 23 Sep 2006)
New Revision: 3458

Added:
   trunk/lib/libxv/debian/patches/
Modified:
   trunk/lib/libxv/debian/changelog
   trunk/lib/libxv/debian/control
   trunk/lib/libxv/debian/copyright
   trunk/lib/libxv/debian/rules
Log:

* Add 01_author_info.diff pulled from git head to fill in AUTHORS and
  COPYING files in the source tree. Update debian copyright for the patch.

Modified: trunk/lib/libxv/debian/changelog
===================================================================
--- trunk/lib/libxv/debian/changelog    2006-09-23 15:18:04 UTC (rev 3457)
+++ trunk/lib/libxv/debian/changelog    2006-09-23 15:23:42 UTC (rev 3458)
@@ -1,9 +1,14 @@
 libxv (1:1.0.1-6) UNRELEASED; urgency=low
-
+  
+  [ Drew Parsons ]
   * dbg package has priority extra.
 
- -- Drew Parsons <[EMAIL PROTECTED]>  Sat, 19 Aug 2006 22:06:02 +1000
+  [ David Nusinow ]
+  * Add 01_author_info.diff pulled from git head to fill in AUTHORS and
+    COPYING files in the source tree. Update debian copyright for the patch.
 
+ -- David Nusinow <[EMAIL PROTECTED]>  Sat, 23 Sep 2006 11:23:23 -0400
+
 libxv (1:1.0.1-5) unstable; urgency=low
 
   * Revert .la file addition.

Modified: trunk/lib/libxv/debian/control
===================================================================
--- trunk/lib/libxv/debian/control      2006-09-23 15:18:04 UTC (rev 3457)
+++ trunk/lib/libxv/debian/control      2006-09-23 15:23:42 UTC (rev 3458)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <[EMAIL PROTECTED]>, Branden Robinson <[EMAIL 
PROTECTED]>, Fabio M. Di Nitto <[EMAIL PROTECTED]>, Andres Salomon <[EMAIL 
PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxext-dev 
(>= 1:0.99.1-1), x11proto-video-dev, pkg-config
 Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 4.0.0), libx11-dev (>= 1:0.99.2-1), libxext-dev 
(>= 1:0.99.1-1), x11proto-video-dev, pkg-config, quilt
 
 Package: libxv1
 Architecture: any

Modified: trunk/lib/libxv/debian/copyright
===================================================================
--- trunk/lib/libxv/debian/copyright    2006-09-23 15:18:04 UTC (rev 3457)
+++ trunk/lib/libxv/debian/copyright    2006-09-23 15:23:42 UTC (rev 3458)
@@ -1,17 +1,30 @@
-Copyright (c) 1995, 1996  The XFree86 Project, Inc
-Xv.c - Copyright 1991 by Digital Equipment Corporation, Maynard,
-       Massachusetts, and the Massachusetts Institute of Technology,
-       Cambridge, Massachusetts.
+Original Debian package author(s): Stephen Early, Mark Eichin, Branden 
+  Robinson, ISHIKAWA Mutsumi, Daniel Stone
 
+The sofware was later repackaged by:
+  Daniel Stone <[EMAIL PROTECTED]> on Mon, 16 May 2005 22:10:17 +1000
+
+The software was originally downloaded from http://x.org
+
+Copyright:
+
+Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
+and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+Written by:
+David Carver (Digital Workstation Engineering/Project Athena)
+Mark Vojkovich (XFree86 Project)
+
+License:
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+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
+both that copyright notice and this permission notice appear in 
 supporting documentation, and that the names of Digital or MIT not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+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
@@ -21,3 +34,22 @@
 ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
+Copyright 2005 Red Hat, 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, and that the name of Red Hat not be used in
+advertising or publicity pertaining to distribution of the software without
+specific, written prior permission.  Red Hat makes no
+representations about the suitability of this software for any purpose.  It
+is provided "as is" without express or implied warranty.
+
+RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL RED HAT 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: trunk/lib/libxv/debian/patches (from rev 3451, 
trunk/lib/libxv/debian/patches)

Modified: trunk/lib/libxv/debian/rules
===================================================================
--- trunk/lib/libxv/debian/rules        2006-09-23 15:18:04 UTC (rev 3457)
+++ trunk/lib/libxv/debian/rules        2006-09-23 15:23:42 UTC (rev 3458)
@@ -32,7 +32,7 @@
 endif
 
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
        dh_testdir
 
@@ -45,7 +45,7 @@
 
        touch build-stamp
 
-clean:
+clean: xsfclean
        dh_testdir
        dh_testroot
        rm -f build-stamp


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to