[SCM] subtitlecomposer packaging branch, master, updated. debian/0.5.3-4-16-gf3e2d9c

Fri Oct 16 09:35:51 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/subtitlecomposer.git;a=commitdiff;h=2230396

The following commit has been merged in the master branch:
commit 22303961b2b51e3524730bdb5d6f77d1036381e3
Author: Maximiliano Curia <maxy at debian.org>
Date:   Fri Oct 16 10:49:24 2015 +0200

    Migrate copyright file to copyright 1.0
---
 debian/copyright | 181 +++++++++++++++++++++++++++----------------------------
 1 file changed, 88 insertions(+), 93 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index de45d80..0cb4bca 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,92 +1,38 @@
-This package was debianized by José Manuel Santamaría Lema <panfaust at gmail.com> on
-Fri, 10 Apr 2009 22:11:11 +0200                                                   
-
-
-Upstream Author: 
-
- Sergio Pistone <sergio_pistone at yahoo.com.ar>
-
-
-Copyright:
-
- Copyright © 2007-2008 Sergio Pistone <sergio_pistone at yahoo.com.ar>
-
-
-License:
-
-   This package 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 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 package; if not, write to the Free Software      
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,           
-   MA 02110-1301, USA.                                              
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in the file `/usr/share/common-licenses/GPL-2'.          
-
-Files src/player/mplayer/mediadata.h, src/widgets/pointingslider.h,
-src/widgets/pointingslider.cpp, src/widgets/attachablewidget.h and 
-src/widgets/attachablewidget.cpp:                                  
-                                                                   
- Copyright © 2006-2008 Ricardo Villalba <rvm at escomposlinux.org>    
- Copyright © 2007-2008 Sergio Pistone <sergio_pistone at yahoo.com.ar>
-
-File src/player/xine/FindXCB.cmake:
-
- Copyright © 2007 Matthias Kretz <kretz at kde.org>
-
- Redistribution and use is allowed according to the terms of the BSD license.
- For details see the accompanying COPYING-CMAKE-SCRIPTS file.                
-
- Contents of COPYING-CMAKE-SCRIPTS file:
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:                                                          
-
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer. 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products 
-    derived from this software without specific prior written permission. 
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,         
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY    
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT      
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.        
-
-Files src/main/utils/kreplace.h, src/main/utils/kreplace.cpp
-and src/main/utils/kfind_p.h:
-
- Copyright © 2001 S.R.Haque <srhaque at iee.org>
- Copyright © 2002 David Faure <david at mandrakesoft.com>
- Copyright © 2004 Arend van Beelen jr. <arend at auton.nl>
-
- These files are under GNU Lesser General Public License as published by the
- Free Software Foundation, version 2; on Debian systems the full text of the
- GNU Lesser General Public License can be found in the
- `/usr/share/common-licenses/LGPL-2' file.
-
-Files src/common/qxtsignalwaiter.h and src/common/qxtsignalwaiter.cpp:
-
- Copyright © 2006 Adam Higerd <ahigerd at stratitec.com>
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: subtitlecomposer
+Source: https://github.com/maxrd2/subtitlecomposer
+
+Files: *
+Copyright: 2007-2009, Sergio Pistone (sergio_pistone at yahoo.com.ar) based on Kaffeine by Jürgen Kofler
+           2007-2009, Sergio Pistone (sergio_pistone at yahoo.com.ar) based on smplayer by Ricardo Villalba
+           2007-2012, Sergio Pistone (sergio_pistone at yahoo.com.ar)
+           2013, Mladen Milinkovic (max at smoothware.net)
+           2006-2008, Ricardo Villalba (rvm at escomposlinux.org)
+License: GPL-2+
+
+Files: src/main/utils/kfind_p.h
+       src/main/utils/kreplace.cpp
+       src/main/utils/kreplace.h
+Copyright: 2001, S.R.Haque <srhaque at iee.org>.
+           2002, David Faure <david at mandrakesoft.com>
+           2004, Arend van Beelen jr. <arend at auton.nl>
+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
+ License version 2, as published by the Free Software Foundation.
+ .
+ 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
+ Library General Public License for more details.
+ .
+ The complete text of the GNU Library General Public License version 2 can be
+ found in the `/usr/share/common-licenses/LGPL-2' file.
+
+Files: src/common/qxtsignalwaiter.cpp
+       src/common/qxtsignalwaiter.h
+Copyright: 2006, Adam Higerd ahigerd at stratitec.com
+License: LGPL-2.1+_or_GPL-2+
  QxtSignalWaiter 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, version 2 or greater, or under the terms
@@ -97,12 +43,61 @@ Files src/common/qxtsignalwaiter.h and src/common/qxtsignalwaiter.cpp:
  to you under the GPL. If you use Qt under the QPL, this is licensed to
  you under the QPL. If you use Qt with a commercial license purchased
  from Trolltech, this is licensed to you under the LGPL.
-
+ .
  QxtSignalWaiter 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
  appropriate license agreement for more details.
+ .
+ The complete text of the GNU General Public License version 2 can be
+ found in the `/usr/share/common-licenses/GPL-2' file, likewise, the complete
+ text of the GNU Lesser General Public License version 2.1 can be found in
+ `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: src/services/FindGStreamer.cmake
+Copyright: 2012, Raphael Kubo da Costa <rakuco at webkit.org>
+License: BSD-2-Clause
+
+Files: src/services/xine/FindXCB.cmake
+Copyright: 2007, Matthias Kretz <kretz at kde.org>
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-The Debian packaging is © 2009 José Manuel Santamaría Lema
-<panfaust at gmail.com> and is licensed under the GPL v2 or later,
-see `/usr/share/common-licenses/GPL-2'.
\ No newline at end of file
+Files: debian/*
+Copyright: 2009, José Manuel Santamaría Lema <panfaust at gmail.com>
+License: GPL-2+
+
+License: GPL-2+
+ This package 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 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.
+ .
+ The complete text of the GNU General Public License version 2 can be found in
+ the file `/usr/share/common-licenses/GPL-2'.

-- 
subtitlecomposer packaging

