[SCM] gmerlin/master: Update to DEP-5 candidate, clean-up, re-formatting of licenses text.

Thu Jan 13 18:54:39 UTC 2011

The following commit has been merged in the master branch:
commit d8f7a689624f93572de9a4ac454038ffd9a1361f
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Jan 13 19:54:05 2011 +0100

    Update to DEP-5 candidate, clean-up, re-formatting of licenses text.

diff --git a/debian/copyright b/debian/copyright
index e8afe94..d1c6fa5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,9 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-Name: gmerlin
-Maintainer: Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=155
+Upstream-Name: gmerlin
+Upstream-Contact: Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
 Source: http://gmerlin.sourceforge.net/
 
+Files: *
 Copyright: 2001-2011, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
 License: GPL-3+
 
@@ -46,7 +47,6 @@ Copyright: 2001-2011, Members of the Gmerlin project,
  2007, Alexander G. Balakhnin aka Fizick
 License: GPL-2+
 
-
 Files: include/md5.h,
  lib/md5.c,
  missing,
@@ -98,61 +98,55 @@ Copyright: 2008, Christian Marillat <marillat at debian.org>,
  2011, IOhannes m zmölnig <zmoelnig at iem.at>
 License: GPL-2+
 
+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.
 
-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, 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
- (GPL) version 2 can be found in "/usr/share/common-licenses/GPL-2".
- .
  You should have received a copy of the GNU General Public License along
- with this program.  If not, see <http://www.gnu.org/licenses/>.
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+Comment: 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-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.
- .
- On Debian systems, the complete text of the GNU General Public License
- (GPL) version 3 can be found in "/usr/share/common-licenses/GPL-3".
- .
+
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
+Comment: On Debian systems, the complete text of the GNU General Public
+  License version 3 can be found in "/usr/share/common-licenses/GPL-3".
 
 License: LGPL-2.1+
- This header is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
- .
- This header 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 Lesser
- General Public License for more details.
- .
- On Debian systems, the complete text of the GNU Lesser General Public
- License (LGPL, formerly named GNU Library General Public License)
- version 2.1 can be found in '/usr/share/common-licenses/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
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library 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
+ Lesser General Public License for more details.
+
  You should have received a copy of the GNU Lesser General Public
- License along with this program.  If not, see
- <http://www.gnu.org/licenses/>.
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+Comment: On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1 can be found in '/usr/share/common-licenses/LGPL-2.1'.
 
 License: GFDL-1.1
  Permission is granted to copy, distribute and/or modify this document 
@@ -169,7 +163,7 @@ License: GFDL-1.1
  As mentioned in the license, there is no invariant section, hence following
  the requirements mentioned here: http://www.debian.org/vote/2006/vote_001
 
-License: BSD-2
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -220,6 +214,3 @@ License: other-targa
  .
  This code is provided without any warranty.  The copyright holder is
  not liable for anything bad that might happen as a result of the code.
-
-
-

-- 
gmerlin packaging

