wayland: Changes to 'debian-experimental'
debian/changelog | 2 +
debian/control | 1
debian/copyright | 64 +++++++------------------------------------------------
3 files changed, 12 insertions(+), 55 deletions(-)
New commits:
commit 663c5a989b14c6b18782cc09d55e3c099d5f3a26
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sun Dec 2 19:58:57 2012 +0100
Add a few more copyright holders to debian/copyright
Jonas Ådahl for tests/queue-test, Keith Packard for
cursor/xcursor.[ch], SUSE for cursor/cursor-data.h.
diff --git a/debian/copyright b/debian/copyright
index 9f5df63..2e7231f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,9 @@ Copyright: © 2008-2012 Kristian Høgsberg
© 2010-2012 Intel Corporation
© 2011 Benjamin Franzke
© 2012 Collabora, Ltd.
+ © 2012 Jonas Ådahl
+ © 2002 Keith Packard
+ © 1999 SuSE, Inc.
License: X11
License: X11
commit 51d2a88b7ff2c3cfa7f5f966b4425b0f069b3a93
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sun Dec 2 19:52:01 2012 +0100
Update debian/copyright
Change source URL to directory with wayland releases. Remove
Last-Updated field which is not mentioned in version 1.0 of the
debian/copyright file formation.
Update years based on the information in COPYING.
Drop paragraphs for scanner.c which is no longer under GPL and
wayland-hash.c which no longer exists.
diff --git a/debian/changelog b/debian/changelog
index 183d993..7e7b6a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ wayland (1.0.2-1) UNRELEASED; urgency=low
[ Sven Joachim ]
* Update symbols file, bumping minver of all symbols to 1.0.2.
* Add Homepage field to debian/control.
+ * Update debian/copyright.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 16 Aug 2012 13:04:41 +0300
diff --git a/debian/copyright b/debian/copyright
index 1264f13..9f5df63 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,16 @@
Upstream-Name: wayland
Upstream-Contact: Kristian Høgsberg <krh@bitplanet.net>
-Source: http://cgit.freedesktop.org/wayland/wayland
-Last-Updated: 98d8256b8e67a417eebc314440716e66926adf92
+Source: http://wayland.freedesktop.org/releases/
Files: debian/*
Copyright: © 2011 Cyril Brulebois <kibi@debian.org>
License: X11
-Files: wayland/*, protocol/*
-Copyright: © 2008-2011 Kristian Høgsberg <krh@bitplanet.net>
- © 2011 Benjamin Franzke <benjaminfranzke@googlemail.com>
- © 2010-2011 Intel Corporation
+Files: *
+Copyright: © 2008-2012 Kristian Høgsberg
+ © 2010-2012 Intel Corporation
+ © 2011 Benjamin Franzke
+ © 2012 Collabora, Ltd.
License: X11
License: X11
@@ -31,52 +31,3 @@ License: X11
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.
-
-Files: wayland/scanner.c
-Copyright: © 2010 Intel Corporation
-License: GPL-2+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- On Debian systems, the complete text of the latest version of the GNU
- General Public License is available in: /usr/share/common-licenses/GPL
-
-Files: wayland/wayland-hash.c
-Copyright: © 2009 Intel Corporation
- © 1988-2004 Keith Packard and Bart Massey.
-License: MIT2
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice (including the next
- paragraph) shall be included in all copies or substantial portions of the
- Software.
- .
- 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 AUTHORS OR COPYRIGHT HOLDERS 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.
- .
- Except as contained in this notice, the names of the authors
- or their institutions 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
- authors.
- .
- Authors:
- Eric Anholt <eric@anholt.net>
- Keith Packard <keithp@keithp.com>
commit c7345b87cdc29f577ac81b4852fd27342631215f
Author: Sven Joachim <svenjoac@gmx.de>
Date: Sun Dec 2 19:12:15 2012 +0100
Add Homepage field to debian/control
diff --git a/debian/changelog b/debian/changelog
index 9a732e0..183d993 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ wayland (1.0.2-1) UNRELEASED; urgency=low
[ Sven Joachim ]
* Update symbols file, bumping minver of all symbols to 1.0.2.
+ * Add Homepage field to debian/control.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 16 Aug 2012 13:04:41 +0300
diff --git a/debian/control b/debian/control
index e70898d..55a2f1c 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends:
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/wayland/wayland
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/wayland/wayland.git
+Homepage: http://wayland.freedesktop.org/
Package: libwayland0
Section: libs
Reply to: