[SCM] Scene change detector branch, master, updated. debian/1.0.86-1-16-g3a5833a

Giulio Paci giuliopaci at gmail.com
Thu Jan 17 22:09:39 UTC 2013


The following commit has been merged in the master branch:
commit 38233453f5d5676528bebe7154d9ffec0170bdf6
Author: Giulio Paci <giuliopaci at gmail.com>
Date:   Thu Jan 17 23:07:41 2013 +0100

    Improved copyright file.
    
    * Fixed Format url.
    * Fixed license information for some files.

diff --git a/debian/copyright b/debian/copyright
index f5e3c76..44dd84c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/copyright-format/1.0
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Contact: Johan MATHE <johan.mathe at nonutc.fr>
 Upstream-Name: shotdetect
 Source: http://shotdetect.nonutc.fr/
@@ -42,36 +42,47 @@ License: LGPL-2.1+
 Files: ltmain.sh
 Copyright: 1996-2005 Free Software Foundation, Inc.
  1996, Gordon Matzigkeit <gord at gnu.ai.mit.edu>
-License: GPL-2+ or LGPL-2.1+
- 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+ with Autoconf exception
 
 Files: depcomp
 Copyright: 1999-2006, Free Software Foundation, Inc.
  Alexandre Oliva <oliva at dcc.unicamp.br>
-License: GPL-2+ or LGPL-2.1+
- 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+ with Autoconf exception
 
 Files: config.guess
  config.sub
 Copyright: 1992-2005 Free Software Foundation, Inc.
-License: GPL-2+ or LGPL-2.1+
- 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+ with Autoconf exception
 
 Files: missing
 Copyright: 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
 	   1996, Franc,ois Pinard <pinard at iro.umontreal.ca>
 License: GPL-2+
 
+License: GPL-2+ with Autoconf exception
+ 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.
+ .
+ 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.
+ .
+ The text of the GNU Lesser General Public License is available at
+ `/usr/share/common-licenses/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

-- 
Scene change detector



More information about the pkg-multimedia-commits mailing list