[SCM] mate-desktop Debian package branch, master, updated. debian/1.6.1-3-18-gb8b8587
Mike Gabriel
sunweaver at moszumanska.debian.org
Thu Mar 6 09:44:19 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-desktop.git;a=commitdiff;h=c2b8f66
The following commit has been merged in the master branch:
commit c2b8f665ef1f5e2bf9b0a524d0e274af31f0e49b
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Thu Mar 6 00:24:28 2014 +0100
debian/copyright: Adapt to new upstream version.
---
debian/copyright | 428 +++++++-------------------
debian/libmate-desktop-2-17.lintian-overrides | 3 -
debian/libmate-desktop-dev.lintian-overrides | 3 -
debian/libmate-desktop-doc.lintian-overrides | 3 -
debian/mate-desktop-common.lintian-overrides | 4 -
debian/mate-desktop-dbg.lintian-overrides | 3 -
debian/mate-desktop.lintian-overrides | 3 -
7 files changed, 111 insertions(+), 336 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index badb506..4751bde 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,157 +3,106 @@ Upstream-Name: mate-desktop
Upstream-Contact: Stefano Karapetsas <stefano at karapetsas.com>
Source: http://pub.mate-desktop.org/releases/
-Files: mate-desktop/libmate/*.h
- mate-desktop/libmateui/*.h
- mate-conf/mate-conf-import
- desktop-docs/lgpl/fr/fr.po
- desktop-docs/lgpl/oc/oc.po
- desktop-docs/lgpl/vi/vi.po
-Copyright: 1999-2008, Red Hat, Inc
- 2000, Eazel, Inc
- 2008-2009, Novell, Inc
- 1998, Tom Tromey
+Files: libmate-desktop/mate-bg-crossfade.c
+ libmate-desktop/mate-bg-crossfade.h
+ libmate-desktop/mate-rr-config.h
+ libmate-desktop/mate-rr.h
+Copyright: 2007-2008, Red Hat, Inc.
+License: LGPL-2+
+
+Files: libmate-desktop/mate-bg.c
+ libmate-desktop/mate-bg.h
+Copyright: 2000 Eazel, Inc.
+ 2007-2008, Red Hat, Inc.
+ 2012, Jasmine Hassan <jasmine.aura at gmail.com>
+License: LGPL-2+
+
+Files: libmate-desktop/mate-dconf.c
+ libmate-desktop/mate-dconf.h
+Copyright: 2011, Novell, Inc.
+ 2013, Stefano Karapetsas <stefano at karapetsas.com>
+License: GPL-2+
+
+Files: libmate-desktop/mate-desktop.h
+Copyright: 2013, Stefano Karapetsas <stefano at karapetsas.com>
+License: GPL-2+
+
+Files: libmate-desktop/mate-desktop-item.c
+ libmate-desktop/mate-desktop-item.h
+Copyright: 1999-2000, Red Hat, Inc.
2001, Sid Vicious
+License: LGPL-2+
+
+Files: libmate-desktop/mate-desktop-thumbnail.c
+Copyright: 2002, Red Hat, Inc.
2010, Carlos Garcia Campos <carlosgc at gnome.org>
- 2012, Jasmine Hassan <jasmine.aura at gmail.com>
- 2005-2006, Free Software Foundation, Inc.
- 2007, Mate i18n Project for Vietnamese.
License: LGPL-2+
-Files: mate-desktop/display-name.c
- mate-desktop/edid-parse.c
+Files: libmate-desktop/mate-desktop-thumbnail.h
+Copyright: 2002, Red Hat, Inc.
+License: LGPL-2+
+
+Files: libmate-desktop/mate-desktop-utils.*
+Copyright: 1998, Tom Tromey
+License: LGPL-2+
+
+Files: libmate-desktop/mate-gsettings.c
+ libmate-desktop/mate-gsettings.h
+Copyright: 2013, Stefano Karapetsas <stefano at karapetsas.com>
+License: GPL-2+
+
+Files: libmate-desktop/mate-rr-labeler.c
+ libmate-desktop/mate-rr-labeler.ctest.c
+Copyright: 2008, Novell, Inc.
+License: LGPL-2+
+
+Files: libmate-desktop/display-name.c
+ libmate-desktop/edid-parse.c
Copyright: 2007, Red Hat, Inc.
License: Expat
+Files: libmate-desktop/edid.h
+Copyright: 2007-2008, Red Hat, Inc.
+License: LGPL-2+
+
Files: mate-about/*.c
mate-about/*.h
Copyright: 2011, Perberos <perberos at gmail.com>
License: GPL-2+
+Files: man/mate-about.1
+Copyright: 2010, Vincent Untz <vuntz at gnome.org>
+License: GPL-2+
+Comment:
+ Using license as found in COPYING file.
+
+Files: man/mate-gsettings-toggle.1
+Copyright: 2014, Sander Sweers <infirit at gmail.com>
+License: GPL-2+
+
Files: tools/mate-conf-import
Copyright: 2013, Stefano Karapetsas <stefano at karapetsas.com>
License: LGPL-2+
-Files: AUTHORS
- ChangeLog
- HACKING
- MAINTAINERS
- NEWS
- README
- Makefile.am
- acinclude.m4
- config.h.in
- configure.ac
- gtk-doc.make
- mate-version.xml.in.in
- m4/gtk-doc.m4
- m4/mate-doc-utils.m4
- desktop-docs/Makefile.am
+Files: tools/mpaste
+Copyright: 2013, Steve Zesch
+License: GPL-2+
+
+Files: desktop-docs/gpl/*
+ desktop-docs/fdl/*
+ desktop-docs/lgpl/*
+Copyright: *No copyright*
+License: GPL-2+ or LGPL-2+
+Comment:
+ Appropriately assume either license found in COPYING or license found in
+ COPYING.LIB file.
+
+Files: desktop-docs/Makefile.am
desktop-docs/gpl/Makefile.am
desktop-docs/fdl/Makefile.am
desktop-docs/lgpl/Makefile.am
- docs/reference/Makefile.am
- docs/reference/mate-desktop/Makefile.am
docs/Makefile.am
- libmate-desktop/Makefile.am
- libmate-desktop/libmate/Makefile.am
- libmate-desktop/libmateui/Makefile.am
- Makefile.am
- man/Makefile.am
- mate-about/Makefile.am
- mate-conf/Makefile.am
- schemas/Makefile.am
- desktop-docs/gpl/nds/gpl.xml
- desktop-docs/gpl/nds/nds.po
- desktop-docs/gpl/ko/gpl.xml
- desktop-docs/gpl/ko/ko.po
- desktop-docs/gpl/pa/gpl.xml
- desktop-docs/gpl/pa/pa.po
- desktop-docs/gpl/el/gpl.xml
- desktop-docs/gpl/el/el.po
- desktop-docs/gpl/uk/gpl.xml
- desktop-docs/gpl/uk/uk.po
- desktop-docs/gpl/eu/eu.po
- desktop-docs/gpl/eu/gpl.xml
- desktop-docs/gpl/ca/gpl.xml
- desktop-docs/gpl/ca/ca.po
- desktop-docs/gpl/fi/gpl.xml
- desktop-docs/gpl/fi/fi.po
- desktop-docs/gpl/gpl.omf.in
- desktop-docs/gpl/de/gpl.xml
- desktop-docs/gpl/de/de.po
- desktop-docs/gpl/ar/gpl.xml
- desktop-docs/gpl/ar/ar.po
- desktop-docs/gpl/fr/gpl.xml
- desktop-docs/gpl/C/gpl.xml
- desktop-docs/gpl/hu/gpl.xml
- desktop-docs/gpl/hu/hu.po
- desktop-docs/gpl/cs/gpl.xml
- desktop-docs/gpl/cs/cs.po
- desktop-docs/gpl/es/gpl.xml
- desktop-docs/gpl/es/es.po
- desktop-docs/gpl/oc/gpl.xml
- desktop-docs/gpl/zh_CN/gpl.xml
- desktop-docs/gpl/zh_CN/zh_CN.po
- desktop-docs/gpl/sv/gpl.xml
- desktop-docs/gpl/sv/sv.po
- desktop-docs/gpl/vi/gpl.xml
- desktop-docs/fdl/fdl.omf.in
- desktop-docs/fdl/ko/fdl.xml
- desktop-docs/fdl/ko/ko.po
- desktop-docs/fdl/el/fdl.xml
- desktop-docs/fdl/el/el.po
- desktop-docs/fdl/uk/fdl.xml
- desktop-docs/fdl/uk/uk.po
- desktop-docs/fdl/eu/eu.po
- desktop-docs/fdl/eu/fdl.xml
- desktop-docs/fdl/ca/fdl.xml
- desktop-docs/fdl/ca/ca.po
- desktop-docs/fdl/pl/fdl.xml
- desktop-docs/fdl/pl/pl.po
- desktop-docs/fdl/de/fdl.xml
- desktop-docs/fdl/de/de.po
- desktop-docs/fdl/ar/fdl.xml
- desktop-docs/fdl/ar/ar.po
- desktop-docs/fdl/fr/fdl.xml
- desktop-docs/fdl/C/fdl.xml
- desktop-docs/fdl/hu/fdl.xml
- desktop-docs/fdl/hu/hu.po
- desktop-docs/fdl/es/fdl.xml
- desktop-docs/fdl/es/es.po
- desktop-docs/fdl/oc/fdl.xml
- desktop-docs/fdl/sv/fdl.xml
- desktop-docs/fdl/sv/sv.po
- desktop-docs/fdl/vi/fdl.xml
- desktop-docs/lgpl/ko/ko.po
- desktop-docs/lgpl/ko/lgpl.xml
- desktop-docs/lgpl/pa/pa.po
- desktop-docs/lgpl/pa/lgpl.xml
- desktop-docs/lgpl/lgpl.omf.in
- desktop-docs/lgpl/el/el.po
- desktop-docs/lgpl/el/lgpl.xml
- desktop-docs/lgpl/uk/uk.po
- desktop-docs/lgpl/uk/lgpl.xml
- desktop-docs/lgpl/eu/eu.po
- desktop-docs/lgpl/eu/lgpl.xml
- desktop-docs/lgpl/fi/fi.po
- desktop-docs/lgpl/fi/lgpl.xml
- desktop-docs/lgpl/de/de.po
- desktop-docs/lgpl/de/lgpl.xml
- desktop-docs/lgpl/ar/ar.po
- desktop-docs/lgpl/ar/lgpl.xml
- desktop-docs/lgpl/fr/lgpl.xml
- desktop-docs/lgpl/C/lgpl.xml
- desktop-docs/lgpl/hu/hu.po
- desktop-docs/lgpl/hu/lgpl.xml
- desktop-docs/lgpl/es/es.po
- desktop-docs/lgpl/es/lgpl.xml
- desktop-docs/lgpl/oc/lgpl.xml
- desktop-docs/lgpl/zh_CN/zh_CN.po
- desktop-docs/lgpl/zh_CN/lgpl.xml
- desktop-docs/lgpl/sv/sv.po
- desktop-docs/lgpl/sv/lgpl.xml
- desktop-docs/lgpl/vi/lgpl.xml
+ docs/reference/Makefile.am
docs/reference/mate-desktop/html/mate-desktop-Miscellaneous-Functions.html
docs/reference/mate-desktop/html/mate-desktop-mate-rr-output.html
docs/reference/mate-desktop/html/right.png
@@ -194,7 +143,12 @@ Files: AUTHORS
docs/reference/mate-desktop/mate-desktop-overrides.txt
docs/reference/mate-desktop/mate-desktop.types
docs/reference/mate-desktop/mate-desktop-docs.sgml
- man/mate-about.1
+ docs/reference/mate-desktop/Makefile.am
+ libmate-desktop/Makefile.am
+ libmate-desktop/libmate/Makefile.am
+ libmate-desktop/libmateui/Makefile.am
+ man/Makefile.am
+ mate-about/Makefile.am
mate-desktop/mate-desktop-2.0.pc.in
mate-desktop/mate-desktop-2.0-uninstalled.pc.in
mate-desktop/mate-rr-private.h
@@ -206,149 +160,19 @@ Files: AUTHORS
po/POTFILES.*
schemas/mate-desktop.convert
schemas/org.mate.*.xml.in.in
+ schemas/Makefile.am
+ tools/Makefile.am
+ tools/mate-gsettings-toggle
+ Makefile.am
+ acinclude.m4
+ autogen.sh
+ configure.ac
+ mate-version.xml.in.in
Copyright: *No copyright*
-License: UNKNOWN
- Specified files lack copyright/license information in the
- (non-present) file header.
-
-Files: desktop-docs/Makefile.in
- desktop-docs/gpl/Makefile.in
- desktop-docs/fdl/Makefile.in
- desktop-docs/lgpl/Makefile.in
- docs/reference/Makefile.in
- docs/reference/mate-desktop/Makefile.in
- docs/Makefile.in
- libmate-desktop/Makefile.in
- libmate-desktop/libmate/Makefile.in
- libmate-desktop/libmateui/Makefile.in
- Makefile.in
- man/Makefile.in
- mate-about/Makefile.in
- mate-conf/Makefile.in
- schemas/Makefile.in
-Copyright: 1994-2013, Free Software Foundation, Inc.
-License:
- This Makefile.in 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.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
-
-Files: po/Makefile.in.in
-Copyright: 1995-1997, Ulrich Drepper <drepper at gnu.ai.mit.edu>
- 2004-2008, Rodney Dawes <dobey.pwns at gmail.com>
-License:
- This file may be copied and used freely without restrictions. It may
- be used in projects which are not available under a GNU Public License,
- but which still want to provide support for the GNU gettext functionality.
-
-Files: m4/intltool.m4
-Copyright: 2001, Eazel, Inc.
-License: GPL-2+
-
-Files: compile
- depcomp
- ltmain.sh
- mate-doc-utils.make
- missing
- m4/libtool.m4
-Copyright: 1996-2013, Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: mate-doc-utils.make
-Copyright: 2004-2005, Shaun McCance <shaunm at gnome.org>
-License: GPL-2+
-
-Files: config.guess
- config.sub
-Copyright: 1992-2013, Free Software Foundation, Inc.
-License: GPL-3+
-
-Files: configure
-Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
-License:
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
-
-Files: aclocal.m4
-Copyright:
- 1996-2013, Free Software Foundation, Inc.
- 2001-2004, Red Hat, 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.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
- .
- [...]
- .
- This file is free software, distributed under the terms of the GNU
- General Public License. As a special exception to the GNU General
- Public License, this file may be distributed as part of a program
- that contains a configuration script generated by Autoconf, under
- the same distribution terms as the rest of that program.
- .
- This file can be copied and used freely without restrictions. It can
- be used in projects which are not available under the GNU Public License
- but which still want to provide support for the GNU gettext functionality.
-
-Files: m4/lt~obsolete.m4
- m4/ltoptions.m4
- m4/ltsugar.m4
- m4/ltversion.m4
-Copyright: 1996-2013, 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: Makefile.in
- desktop-docs/Makefile.in
- desktop-docs/gpl/Makefile.in
- desktop-docs/fdl/Makefile.in
- desktop-docs/lgpl/Makefile.in
- docs/reference/Makefile.in
- docs/reference/mate-desktop/Makefile.in
- docs/Makefile.in
- libmate-desktop/Makefile.in
- libmate-desktop/libmate/Makefile.in
- libmate-desktop/libmateui/Makefile.in
- man/Makefile.in
- mate-about/Makefile.in
- mate-conf/Makefile.in
- schemas/Makefile.in
-Copyright: 1994-2013, Free Software Foundation, Inc.
-License:
- This Makefile.in 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.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY, to the extent permitted by law; without
- even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- PARTICULAR PURPOSE.
-
-Files: config.guess
- config.sub
-Copyright: 1992-2013, Free Software Foundation, Inc.
-License: GPL-3+
-
-Files: configure
-Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
-License:
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
-
-Files: install-sh
-Copyright: 1994, X Consortium
-License: MIT-X11
+License: GPL-2+ or LGPL-2+
+Comment:
+ Appropriately assume either license found in COPYING or license found in
+ COPYING.LIB file.
Files: debian/*
Copyright: 2011-2013, Stefano Karapetsas <stefano at karapetsas.com>
@@ -372,53 +196,23 @@ License: GPL-2+
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-License: GPL-3+
- 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 3 of the License, or
- (at your option) any later version.
- .
- This package 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.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
License: LGPL-2+
- This library is free software; you can redistribute it and/or modify
- it under the terms of the GNU Library General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
.
- See /usr/share/common-licenses/LGPL-2 for the full license text.
-
-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.
+ This library 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
+ Library General Public License for more details.
.
- 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.
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
.
- 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.
+ On Debian systems, the complete text of the GNU Library General
+ Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
License: Expat
Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/debian/libmate-desktop-2-17.lintian-overrides b/debian/libmate-desktop-2-17.lintian-overrides
deleted file mode 100644
index 3e18d52..0000000
--- a/debian/libmate-desktop-2-17.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# the spelling is ok! It is a direct quote from what is in the upstream
-# file's license header
-libmate-desktop-2-17: spelling-error-in-copyright GNU Public License GNU General Public License
diff --git a/debian/libmate-desktop-dev.lintian-overrides b/debian/libmate-desktop-dev.lintian-overrides
deleted file mode 100644
index 6e4c81e..0000000
--- a/debian/libmate-desktop-dev.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# the spelling is ok! It is a direct quote from what is in the upstream
-# file's license header
-libmate-desktop-dev: spelling-error-in-copyright GNU Public License GNU General Public License
diff --git a/debian/libmate-desktop-doc.lintian-overrides b/debian/libmate-desktop-doc.lintian-overrides
deleted file mode 100644
index c29d12a..0000000
--- a/debian/libmate-desktop-doc.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# the spelling is ok! It is a direct quote from what is in the upstream
-# file's license header
-libmate-desktop-doc: spelling-error-in-copyright GNU Public License GNU General Public License
diff --git a/debian/mate-desktop-common.lintian-overrides b/debian/mate-desktop-common.lintian-overrides
index 18bc619..70eedbb 100644
--- a/debian/mate-desktop-common.lintian-overrides
+++ b/debian/mate-desktop-common.lintian-overrides
@@ -1,7 +1,3 @@
-# the spelling is ok! It is a direct quote from what is in the upstream
-# file's license header
-mate-desktop-common: spelling-error-in-copyright GNU Public License GNU General Public License
-
# mate-desktop-common ships documentation that includes a license file for every
# language the documentation is available for
mate-desktop-common: extra-license-file
\ No newline at end of file
diff --git a/debian/mate-desktop-dbg.lintian-overrides b/debian/mate-desktop-dbg.lintian-overrides
deleted file mode 100644
index 6b0b759..0000000
--- a/debian/mate-desktop-dbg.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# the spelling is ok! It is a direct quote from what is in the upstream
-# file's license header
-mate-desktop-dbg: spelling-error-in-copyright GNU Public License GNU General Public License
diff --git a/debian/mate-desktop.lintian-overrides b/debian/mate-desktop.lintian-overrides
deleted file mode 100644
index 8efb475..0000000
--- a/debian/mate-desktop.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# the spelling is ok! It is a direct quote from what is in the upstream
-# file's license header
-mate-desktop: spelling-error-in-copyright GNU Public License GNU General Public License
--
mate-desktop Debian package
More information about the pkg-mate-commits
mailing list