[SCM] gigedit/master: Update copyright file.

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

The following commit has been merged in the master branch:
commit ac3bea85afad3d2fa4dde51504fda180fb1e2f18
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Dec 2 00:30:59 2016 +0100

    Update copyright file.

diff --git a/debian/copyright b/debian/copyright
index 594beca..2db8f76 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,11 +2,11 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Gigedit
 Upstream-Contact: Andreas Persson
 Source: http://download.linuxsampler.org/packages/
-Copyright: 2006-2009, Andreas Persson
+Copyright: 2006-2015, Andreas Persson
 
 Files: *
 Copyright:
- 2006-2009 Andreas Persson
+ 2006-2015 Andreas Persson
 License: GPL-2+
 
 Files:
@@ -18,9 +18,65 @@ Copyright:
  2016, Jaromír Mikeš <mira.mikes at seznam.cz>
 License: GPL-2+
 
+Files: src/gigedit/CombineInstrumentsDialog.cpp
+ src/gigedit/CombineInstrumentsDialog.h
+ src/gigedit/MacHelper.h
+ src/gigedit/MacHelper.m
+ src/gigedit/ReferencesView.cpp
+ src/gigedit/ReferencesView.h
+ src/gigedit/Settings.cpp
+ src/gigedit/Settings.h
+ src/gigedit/scripteditor.cpp
+ src/gigedit/scripteditor.h
+ src/gigedit/scriptslots.cpp
+ src/gigedit/scriptslots.h
+Copyright: 2013, Christian Schoenebeck
+  2014, Christian Schoenebeck
+  2014-2015, Christian Schoenebeck
+License: GPL-2
+
 Files: ./src/gigedit/wrapLabel.*
 Copyright: 2005 VMware, Inc.
-License: other
+License: Expat
+
+Files: osx/autoconf_builder.sh
+Copyright: 2007, Toshi Nagata.
+License: BSD-2-clause
+
+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.
+ .
+ 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/>.
+
+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 version 2 as
+ published by the Free Software Foundation.
+ .
+ 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.
+ .
+ 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/>.
+
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
  a copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
@@ -40,19 +96,21 @@ License: other
  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-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.
+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:
  .
- 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.
+ 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.
  .
- 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/>.
+ 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.

-- 
gigedit packaging