Merge branch 'release/debian/0.36.6-1'debian/0.36.6-1

1 files changed, 50 insertions, 2 deletions

diff --git a/debian/copyright b/debian/copyright
index 7b7391c..0e00f42 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,7 +9,19 @@ Copyright: 2009-2013 Yorba Foundation
            2010      Maxim Kartashev
            2013      Jens Bav
            2016-2019 Software Freedom Conservancy Inc.
-           2011-2023 the shotwell authors
+           2011-2024 the shotwell authors
+License: LGPL-2.1
+
+Files: subprojects/shotwell-facedetect/*.xml
+Copyright: 2000      Intel Corporation
+License: BSD-3-Clause
+
+Files: subprojects/shotwell-facedetect/*.cpp
+       subprojects/shotwell-facedetect/*.hpp
+Copyright: 2016      Software Freedom Conservancy Inc.
+           2011      Valentín Barros Puertas <valentin(at)sanva(dot)net>
+           2018      Ricardo Fantin da Costa <ricardofantin(at)gmail(dot)com>
+           2018      Narendra A <narendra_m_a(at)yahoo(dot)com>
 License: LGPL-2.1
 
 Files: plugins/shotwell-publishing/PhotosPublisher.vala
@@ -22,7 +34,7 @@ License: LGPL-2.1
 
 Files: debian/*
 Copyright: 2009-2011 Devid Antonio Filoni <d.filoni@ubuntu.com>
-           2014-2023 Jörg Frings-Fürst <debian@jff.email>
+           2014-2024 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+
 
 License: LGPL-2.1
@@ -60,3 +72,39 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General Public
  License can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+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. Neither the name of the Creytiv.com
+     nor the names of its contributors
+     may 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.
\ No newline at end of file