summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2024-03-24 09:24:56 +0100
committerJörg Frings-Fürst <debian@jff.email>2024-03-24 09:24:56 +0100
commitdff7a2179ea5f478955aca46ab8f08d218fa4ef1 (patch)
tree30038fff46b2fdf3fde9f20a538993cf2ed23fc8
parent7ff4b31eceee57dcf6911151828b3c24e30b11e2 (diff)
parent734fc45fc296a4b6cfa303329023c24e026f35df (diff)
Merge tag 'debian/0.36.6-1' into develop
Bugfix release
-rw-r--r--debian/changelog4
-rw-r--r--debian/copyright70
-rw-r--r--debian/files1
3 files changed, 41 insertions, 34 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 <debian@jff.email> Thu, 22 Feb 2024 17:33:13 +0100
+ -- Jörg Frings-Fürst <debian@jff.email> Tue, 05 Mar 2024 12:33:07 +0100
shotwell (0.32.4-1) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index 19c8693..0e00f42 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,9 +14,10 @@ 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
+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>
@@ -72,33 +73,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
-.
-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.
+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
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