Merge branch 'release/debian/0.32.6-2'debian/0.32.6-2

4 files changed, 45 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index d025250..42794d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+shotwell (0.32.6-2) unstable; urgency=medium
+
+  * debin/control:
+    - Add Depends (Closes: #1074491):
+      + libavif-gdk-pixbuf
+      + libjxl-gdk-pixbuf
+  * debian/changelog:
+    - Fix Licenses (Thanks to Phil Wyett <philip.wyett@kathenas.org>).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 30 Jun 2024 15:18:23 +0200
+
 shotwell (0.32.6-1) unstable; urgency=medium
 
   * New upstream release (Closes: #1064455).
diff --git a/debian/control b/debian/control
index 6716191..1184de5 100644
--- a/debian/control
+++ b/debian/control
@@ -49,6 +49,8 @@ Depends:
  shotwell-common (= ${source:Version}),
  dconf-cli,
  default-dbus-session-bus | dbus-session-bus,
+ libavif-gdk-pixbuf,
+ libjxl-gdk-pixbuf,
  librsvg2-common,
  webp-pixbuf-loader,
  xdg-desktop-portal-gnome | xdg-desktop-portal-backend
diff --git a/debian/copyright b/debian/copyright
index 0e00f42..ec4a2e4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,15 @@ Copyright: 2009-2013 Yorba Foundation
            2013      Jens Bav
            2016-2019 Software Freedom Conservancy Inc.
            2011-2024 the shotwell authors
-License: LGPL-2.1
+License: LGPL-2.1+
+
+Files: test/server.py
+Copyright: 2017      Jens Georg <mail@jensge.org>
+License: Expat
+
+Files: src/faces/FaceDetect.vala
+Copyright: 2018      Narendra A (narendra_m_a(at)yahoo(dot)com)
+License: Expat
 
 Files: subprojects/shotwell-facedetect/*.xml
 Copyright: 2000      Intel Corporation
@@ -22,7 +30,7 @@ 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
+License: LGPL-2.1+
 
 Files: plugins/shotwell-publishing/PhotosPublisher.vala
        plugins/shotwell-publishing/PhotosService.vala
@@ -30,14 +38,14 @@ Files: plugins/shotwell-publishing/PhotosPublisher.vala
        plugins/shotwell-publishing/PhotosUploader.vala
 Copyright: 2016      Software Freedom Conservancy Inc.
            2019      Jens Georg <mail@jensge.org>
-License: LGPL-2.1
+License: LGPL-2.1+
 
 Files: debian/*
 Copyright: 2009-2011 Devid Antonio Filoni <d.filoni@ubuntu.com>
            2014-2024 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+
 
-License: LGPL-2.1
+License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
  License as published by the Free Software Foundation; either
@@ -73,6 +81,25 @@ 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: 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 without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 License: BSD-3-clause
  Redistribution and use in source and binary forms,
  with or without modification,
diff --git a/debian/files b/debian/files
index 3a3ffb3..b091e81 100644
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-shotwell_0.32.6-1_source.buildinfo gnome optional
+shotwell_0.32.6-2_source.buildinfo gnome optional