[SCM] blender/master: debian/copyright: purging non DEP-5 stuff

mfv-guest at users.alioth.debian.org mfv-guest at users.alioth.debian.org
Thu Jan 5 10:52:44 UTC 2012


The following commit has been merged in the master branch:
commit 3e34f39f201a4f70f197f1e5218e455a2d1be6db
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Thu Jan 5 11:51:55 2012 +0100

    debian/copyright: purging non DEP-5 stuff
    
    Git-Dch: Ignore

diff --git a/debian/copyright b/debian/copyright
index 4ad9e1b..17facf9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,54 +1,33 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=240
 Upstream-Name: blender
 Upstream-Author: Blender Foundation
 Source: http://download.blender.org/source/
 
 Files: *
-Copyright: © 2002-2010 Blender Foundation
+Copyright: 2002-2010, Blender Foundation
 License: GPL-2+
- | 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.
- |
- | You should have received a copy of the GNU General Public License along
- | with this program; if not, write to the Free Software Foundation, Inc.,
- | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- |
- |
- | On Debian systems, the complete text of the GNU General Public License
- | version 2 can be found in “/usr/share/common-licenses/GPL-2”.
 
 Files: debian/*
-Copyright: © 2004-2005 Masayuki Hatta <mhatta at debian.org>
-           © 2005-2007 Florian Ernst <florian at debian.org>
-           © 2007-2010 Cyril Brulebois <kibi at debian.org>
-           © 2010      Kevin Roy <kiniou at gmail.com>
+Copyright: 2004-2005, Masayuki Hatta <mhatta at debian.org>
+           2005-2007, Florian Ernst <florian at debian.org>
+           2007-2010, Cyril Brulebois <kibi at debian.org>
+           2010, Kevin Roy <kiniou at gmail.com>
 License: GPL-2+
- | 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.
- |
- | You should have received a copy of the GNU General Public License along
- | with this program; if not, write to the Free Software Foundation, Inc.,
- | 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- |
- |
- | On Debian systems, the complete text of the GNU General Public License
- | version 2 can be found in “/usr/share/common-licenses/GPL-2”.
 
-Files: extern/{glew,libopenjpeg}
+License: GPL-2+
+ 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.
+ .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 Comment:
- Removed since they are embedded code copies of software available in
- main or software not acceptable in main.
+ On Debian systems, the complete text of the GNU General Public License
+ version 2 can be found in "/usr/share/common-licenses/GPL-2".

-- 
blender packaging



More information about the pkg-multimedia-commits mailing list