Merge tag 'debian/1.4.0-1' into develop

Neu upstream release

1 files changed, 2 insertions, 26 deletions

diff --git a/debian/copyright b/debian/copyright
index f560fb5..1103f17 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -53,15 +53,10 @@ Files: backend/artec.*
 Copyright: 1996-1997 David Mosberger-Tang
 License: GPL-2+
 
-Files: backend/qcam.c
+Files: backend/qcam.*
 Copyright: 1997      David Mosberger-Tang
            1996      Scott Laird
-License: Expat and/or GPL-2+
-
-Files: backend/qcam.h
-Copyright: 1997      David Mosberger-Tang
-           1996      Scott Laird
-License: Expat and/or GPL-1
+License: Expat and GPL-2+ with sane exception
 
 Files: backend/artec_eplus48u.*
 Copyright: 2002      Michael Herder <crapsite@gmx.net>
@@ -1079,25 +1074,6 @@ License: Artistic
  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-License: GPL-1
- 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 1 of the License.
- .
- 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, see https://www.gnu.org/licenses/.
- .
- On Debian systems, the full text of the GNU General Public
- License version 1 can be found in the file
- `/usr/share/common-licenses/GPL-1'.
-
 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