Julien Cristau pushed to branch debian-unstable at X Strike Force / lib / libxv


Commits:
fda41ec0 by Jelmer Vernooij at 2018-09-13T00:29:07Z
Remove CRs from copyright file.

Fixes lintian: copyright-has-crs
See https://lintian.debian.org/tags/copyright-has-crs.html for more details.

- - - - -
90690f82 by Julien Cristau at 2018-09-13T07:53:32Z
Merge branch 'copyright-has-crs' into 'debian-unstable'

Remove CRs from copyright file.

See merge request xorg-team/lib/libxv!1
- - - - -


2 changed files:

- debian/changelog
- debian/copyright


Changes:

=====================================
debian/changelog
=====================================
@@ -1,8 +1,12 @@
 libxv (2:1.0.11-2) UNRELEASED; urgency=medium
 
+  [ Emilio Pozuelo Monfort ]
   * Perform the build in a `build' subdirectory like we used to do
     before the dh switch.
 
+  [ Jelmer Vernooij ]
+  * Remove CRs from copyright file.
+
  -- Emilio Pozuelo Monfort <[email protected]>  Tue, 06 Dec 2016 01:32:38 +0100
 
 libxv (2:1.0.11-1) unstable; urgency=medium


=====================================
debian/copyright
=====================================
@@ -1,56 +1,56 @@
-This package was downloaded from
-https://xorg.freedesktop.org/releases/individual/lib/
-
-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
-
-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.
+This package was downloaded from
+https://xorg.freedesktop.org/releases/individual/lib/
+
+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
+
+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.



View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/libxv/compare/f3e6f1ed8d9207b839ed882f44670f396200f632...90690f82ca4812a8a58a4487dd84913528955bcf

-- 
View it on GitLab: 
https://salsa.debian.org/xorg-team/lib/libxv/compare/f3e6f1ed8d9207b839ed882f44670f396200f632...90690f82ca4812a8a58a4487dd84913528955bcf
You're receiving this email because of your account on salsa.debian.org.

Reply via email to