[SCM] dvdstyler/master: Update paths and years.

[unit193-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6c136f35b755c2f403381e3186817968c953a611
Author: Unit 193 <unit193 at ubuntu.com>
Date:   Mon Mar 16 20:20:02 2015 -0400

    Update paths and years.

diff --git a/debian/copyright b/debian/copyright
index b236170..213b2b1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,51 +4,91 @@ Upstream-Contact: Alex Thuering <alex.thueringweb.de>
 Source: http://dvdstyler.sourceforge.net/downloads.html
 
 Files: *
-Copyright: Copyright 2004-2009, Alex Thuering <alex.thueringweb.de>
+Copyright: Copyright 2004-2015, Alex Thuering <alex.thueringweb.de>
 License: GPL-2
 
-Files: src/hyperlink.*
-Copyright: Copyright 2003, wxGuide
+Files: wxVillaLib/*
+Copyright: Copyright 2003, Alex Thuering <alex.thueringweb.de>
+License: wxwindows
+
+Files: wxVillaLib/PipeExecute.*
+Copyright: Copyright 2004, Alex Thuering <alex.thueringweb.de>
+License: wxwindows
+
+Files: wxVillaLib/ExifHandler.*
+Copyright: Copyright 2007, Alex Thuering <alex.thueringweb.de>
+License: wxwindows
+
+Files: wxVillaLib/ProgramProcess.*
+Copyright: Copyright 2013, Alex Thuering <alex.thueringweb.de>
+License: GPL-2
+
+Files: wxVillaLib/SingleThumbnailDlg.*
+Copyright: Copyright 2014, Alex Thuering <alex.thueringweb.de>
+License: GPL-2
+
+Files: wxVillaLib/thumb_md5.cpp
+Copyright: Copyright 1993, public domain
 License: other
+  This code implements the MD5 message-digest algorithm.
+  The algorithm is due to Ron Rivest.  This code was
+  written by Colin Plumb in 1993, no copyright is claimed.
+  This code is in the public domain; do with it what you wish.
+
+Files: debian/*
+Copyright:
+ 2009-2012, Alessio Treglia <quadrispro at ubuntu.com>
+ 2008-2009, Fabrice Coutadeur <coutadeurf at gmail.com>
+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; version 2 dated June, 1991.
+ .
+ On Debian GNU/Linux systems, the complete text of version 2 of the GNU
+ General Public License can be found in `/usr/share/common-licenses/GPL-2
+
+License: wxwindows
                 wxWindows Library Licence, Version 3.1
                 ======================================
-
+  .
   Copyright (C) 1998-2005 Julian Smart, Robert Roebling et al
-
+  .
   Everyone is permitted to copy and distribute verbatim copies
   of this licence document, but changing it is not allowed.
-
+  .
                        WXWINDOWS LIBRARY LICENCE
      TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-  
+  .
   This library is free software; you can redistribute it and/or modify it
   under the terms of the GNU Library General Public Licence as published by
   the Free Software Foundation; either version 2 of the Licence, 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 Library
   General Public Licence for more details.
-
+  .
   You should have received a copy of the GNU Library General Public Licence
   along with this software, usually in a file named COPYING.LIB.  If not,
   write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
   Floor, Boston, MA 02110-1301, USA.
-
+  .
   EXCEPTION NOTICE
-
+  .
   1. As a special exception, the copyright holders of this library give
   permission for additional uses of the text contained in this release of
   the library as licenced under the wxWindows Library Licence, applying
   either version 3.1 of the Licence, or (at your option) any later version of
   the Licence as published by the copyright holders of version
   3.1 of the Licence document.
-
+  .
   2. The exception is that you may use, copy, link, modify and distribute
   under your own terms, binary object code versions of works based
   on the Library.
-
+  .
   3. If you copy code from files distributed under the terms of the GNU
   General Public Licence or the GNU Library General Public Licence into a
   copy of this library, as this licence permits, the exception does not
@@ -56,34 +96,3 @@ License: other
   to the status of such modified files, you must delete this exception
   notice from such code and/or adjust the licensing conditions notice
   accordingly.
-
-Files: wxVillaLib/thumb_md5.cpp
-Copyright: No copyright holders
-License: public-domain
- This code implements the MD5 message-digest algorithm.
- The algorithm is due to Ron Rivest. This code was
- written by Colin Plumb in 1993, no copyright is claimed.
- This code is in the public domain; do with it what you wish.
-
-Files: debian/*
-Copyright:
- 2009-2012, Alessio Treglia <quadrispro at ubuntu.com>
- 2008-2009, Fabrice Coutadeur <coutadeurf at gmail.com>
-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.
-Comment:
- On Debian systems, the complete text of the GNU General
- Public License 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/>.

-- 
dvdstyler packaging