[SCM] mate-menus Debian package branch, master, updated. debian/1.6.0-1-6-g0b6c62c

Mike Gabriel sunweaver at moszumanska.debian.org
Wed Mar 12 12:27:26 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-menus.git;a=commitdiff;h=c205e42

The following commit has been merged in the master branch:
commit c205e42f3e988b9324062521b5a52c8199e494f7
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Mar 12 13:21:13 2014 +0100

    debian/copyright: Update copyright file after new upstream release.
---
 debian/copyright | 46 ++--------------------------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 6fa6829..8c3b314 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -40,17 +40,6 @@ Copyright: 2005, Red Hat, Inc
            2011, Perberos
 License: LGPL-2+
 
-Files: m4/intltool.m4
-Copyright: 2001, Eazel, Inc.
-License: GPL-2+
-
-Files: m4/ltsugar.m4
-Copyright: 2004-2008, Free Software Foundation, Inc.
-License:
- This file is free software; the Free Software Foundation gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
 Files: po/*
 Copyright:
  2004-2010, THE PACKAGE'S COPYRIGHT HOLDER
@@ -279,17 +268,9 @@ Comment:
  File(s) have no license header. Using license from
  COPYING.LIB file.
 
-Files: install-sh
-Copyright: 1994, X Consortium
-License: MIT-X11
-
-Files: py-compile
-Copyright: 2000-2009, Free Software Foundation, Inc.
-License: GPL-2+
-
 Files: debian/*
-Copyright: 2011-2013 Stefano Karapetsas <stefano at karapetsas.com>
-           2013 Mike Gabriel <sunweaver at debian.org>
+Copyright: 2011-2014 Stefano Karapetsas <stefano at karapetsas.com>
+           2013-2014 Mike Gabriel <sunweaver at debian.org>
 License: GPL-2+ or LGPL-2+
 
 License: GPL-2+
@@ -346,26 +327,3 @@ License: LGPL-2.1+
  On Debian systems, the full text of the GNU Lesser General Public
  License version 2,1 can be found in the file
  `/usr/share/common-licenses/LGPL-2.1'.
-
-License: MIT-X11
- 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 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
- X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
- TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- .
- Except as contained in this notice, the name of the X Consortium shall not
- be used in advertising or otherwise to promote the sale, use or other deal-
- ings in this Software without prior written authorization from the X Consor-
- tium.

-- 
mate-menus Debian package



More information about the pkg-mate-commits mailing list