x11-utils: Changes to 'debian-unstable'
debian/changelog | 1 +
debian/copyright | 33 +++++++++++++++++++++------------
2 files changed, 22 insertions(+), 12 deletions(-)
New commits:
commit 00c852bc8810928aeea3454f05ce9ef49ccf866c
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Mon May 20 13:28:54 2013 -0400
debian/copyright: update
diff --git a/debian/changelog b/debian/changelog
index f641795..df841c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ x11-utils (7.7+1) UNRELEASED; urgency=low
* xmessage 1.0.4
* xvinfo 1.1.2
* xwininfo 1.1.3
+ * Update copyright.
-- Robert Hooker <sarvatt@ubuntu.com> Mon, 20 May 2013 12:01:44 -0400
diff --git a/debian/copyright b/debian/copyright
index f5df658..b409857 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -246,13 +246,13 @@ xfontsel:
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 name of Digital 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
@@ -356,18 +356,27 @@ xlsclients:
DEALINGS IN THE SOFTWARE.
xlsfonts:
- 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, 1993, 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.
xmessage:
Copyright (c) 1988, 1991, 1994 X Consortium
Reply to: