[SCM] gmerlin/master: wrap-and-sort, small cosmetic fix

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Jun 11 15:45:05 UTC 2012


The following commit has been merged in the master branch:
commit fbd665a9a8d02304838345b4bcf98006eb027c98
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 16:41:33 2012 +0200

    wrap-and-sort, small cosmetic fix
    
    Git-Dch: Ignore

diff --git a/debian/copyright b/debian/copyright
index 730834c..90bac05 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -42,7 +42,7 @@ Files: doc/*
 Copyright: 2001-2010, Members of the Gmerlin project <gmerlin-general at lists.sourceforge.net>
 License: GFDL-1.1
 
-Files: config.rpath,
+Files: config.rpath
  m4/*.m4
 Copyright: 1995-2006, Free Software Foundation, Inc
 License: other-GAP
@@ -131,15 +131,15 @@ Comment:
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 License: GFDL-1.1
- Permission is granted to copy, distribute and/or modify this document 
- under the terms of the GNU Free Documentation License, Version 1.1 or 
- any later version published by the Free Software Foundation; with no 
- Invariant Sections, with the Front-Cover Texts being “A GNU Manual,” 
- and with the Back-Cover Texts as in (a) below. A copy of the license 
- is included in the section entitled “GNU Free Documentation License.” 
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.1 or
+ any later version published by the Free Software Foundation; with no
+ Invariant Sections, with the Front-Cover Texts being “A GNU Manual,”
+ and with the Back-Cover Texts as in (a) below. A copy of the license
+ is included in the section entitled “GNU Free Documentation License.”
  .
- (a) The FSF's Back-Cover Text is: “You have freedom to copy and modify 
- this GNU Manual, like GNU software. Copies published by the Free Software 
+ (a) The FSF's Back-Cover Text is: “You have freedom to copy and modify
+ this GNU Manual, like GNU software. Copies published by the Free Software
  Foundation raise funds for GNU development.”
  .
  As mentioned in the license, there is no invariant section, hence following

-- 
gmerlin packaging



More information about the pkg-multimedia-commits mailing list