[SCM] libmateweather Debian package branch, master, updated. debian/1.6.2-2-10-g5306f23

Mike Gabriel sunweaver at moszumanska.debian.org
Thu Mar 6 12:01:59 UTC 2014


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

The following commit has been merged in the master branch:
commit de3c87bd7c96f2ff191f2ef4a0bc237e706902fc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 6 12:41:51 2014 +0100

    debian/copyright: Adapt copyright file to new upstream release.
---
 debian/copyright | 213 ++++++++++++++++++++++++-------------------------------
 1 file changed, 92 insertions(+), 121 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 3f3a411..6392eac 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,21 +3,6 @@ Upstream-Name: libmateweather
 Upstream-Contact: Stefano Karapetsas <stefano at karapetsas.com>
 Source: http://pub.mate-desktop.org/releases/
 
-Files: icons/moonshadow.pl
-       libmateweather/mateweather-prefs.*
-       libmateweather/mateweather-xml-*
-       libmateweather/weather*.*
-Copyright: 2004, Gareth Owen
-           2005, Ryan Lortie
-License: GPL-2+
-
-Files: icons/*.svg
-Copyright: UNKNOWN
-License: GPL-2+
-Comment:
- Presuming GPL-2+ (SVGs only hint to GPL-2) as all other licenses
- used in this source code opt usage of a higher license version.
-
 Files: libmateweather/location-entry.c
        libmateweather/location-entry.h
        libmateweather/mateweather-location.*
@@ -27,78 +12,109 @@ Files: libmateweather/location-entry.c
        libmateweather/parser.h
        libmateweather/timezone-menu.c
        libmateweather/timezone-menu.h
-       python/mateweathermodule.c
 Copyright: 2008, Red Hat, Inc
            2008, Novell, Inc
 License: LGPL-2.1+
 
-Files: data/Makefile.in
-       doc/Makefile.in
-       icons/Makefile.in
-       libmateweather/Makefile.in
-       Makefile.in
-       po-locations/Makefile.in
-       python/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, 1996, 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.
+Files: libmateweather/mateweather-xml-*
+Copyright: 2004, Gareth Owen
+           2005, Ryan Lortie
 License: GPL-2+
 
-Files: compile
-       decomp
-       ltmain.sh
-       missing
-       m4/libtool.m4
-Copyright: 1996-2013 Free Software Foundation, Inc.
+Files: icons/*.svg
+       icons/*.png
+Copyright: *No copyright*
 License: GPL-2+
+Comment:
+ Presuming GPL-2+ (SVGs only hint to GPL-2) as all other licenses
+ used in this source code opt usage of a higher license version.
+ .
+ PNGs are derived from SVGs, so assuming the same license.
 
-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
-       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: icons/moonshadow.pl
+       libmateweather/mateweather-prefs.*
+       libmateweather/weather*.*
+       python/mateweathermodule.c
+Copyright: *No copyright*
+License: GPL-2+
 
-Files: install-sh
-Copyright: 1994 X Consortium
-License: MIT-X11
+Files: po/*
+Copyright: 1998-2010, Free Software Foundation, Inc.
+           2009, GNOME i18n Project for Vietnamese.
+           1999-2002, Jesús Bravo Álvarez
+           2001, Roy-Magne Mo
+           2003, 2004, 2005, 2006 Miloslav Trmac <mitr at volny.cz>.
+           2003, 2005, 2006 Sharif FarsiWeb, Inc.
+           2004-2006 Adam Weinberger and the MATE Foundation
+           2004-20 THE PACKAGE'S COPYRIGHT HOLDER
+           2005, Canonical Ltd.
+           2008 Pavel Šefránek <ps at pjoul.cz>.
+           2010, Rosetta Contributors and Canonical Ltd.
+           1999, Dave Camp"
+           2003, Sun Microsystems"
+           1999-2004, Sergey V. Udaltsov
+           1999-2005, S. Papadimitriou
+           1999-2004, Siarhiej V. Udalcoŭ
+           THE PACKAGE'S COPYRIGHT HOLDER
+License: GPL-2+ or LGPL-2.1+
+ Apply appropriate license as either found in COPYING
+ file or in COPYING.GPL file.
+
+Files: po-locations/*
+Copyright: 2000-2010, Free Software Foundation, Inc.
+           2009, GNOME I18N Project for Vietnamese
+           2004-2006, Miloslav Trmac <mitr at volny.cz>
+           2004-2005, Adam Weinberger and the GNOME Foundation
+           2004-2005, Sharif FarsiWeb, Inc.
+           2004, Kostas Papadimas, Simos Xenitellis, FSF
+           2004, The GNOME Foundation
+           2005, Rajesh Ranjan <rranjan at redhat.com>
+           2005, Sunil Mohan Adapa <sunil at atc.tcs.co.in>
+           2005, Yahoo! Inc.
+           2006, Mate Georgian Translators
+           2008, Pavel Šefránek <ps at pjoul.cz>
+           2010, Krasimir Chonov <mk2616 at abv.bg>
+           2010, Rosetta Contributors and Canonical Ltd.
+           THE PACKAGE'S COPYRIGHT HOLDER
+License: GPL-2+ or LGPL-2.1+
+ Apply appropriate license as either found in COPYING
+ file or in COPYING.GPL file.
+
+Files: data/Makefile.am
+       data/Locations.xml.in
+       data/README*
+       data/check-timezones.sh
+       data/locations.dtd
+       doc/*
+       icons/Makefile.am
+       libmateweather/Makefile.am
+       libmateweather/mateweather-enum-types.c
+       libmateweather/mateweather-enum-types.h
+       libmateweather/mateweather-uninstalled.pc.in
+       libmateweather/org.mate.weather.gschema.xml.in.in
+       libmateweather/test_*.c
+       po/LINGUAS
+       po/POTFILES.in
+       po/POTFILES.skip
+       po-locations/Makefile.am
+       po-locations/extract.xsl
+       po-locations/regen.sh
+       python/Makefile.am
+       python/bad__init__.py
+       python/demo.py
+       python/mateweather.*
+       Makefile.am
+       acinclude.m4
+       autogen.sh
+       configure.ac
+Copyright: *No copyright*
+License: GPL-2+ or LGPL-2.1+
+ Apply appropriate license as either found in COPYING
+ file or in COPYING.GPL file.
 
 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>
+           2014 Mike Gabriel <sunweaver at debian.org>
 License: GPL-2+ or LGPL-2.1+
 
 License: GPL-2+
@@ -123,28 +139,6 @@ License: GPL-2+
  License version 2 can be found in the file
  `/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 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.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 3 can be found in the file
- `/usr/share/common-licenses/GPL-3'.
-
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -164,26 +158,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.

-- 
libmateweather Debian package



More information about the pkg-mate-commits mailing list