[SCM] mate-file-manager Debian package branch, master, updated. 1da62a557c9ef9dca4a8746bbf8732d6f6538836

Mike Gabriel sunweaver at moszumanska.debian.org
Sat Apr 5 21:49:54 UTC 2014 

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

The following commit has been merged in the master branch:
commit 21309082745132a2db3b1534fad40100cd20b95c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Apr 5 22:05:16 2014 +0200

    debian/copyright: Adapt to file changes in new upstream source tree.
---
 debian/copyright | 173 +------------------------------------------------------
 1 file changed, 1 insertion(+), 172 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 4b7e7b3..329ff15 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -600,7 +600,6 @@ Files: cut-n-paste-code/libegg/update-from-egg.sh
        libcaja-private/caja-icon-names.h
        libcaja-private/caja-recent.h
        libcaja-private/*.xml.in
-       m4/gtk-doc.m4
        po/LINGUAS
        po/POTFILES.*
        src/caja-freedesktop-dbus.c
@@ -641,65 +640,13 @@ Files: cut-n-paste-code/libegg/update-from-egg.sh
        Makefile.am
        Makefile.shared
        add-include-prefix
-       config.h.in
+       autogen.sh
        configure.ac
-       gtk-doc.make
 Copyright: *No copyright*
 License: GPL-2+ or LGPL-2+
 Comment:
  Appropriately apply licenses as found in COPYING or COPYING.LIBS.
 
-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+
-
-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: cut-n-paste-code/libegg/Makefile.in
-       cut-n-paste-code/Makefile.in
-       data/icons/Makefile.in
-       data/Makefile.in
-       data/patterns/Makefile.in
-       docs/Makefile.in
-       eel/Makefile.in
-       icons/Makefile.in
-       libcaja-extension/Makefile.in
-       libcaja-private/Makefile.in
-       Makefile.in
-       src/file-manager/Makefile.in
-       src/Makefile.in
-       test/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: po/*.po
 Copyright: 1999-2001, Eazel, Inc.
            1999-2008, Aŭtary Cajaa
@@ -713,58 +660,6 @@ License: GPL-2+ or LGPL-2+
 Comment:
  Assuming either license from COPYING or COPYING.LIB 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: ltmain.sh
-Copyright: 1996-2011, Free Software Founation, Inc.
-License: GPL-2+
-
-Files: compile
-       depcomp
-       missing
-       test-driver
-Copyright: 1996-2013, Free Software Foundation, Inc.
-License: GPL-2+~amorph
-
-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: 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>
@@ -787,49 +682,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: 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
@@ -846,26 +698,3 @@ License: LGPL-2+
  .
  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: 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.

-- 
mate-file-manager Debian package

More information about the pkg-mate-commits mailing list