[SCM] eom Debian package branch, master, updated. 293b1fa969e224b5ae9490179ec850a58d216d0e
Vangelis Mouhtsis
gnugr-guest at moszumanska.debian.org
Thu Apr 10 20:29:21 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-mate/eom.git;a=commitdiff;h=41d5477
The following commit has been merged in the master branch:
commit 41d5477eff9333d346b3b9ba2357c2c5b1cacfaf
Author: Vangelis Mouhtsis <vangelis at gnugr.org>
Date: Wed Apr 2 14:15:32 2014 +0300
debian/copyright: Adopt to file changes in latest upstream release.
---
debian/copyright | 227 +++----------------------------------------------------
1 file changed, 10 insertions(+), 217 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index b51f65d..2ae8722 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: eom (old name: mate-image-viewer)
Upstream-Contact: Stefano Karapetsas <stefano at karapetsas.com>
-Source: http://pub.mate-desktop.org/releases/
+Source: http://git.mate-desktop.org/eom/
Files: plugins/statusbar-date/eom-statusbar-date-plugin.c
plugins/statusbar-date/eom-statusbar-date-plugin.h
@@ -79,8 +79,6 @@ Copyright: 2000-2009, The Free Software Foundation, Inc.
License: GPL-2+
Files: bindings/python/eom.*
- cut-n-paste/toolbar-editor/eggmarshalers.c
- cut-n-paste/toolbar-editor/eggmarshalers.h
cut-n-paste/toolbar-editor/eggmarshalers.list
cut-n-paste/toolbar-editor/eggtypebuiltins.c
cut-n-paste/toolbar-editor/eggtypebuiltins.h
@@ -108,10 +106,11 @@ Files: bindings/python/eom.*
src/*.xml
src/*.template
src/*.list
+ autogen.sh
Copyright: *No copyright*
License: GPL-2+
Using license from COPYING file.
-
+
Files: cut-n-paste/toolbar-editor/egg-editable-toolbar.c
cut-n-paste/toolbar-editor/egg-editable-toolbar.h
cut-n-paste/toolbar-editor/egg-toolbars-model.c
@@ -134,11 +133,6 @@ Files: src/eom-close-confirmation-dialog.c
src/eom-close-confirmation-dialog.h
Copyright: 2004-2009, GNOME Foundation
License: GPL-2+
-Comment:
- In the source code files it says MATE Foundation. After
- a communication with MATE upstream we agreed on this
- being an artifact that occurred during replacing all
- occurences of GNOME by MATE.
Files: src/eom-sidebar.c
src/eom-sidebar.h
@@ -185,33 +179,9 @@ Copyright: 1997-2009, Thomas G. Lane
1997-2009, Guido Vollbeding
License: BSD-3-clause~IJG
-Files: m4/intltool.m4
-Copyright: 2001, Eazel, Inc.
-License: GPL-2+
-
-Files: m4/libtool.m4
-Copyright: 1996-2011, Free Software Foundation, Inc.
-License: GPL-2+~amorph+libtool
-
-Files: m4/ltoptions.m4
- m4/ltsugar.m4
- m4/ltversion.m4
- m4/lt~obsolete.m4
-Copyright: 2004-2009, 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/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
+ po/cmn.po
+ po/en_US.po
Copyright: 2000-2009, Free Software Foundation, Inc.
2007, Ihar Hrachyshka
2009, GNOME Foundation
@@ -219,11 +189,7 @@ Copyright: 2000-2009, Free Software Foundation, Inc.
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+autoconf
-
+
Files: bindings/python/eom.*
cut-n-paste/toolbar-editor/eggmarshalers.c
cut-n-paste/toolbar-editor/eggmarshalers.h
@@ -276,8 +242,6 @@ Files: bindings/python/eom.*
plugins/fullscreen/eom-fullscreen-plugin.c
plugins/fullscreen/eom-fullscreen-plugin.h
desktop/fullscreen/fullscreen.eom-plugin.destop
- m4/gtk-doc.m4
- m4/mate-doc-utils.m4
man/eom.1
plugins/reload/eom-reload-plugin.c
plugins/reload/eom-reload-plugin.h
@@ -321,101 +285,14 @@ Files: bindings/python/eom.*
plugins/Makefile.am
src/Makefile.am
Makefile.am
- config.h.in
configure.ac
- gtk-doc.make
Copyright: *No copyright*
License: GPL-2+
Using license from COPYING file.
-
-Files: bindings/Makefile.in
- bindings/python/Makefile.in
- cut-n-paste/Makefile.in
- cut-n-paste/totem-screensaver/Makefile.in
- cut-n-paste/toolbar-editor/Makefile.in
- data/icons/22x22/Makefile.in
- data/icons/16x16/Makefile.in
- data/icons/scalable/Makefile.in
- data/icons/Makefile.in
- data/icons/32x32/Makefile.in
- data/icons/24x24/Makefile.in
- data/icons/48x48/Makefile.in
- data/Makefile.in
- data/pixmaps/Makefile.in
- doc/reference/Makefile.in
- doc/Makefile.in
- jpegutils/Makefile.in
- Makefile.in
- man/Makefile.in
- plugins/Makefile.in
- po/Makefile.in.in
- src/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: 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: ltmain.sh
-Copyright: 1996-2011, Free Software Founation, Inc.
-License: GPL-2+~amorph+libtool
-
-Files: compile
- decomp
- missing
- test-driver
-Copyright: 1996-2013, Free Software Foundation, Inc.
-License: GPL-2+~amorph+autoconf
-
-Files: config.guess
- config.sub
-Copyright: 1992-2013, Free Software Foundation, Inc.
-License: GPL-3+~amorph+autoconf
-
-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: install-sh
-Copyright: 1994, X Consortium
-License: MIT-X11
-
+
Files: debian/*
-Copyright: 2011-2014 Stefano Karapetsas <stefano at karapetsas.com>
- 2014 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+ or BSD-3-clause~IJG
License: GPL-2+
@@ -434,7 +311,6 @@ 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: LGPL-2+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -453,68 +329,6 @@ License: LGPL-2+
On Debian systems, the complete text of the GNU General
Public License version LGPL-2 can be found in "/usr/share/common-licenses/LGPL-2".
-License: GPL-2+~amorph+autoconf
- 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-2+~amorph+libtool
- 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+autoconf
- 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: BSD-3-clause~IJG
Permission is hereby granted to use, copy, modify, and distribute this
software (or portions thereof) for any purpose, without fee, subject to these
@@ -546,25 +360,4 @@ License: BSD-3-clause~IJG
commercial products, provided that all warranty or liability claims are
assumed by the product vendor.
-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.
+
--
eom Debian package
More information about the pkg-mate-commits
mailing list