[SCM] mate-control-center Debian package branch, master, updated. cf620be22cda5839e19058043f2440f7539b79a4

Mike Gabriel sunweaver at moszumanska.debian.org
Fri May 2 19:56:31 UTC 2014


Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-control-center.git;a=commitdiff;h=5d409c8

The following commit has been merged in the master branch:
commit 5d409c8672a5ebd655a191b9b41e404d86cddede
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri May 2 21:39:42 2014 +0200

    debian/copyright: Finalize file for initial upload to Debian.
---
 debian/copyright | 193 ++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 133 insertions(+), 60 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 63de998..58fec30 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -36,37 +36,9 @@ Files: libslab/app-resizer.c
        libslab/tile-action.c
        libslab/tile.c
        libslab/tile.h
-Copyright: 2006, 2007, Novell, Inc
+Copyright: 2006-2007, Novell, Inc.
 License: LGPL-2+
  
-Files: capplets/about-me/marshal.c
-       capplets/about-me/marshal.h
-       capplets/about-me/mate-about-me-password.h
-       capplets/accessibility/at-properties/main.c
-       capplets/common/activate-settings-daemon.c
-       capplets/common/activate-settings-daemon.h
-       capplets/common/mate-theme-test.c
-       capplets/common/theme-thumbnail.c
-       capplets/common/theme-thumbnail.h
-       capplets/common/wm-common.c
-       capplets/common/wm-common.h
-       capplets/display/foo-marshal.c
-       capplets/display/foo-marshal.h
-       capplets/keybindings/eggcellrendererkeys.c
-       capplets/keybindings/mate-keybinding-properties.c
-       libslab/libslab-utils.c
-       libslab/libslab-utils.h
-       libslab/mate-utils.c
-       libslab/nld-marshal.c
-       libslab/nld-marshal.h
-       libslab/search-entry-watermark.h
-       libwindow-settings/marco-window-manager.h
-       libwindow-settings/mate-wm-manager.h
-Copyright: *No copyright*
-License: GPL-2+
-Comment:
- Using license from COPYING file.
-
 Files: capplets/appearance/appearance-desktop.c
        capplets/appearance/appearance-desktop.h
        capplets/appearance/appearance-main.c
@@ -82,7 +54,7 @@ Files: capplets/appearance/appearance-desktop.c
        capplets/common/gtkrc-utils.c
        capplets/common/gtkrc-utils.h
        capplets/keyboard/mate-keyboard-properties-a11y.c
-Copyright: 2007, 2008, 2010, The MATE Foundation
+Copyright: 2007-2010, The GNOME Foundation
 License: GPL-2+
  
 Files: capplets/appearance/mate-wp-info.c
@@ -91,7 +63,7 @@ Files: capplets/appearance/mate-wp-info.c
        capplets/appearance/mate-wp-item.h
        capplets/appearance/mate-wp-xml.c
        capplets/appearance/mate-wp-xml.h
-Copyright: 2003-2006, Novell, Inc. (www.novell.com)
+Copyright: 2003-2006, Novell, Inc.
 License: GPL-2
 
 Files: capplets/display/mate-display-properties-install-systemwide.c
@@ -100,7 +72,7 @@ Files: capplets/display/mate-display-properties-install-systemwide.c
        libslab/system-tile.c
        libslab/system-tile.h
        shell/control-center.c
-Copyright: 2006, 2007, 2010 Novell, Inc
+Copyright: 2006-2010 Novell, Inc.
 License: GPL-2+
  
 Files: capplets/keyboard/mate-keyboard-properties-xkb.c
@@ -110,7 +82,6 @@ Files: capplets/keyboard/mate-keyboard-properties-xkb.c
        capplets/keyboard/mate-keyboard-properties-xkbot.c
        capplets/keyboard/mate-keyboard-properties-xkbpv.c
 Copyright: 2003-2007, Sergey V. Udaltsov
-           2007, Sergey V. Udaltsov
 License: GPL-2+
  
 Files: capplets/about-me/fingerprint-strings.h
@@ -118,7 +89,7 @@ Files: capplets/about-me/fingerprint-strings.h
        capplets/about-me/mate-about-me-fingerprint.h
        font-viewer/totem-resources.c
        font-viewer/totem-resources.h
-Copyright: 2007, 2008, Bastien Nocera <hadess at hadess.net>
+Copyright: 2007-2008, Bastien Nocera <hadess at hadess.net>
 License: GPL-2+
  
 Files: capplets/windows/mate-window-properties.c
@@ -126,7 +97,7 @@ Files: capplets/windows/mate-window-properties.c
        libwindow-settings/mate-window-manager.c
        libwindow-settings/mate-window-manager.h
        libwindow-settings/mate-wm-manager.c
-Copyright: 1998, 2002, Red Hat, Inc
+Copyright: 1998-2002, Red Hat, Inc.
            2002, Seth Nickell
 License: GPL-2+
 
@@ -135,7 +106,7 @@ Files: capplets/common/capplet-util.c
        capplets/common/file-transfer-dialog.c
        capplets/common/file-transfer-dialog.h
        capplets/keyboard/mate-keyboard-properties-a11y.h
-Copyright: 2001, 2002, Ximian, Inc
+Copyright: 2001-2002, Ximian, Inc.
 License: GPL-2+
  
 Files: typing-break/drw-break-window.c
@@ -143,7 +114,7 @@ Files: typing-break/drw-break-window.c
        typing-break/drw-monitor.c
        typing-break/main.c
 Copyright: 2002, CodeFactory AB
-           2002, 2003, Richard Hult <richard at imendio.com>
+           2002-2003, Richard Hult <richard at imendio.com>
 License: GPL-2+
  
 Files: capplets/appearance/appearance-support.c
@@ -157,8 +128,7 @@ Files: capplets/appearance/appearance-font.c
        capplets/appearance/appearance-font.h
        capplets/appearance/appearance-style.c
        capplets/appearance/appearance.h
-Copyright: 2007, 2010, The GNOME Foundation
-  2007, The GNOME Foundation
+Copyright: 2007-2010, The GNOME Foundation
 License: GPL-2+
 
 Files: font-viewer/font-thumbnailer.c
@@ -175,7 +145,7 @@ License: GPL-2+
 
 Files: capplets/about-me/e-image-chooser.c
        capplets/about-me/e-image-chooser.h
-Copyright: 2004, Novell, Inc
+Copyright: 2004, Novell, Inc.
 License: GPL-2
 
 Files: typing-break/drw-timer.c
@@ -200,14 +170,13 @@ License: LGPL-2+
 
 Files: capplets/common/capplet-stock-icons.c
        capplets/common/capplet-stock-icons.h
-Copyright: 2002, Sun Microsystems, Inc
+Copyright: 2002, Sun Microsystems, Inc.
 License: LGPL-2+
 
 Files: typing-break/drw-selection.c
        typing-break/drw-selection.h
-Copyright: 2002, Red Hat, Inc
-License:
- Using license from COPYING file.
+Copyright: 2002, Red Hat, Inc.
+License: MIT~OldStyle+LegalDisclaimer
 
 Files: capplets/default-applications/mate-da-capplet.h
 Copyright: 2005-2006, Luca Cavalli
@@ -220,10 +189,6 @@ Copyright: 2005-2006, Luca Cavalli
            2010, Perberos <perberos at gmail.com>
 License: GPL-2
 
-Files: ltmain.sh
-Copyright: 1996-2001, 2003-2006
-License: GPL-2+
-
 Files: typing-break/drwright.c
 Copyright: 2002, CodeFactory AB
            2002-2003, Richard Hult <richard at imendio.com>
@@ -245,17 +210,17 @@ Copyright: 2002, Diego Gonzalez
 License: GPL-2+
 
 Files: capplets/keyboard/mate-keyboard-properties.c
-Copyright: 2000-2001, Ximian, Inc
+Copyright: 2000-2001, Ximian, Inc.
            2001, Jonathan Blandford
 License: GPL-2+
 
 Files: capplets/display/xrandr-capplet.c
-Copyright: 2007-2008, Red Hat, Inc
+Copyright: 2007-2008, Red Hat, Inc.
 License: GPL-2+
 
 Files: capplets/mouse/mate-mouse-properties.c
-Copyright: 2001, Red Hat, Inc
-           2001, Ximian, Inc
+Copyright: 2001, Red Hat, Inc.
+           2001, Ximian, Inc.
 License: GPL-2+
 
 Files: capplets/keyboard/mate-keyboard-properties-xkb.h
@@ -263,7 +228,7 @@ Copyright: 2003-2007, Sergey V Udaltsov
 License: GPL-2+
 
 Files: capplets/network/mate-network-properties.c
-Copyright: 2002, Sun Microsystems Inc
+Copyright: 2002, Sun Microsystems, Inc.
 License: GPL-2+
  
 Files: capplets/common/mate-theme-apply.c
@@ -277,7 +242,7 @@ Comment:
  See https://github.com/mate-desktop/mate-control-center/issues/95.
 
 Files: capplets/about-me/eel-gtk-macros.h
-Copyright: 1999-2001, Eazel, Inc
+Copyright: 1999-2001, Eazel, Inc.
 License: LGPL-2+
 
 Files: capplets/common/mate-theme-info.c
@@ -286,22 +251,111 @@ Copyright: 2002, Jonathan Blandford <jrb at gnome.org>
 License: LGPL-2+
 
 Files: capplets/keybindings/eggaccelerators.h
-Copyright: 2002, Red Hat, Inc
+Copyright: 2002, Red Hat, Inc.
 License: LGPL-2+
 
 Files: capplets/keybindings/eggcellrendererkeys.h
-Copyright: 2000, Red Hat, Inc., Jonathan Blandford <jrb at redhat.com>
+Copyright: 2000, Jonathan Blandford, Red Hat, Inc. <jrb at redhat.com>
 License: LGPL-2+
 
 Files: capplets/keybindings/eggaccelerators.c
 Copyright: 2002, Red Hat, Inc.
-           1998, 2001 Tim Janik
+           1998-2001 Tim Janik
 License: LGPL-2+
 
+Files: capplets/about-me/icons/Makefile.am
+       capplets/about-me/Makefile.am
+       capplets/about-me/mate-about-me-password.h
+       capplets/about-me/*.list
+       capplets/about-me/*.ui
+       capplets/about-me/*.1
+       capplets/about-me/*.in
+       capplets/accessibility/at-properties/Makefile.am
+       capplets/accessibility/at-properties/main.c
+       capplets/accessibility/at-properties/*.ui
+       capplets/accessibility/at-properties/*.png
+       capplets/accessibility/at-properties/*.in
+       capplets/accessibility/Makefile.am
+       capplets/appearance/data/Makefile.am
+       capplets/appearance/data/*.png
+       capplets/appearance/data/*.pcf
+       capplets/appearance/data/*.in
+       capplets/appearance/data/*.1
+       capplets/appearance/data/*.ui
+       capplets/appearance/Makefile.am
+       capplets/common/Makefile.am
+       capplets/common/activate-settings-daemon.c
+       capplets/common/activate-settings-daemon.h
+       capplets/common/mate-theme-test.c
+       capplets/common/theme-thumbnail.c
+       capplets/common/theme-thumbnail.h
+       capplets/common/wm-common.c
+       capplets/common/wm-common.h
+       capplets/default-applications/Makefile.am
+       capplets/default-applications/*.1
+       capplets/default-applications/*.in
+       capplets/default-applications/*.ui
+       capplets/display/icons/*x*/*.png
+       capplets/display/icons/scalable/*.svg
+       capplets/display/Makefile.am
+       capplets/display/*.ui
+       capplets/display/*.in
+       capplets/display/foo-marshal.*
+       capplets/display/Makefile.am
+       capplets/keybindings/Makefile.am
+       capplets/keybindings/eggcellrendererkeys.c
+       capplets/keybindings/mate-keybinding-properties.c
+       capplets/keybindings/*.in
+       capplets/keybindings/*.ui
+       capplets/keyboard/Makefile.am
+       capplets/keyboard/*.in
+       capplets/keyboard/*.ui
+       capplets/mouse/Makefile.am
+       capplets/mouse/*.in
+       capplets/mouse/*.png
+       capplets/mouse/*.ui
+       capplets/network/icons/*x*/*.png
+       capplets/network/icons/scalable/*.svg
+       capplets/network/Makefile.am
+       capplets/network/*.in
+       capplets/network/*.ui
+       capplets/windows/Makefile.am
+       capplets/windows/*.in
+       capplets/Makefile.am
+       font-viewer/Makefile.am
+       font-viewer/*.in
+       font-viewer/*.thumbnailer
+       libslab/Makefile.am
+       libslab/libslab-utils.c
+       libslab/libslab-utils.h
+       libslab/mate-utils.c
+       libslab/*.in
+       libslab/*.list
+       libslab/*.svg
+       libwindow-settings/Makefile.am
+       libwindow-settings/marco-window-manager.h
+       libwindow-settings/mate-wm-manager.h
+       libwindow-settings/*.in
+       shell/Makefile.am
+       shell/*.in
+       shell/*.menu
+       typing-break/Makefile.am
+       typing-break/*.png
+       typing-break/*.svg
+       Makefile.am
+       autogen.sh
+       configure.ac
+       *.convert
+       org.mate.*.xml.in.in
+Copyright: *No copyright*
+License: GPL-2+
+Comment:
+ Using license from COPYING file.
+
 Files: debian/*
 Copyright: 2011-2014, Stefano Karapetsas <stefano at karapetsas.com>
-           2013-2014, Mike Gabriel <sunweaver at debian.org>
-License: GPL-2+ or LGPL-2+
+           2014, Mike Gabriel <sunweaver at debian.org>
+License: GPL-2 or GPL-2+ or LGPL-2+ or LGPL-2.1+ or MIT~OldStyle+LegalDisclaimer
 
 License: GPL-2
  This package is free software; you can redistribute it and/or modify
@@ -370,4 +424,23 @@ License: LGPL-2.1+
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  .
  On Debian systems, the complete text of the GNU Library General Public License 2.1
- can be found in "/usr/share/common-licenses/LGPL-2.1"
\ No newline at end of file
+ can be found in "/usr/share/common-licenses/LGPL-2.1"
+
+License: MIT~OldStyle+LegalDisclaimer
+ 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 the copyright holder not be used
+ in advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.  The copyright holder makes
+ no representations about the suitability of this software for any purpose. 
+ It is provided "as is" without express or implied warranty.
+ .
+ THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT
+ SHALL THE COPYRIGHT HOLDER 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.
+

-- 
mate-control-center Debian package



More information about the pkg-mate-commits mailing list