[SCM] marco Debian package branch, master, updated. 3dd747ada0b8f8b83f20bc6052b0aa9dcf9c1b26
Mike Gabriel
sunweaver at moszumanska.debian.org
Tue Mar 11 19:42:21 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-mate/marco.git;a=commitdiff;h=df0e693
The following commit has been merged in the master branch:
commit df0e693cfd9e18282a336c554cb7e65f6e91cb7d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Mar 11 20:15:09 2014 +0100
debian/copyright: Adapt to files in new (repacked) upstream tarball.
---
debian/copyright | 177 +++++--------------------------------------------------
1 file changed, 14 insertions(+), 163 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 6dc88ff..d7a6b98 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -96,7 +96,6 @@ Copyright: 2001, Havoc Pennington
2004-2006, Elijah Newren
License: GPL-2+
-
Files: src/core/frame.c
src/ui/frames.c
src/ui/tabpopup.c
@@ -313,61 +312,35 @@ License: GPL-2+
Comment:
Using license from COPYING file.
-Files: mate-doc-utils.make
-Copyright: 2004-2005, Shaun McCance <shaunm at gnome.org>
-License: GPL-2+~amorph
-
-Files: ltmain.sh
-Copyright: 1996-2006, Free Software Foundation, Inc.
-License: GPL-2+
-
-Files: doc/creating_themes/Makefile.in
- doc/man/Makefile.in
- doc/Makefile.in
- Makefile.in
- src/tools/Makefile.in
- src/themes/Makefile.in
- src/Makefile.in
- src/wm-tester/Makefile.in
-Copyright: 1994-2011, 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: po/*.po
Copyright: THE PACKAGE's COPYRIGHT HOLDERS
+ 2001-2010, Free Software Foundation, Inc.
+ 2006-2007, Rosetta Contributors and Canonical Ltd.
+ 2003-2006 Miloslav Trmac <mitr at volny.cz>
+ 2002, Simos Xenitellis
+ 2002, The Gnome Foundation
+ 2004-2006, Adam Weinberger and the GNOME Foundation
+ 2003-2006, Sharif FarsiWeb, Inc.
+ 2008, Thomas Thurman
License: GPL-2+
Comment:
Using license from COPYING file.
-Files: doc/creating_themes/Makefile.am
- doc/creating_themes/C/*.xml
- doc/man/Makefile.am
+Files: doc/man/Makefile.am
doc/man/*.1
doc/Makefile.am
doc/*.txt
po/Makefile.am
- po/ChangeLog
po/LINGUAS
po/POTFILES.in
po/POTFILES.skip
src/tools/Makefile.am
src/themes/Makefile.am
src/wm-tester/Makefile.am
+ src/wm-tester/focus-window.c
+ src/wm-tester/test-gravity.c
+ src/wm-tester/test-resizing.c
+ src/wm-tester/test-size-hints.c
src/Makefile.am
src/*.xml.in
src/*.pc.in
@@ -376,13 +349,8 @@ Files: doc/creating_themes/Makefile.am
src/*.desktop
src/*.gschema.xml
src/tools/*.png
- src/wm-tester/focus-window.c
- src/wm-tester/test-gravity.c
- src/wm-tester/test-resizing.c
- src/wm-tester/test-size-hints.c
Makefile.am
- ChangeLog
- config.h.in
+ autogen.sh
configure.ac
rationales.txt
Copyright: *No Copyright*
@@ -390,57 +358,6 @@ License: GPL-2+
Comment:
Files have no license header. Using license from COPYING file.
-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: config.guess
- config.sub
-Copyright: 1992-2013, Free Software Foundation, Inc.
-License: GPL-3+~amorph
-
-Files: configure
-Copyright: 1992-2010, Free Software Foundaction, Inc.
-License:
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
-
-Files: decomp
- missing
-Copyright: 1996-2012, Free Software Foundation, Inc.
-License: GPL-2+~amorph
-
-Files: install-sh
-Copyright: 1994, X Consortium
-License: MIT-X11
-
-Files: mkinstalldirs
-Copyright: 1993, Noah Friedman <friedman at prep.ai.mit.edu>
-License:
- Public Domain
-
Files: debian/*
Copyright: 2011-2014, Stefano Karapetsas <stefano at karapetsas.com>
2014, Mike Gabriel <sunweaver at debian.org>
@@ -460,49 +377,6 @@ License: GPL-2+
On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-2".
-License: GPL-2+~amorph
- 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 2 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.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-2".
- .
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program that contains a
- configuration script generated by Autoconf, you may include it under
- the same distribution terms that you use for the rest of that program.
-
-License: GPL-3+~amorph
- 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".
- .
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program that contains a
- configuration script generated by Autoconf, you may include it under
- the same distribution terms that you use for the rest of that
- program. This Exception is an additional permission under section 7
- of the GNU General Public License, version 3 ("GPLv3").
-
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
@@ -538,26 +412,3 @@ License: MIT-OpenGroup
Except as contained in this notice, the name of the copyright holder 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 copyright holder.
-
-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.
--
marco Debian package
More information about the pkg-mate-commits
mailing list