X Strike Force X.Org X11 SVN commit: r3451 - in trunk/lib/libxv/debian: . patches
Author: dnusinow
Date: 2006-09-23 10:43:48 -0400 (Sat, 23 Sep 2006)
New Revision: 3451
Added:
trunk/lib/libxv/debian/copyright
trunk/lib/libxv/debian/patches/
trunk/lib/libxv/debian/patches/01_author_info.diff
trunk/lib/libxv/debian/patches/series
Modified:
trunk/lib/libxv/debian/changelog
trunk/lib/libxv/debian/control
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
* Re-add lost copyright file and update it given the above patch
Modified: trunk/lib/libxv/debian/changelog
===================================================================
--- trunk/lib/libxv/debian/changelog 2006-09-23 10:07:56 UTC (rev 3450)
+++ trunk/lib/libxv/debian/changelog 2006-09-23 14:43:48 UTC (rev 3451)
@@ -1,3 +1,11 @@
+libxv (1:1.0.1-4) unstable; urgency=low
+
+ * Add 01_author_info.diff pulled from git head to fill in AUTHORS and
+ COPYING files in the source tree
+ * Re-add lost copyright file and update it given the above patch
+
+ -- David Nusinow <dnusinow@debian.org> Sat, 23 Sep 2006 10:41:14 -0400
+
libxv (1:1.0.1-3) unstable; urgency=low
* Reorder makeshlib command in rules file so that ldconfig is run
Modified: trunk/lib/libxv/debian/control
===================================================================
--- trunk/lib/libxv/debian/control 2006-09-23 10:07:56 UTC (rev 3450)
+++ trunk/lib/libxv/debian/control 2006-09-23 14:43:48 UTC (rev 3451)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-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
+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
Standards-Version: 3.6.1.0
Package: libxv1
Added: trunk/lib/libxv/debian/copyright
===================================================================
--- trunk/lib/libxv/debian/copyright (rev 0)
+++ trunk/lib/libxv/debian/copyright 2006-09-23 14:43:48 UTC (rev 3451)
@@ -0,0 +1,55 @@
+Original Debian package author(s): Stephen Early, Mark Eichin, Branden
+ Robinson, ISHIKAWA Mutsumi, Daniel Stone
+
+The sofware was later repackaged by:
+ Daniel Stone <daniel.stone@ubuntu.com> 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,
+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 names of Digital or MIT 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.
+
+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.
Added: trunk/lib/libxv/debian/patches/01_author_info.diff
===================================================================
--- trunk/lib/libxv/debian/patches/01_author_info.diff (rev 0)
+++ trunk/lib/libxv/debian/patches/01_author_info.diff 2006-09-23 14:43:48 UTC (rev 3451)
@@ -0,0 +1,62 @@
+diff --git a/AUTHORS b/AUTHORS
+index e69de29..dcca7b8 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -0,0 +1,2 @@
++David Carver (Digital Workstation Engineering/Project Athena)
++Mark Vojkovich (XFree86 Project)
+diff --git a/COPYING b/COPYING
+index 7f33cbf..7f66edf 100644
+--- a/COPYING
++++ b/COPYING
+@@ -1,12 +1,42 @@
+-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 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
++and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
+
+-Please submit updated COPYING files to the Xorg bugzilla:
++ All Rights Reserved
+
+-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
++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 names of Digital or MIT not be
++used in advertising or publicity pertaining to distribution of the
++software without specific, written prior permission.
+
+-All licensing questions regarding this software should be directed at the
+-Xorg mailing list:
++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.
+
+-http://lists.freedesktop.org/mailman/listinfo/xorg
++______________________________________________________________________________
++
++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.
Added: trunk/lib/libxv/debian/patches/series
===================================================================
--- trunk/lib/libxv/debian/patches/series (rev 0)
+++ trunk/lib/libxv/debian/patches/series 2006-09-23 14:43:48 UTC (rev 3451)
@@ -0,0 +1 @@
+01_author_info.diff
Modified: trunk/lib/libxv/debian/rules
===================================================================
--- trunk/lib/libxv/debian/rules 2006-09-23 10:07:56 UTC (rev 3450)
+++ trunk/lib/libxv/debian/rules 2006-09-23 14:43:48 UTC (rev 3451)
@@ -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
Reply to: