From 7e3b790e84768af53c7f803721524194ae1b0b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 5 Mar 2024 12:34:34 +0100 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4ed851..d025250 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -shotwell (0.32.6-1) UNRELEASED; urgency=medium +shotwell (0.32.6-1) unstable; urgency=medium * New upstream release (Closes: #1064455). - debian/shotwell.install: @@ -9,7 +9,7 @@ shotwell (0.32.6-1) UNRELEASED; urgency=medium * debian/control: - Add Build Depend python3-distutils. - -- Jörg Frings-Fürst Thu, 22 Feb 2024 17:33:13 +0100 + -- Jörg Frings-Fürst Tue, 05 Mar 2024 12:33:07 +0100 shotwell (0.32.4-1) unstable; urgency=medium -- cgit v1.2.3 From 2e26374e543231fa8ae8db35a892916b54d8685e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 5 Mar 2024 12:50:12 +0100 Subject: d/copyright: Fix syntax --- debian/copyright | 58 ++++++++++++++++++++++++++++---------------------------- debian/files | 1 + 2 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 debian/files diff --git a/debian/copyright b/debian/copyright index 19c8693..c87de6d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -73,32 +73,32 @@ License: GPL-2+ License can be found in the file `/usr/share/common-licenses/GPL-2'. License: Intel License Agreement -. -All rights reserved. -. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: -. -* Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. -. -* 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. -. -* The name of Intel Corporation may not be used to endorse or promote -products derived from this software without specific prior written -permission. -. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"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 INTEL OR -CONTRIBUTORS 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. + . + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + * 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. + . + * The name of Intel Corporation may not be used to endorse or promote + products derived from this software without specific prior written + permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "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 INTEL OR + CONTRIBUTORS 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. diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..3a3ffb3 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +shotwell_0.32.6-1_source.buildinfo gnome optional -- cgit v1.2.3 From 75333bcbe890ac2d693b6f85ba300b24517e68e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 5 Mar 2024 17:48:07 +0100 Subject: d/copyright: Change Intel License Agreement to BSD-3-clause --- debian/copyright | 65 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 35 insertions(+), 30 deletions(-) diff --git a/debian/copyright b/debian/copyright index c87de6d..fe99317 100644 --- a/debian/copyright +++ b/debian/copyright @@ -14,7 +14,7 @@ License: LGPL-2.1 Files: subprojects/shotwell-facedetect/*.xml Copyright: 2000 Intel Corporation -License: Intel License Agreement +License: BSD-3-Clause Files: subprojects/shotwell-facedetect/?pp Copyright: 2016 Software Freedom Conservancy Inc. @@ -72,33 +72,38 @@ 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: Intel License Agreement +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. . - All rights reserved. - . - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - . - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - . - * 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. - . - * The name of Intel Corporation may not be used to endorse or promote - products derived from this software without specific prior written - permission. - . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "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 INTEL OR - CONTRIBUTORS 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. + 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 -- cgit v1.2.3 From 9f5f2fc93781758d36ad299c2764cf97a9dc2c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 5 Mar 2024 17:52:39 +0100 Subject: d/copyright: fix typo --- debian/copyright | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index fe99317..eedf797 100644 --- a/debian/copyright +++ b/debian/copyright @@ -16,7 +16,8 @@ Files: subprojects/shotwell-facedetect/*.xml Copyright: 2000 Intel Corporation License: BSD-3-Clause -Files: subprojects/shotwell-facedetect/?pp +Files: subprojects/shotwell-facedetect/cpp + subprojects/shotwell-facedetect/hpp Copyright: 2016 Software Freedom Conservancy Inc. 2011 Valentín Barros Puertas 2018 Ricardo Fantin da Costa -- cgit v1.2.3 From dde66becd94817998e320c7ace72729af7455345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 5 Mar 2024 18:18:11 +0100 Subject: d/copyright: fix typo --- debian/copyright | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/copyright b/debian/copyright index eedf797..0e00f42 100644 --- a/debian/copyright +++ b/debian/copyright @@ -16,8 +16,8 @@ Files: subprojects/shotwell-facedetect/*.xml Copyright: 2000 Intel Corporation License: BSD-3-Clause -Files: subprojects/shotwell-facedetect/cpp - subprojects/shotwell-facedetect/hpp +Files: subprojects/shotwell-facedetect/*.cpp + subprojects/shotwell-facedetect/*.hpp Copyright: 2016 Software Freedom Conservancy Inc. 2011 Valentín Barros Puertas 2018 Ricardo Fantin da Costa -- cgit v1.2.3