New upstream release, copyright updates, minor fixes

debian/calamares.1

@@ -30,4 +30,4 @@ Please report any bugs to https://calamares.io/bugs
 .B calamares
 is written by Teo Mrnjavac <teo@kde.org>
 .LP
-This man page is written by Jonathan Carter <jcarter@linux.com>
+This man page is written by Jonathan Carter <jcc@debian.org>

debian/changelog

@@ -1,5 +1,20 @@
+calamares (3.1.5-1) unstable; urgency=medium
+
+  * New upstream release
+  * debian/copyright:
+     - Update copyright years for Christian Muehlhaeuser
+     - Add new copyright information for Schutz Sacha
+     - Add new copyright information for Gabriel Craciunescu
+     - Add copyright information for new files:
+       src/libcalamaresui/widgets/waitingspinnerwidget.*
+     - Update license information for files:
+       src/qml/calamares/slideshow/*qml
+  * Update architecture to linux-any
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 27 Sep 2017 08:46:01 +0200
+
 calamares (3.1.3-1) unstable; urgency=low
 
   * Initial release (Closes: #842671)
 
- -- Jonathan Carter <jcarter@linux.com>  Tue, 18 Jul 2017 14:38:15 +0200
+ -- Jonathan Carter <jcc@debian.org>  Tue, 18 Jul 2017 14:38:15 +0200

debian/control

@@ -1,7 +1,7 @@
 Source: calamares
 Section: utils
 Priority: optional
-Maintainer: Jonathan Carter <jcarter@linux.com>
+Maintainer: Jonathan Carter <jcc@debian.org>
 Build-Depends: cmake,
                cryptsetup,
                debhelper (>= 10),
@@ -17,8 +17,7 @@ Build-Depends: cmake,
                libkf5parts-dev,
                libkf5service-dev,
                libkf5solid-dev,
-               libkpmcore4,
+               libkpmcore-dev,
-               libkpmcore4-dev,
                libparted-dev,
                libpolkit-qt5-1-dev,
                libpythonqt-dev,
@@ -38,14 +37,14 @@ Build-Depends: cmake,
                qtdeclarative5-dev,
                qttools5-dev,
                qttools5-dev-tools
-Standards-Version: 3.9.8
+Standards-Version: 4.1.0
 Homepage: https://github.com/calamares/calamares
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-extras/calamares.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/kde-extras/calamares.git
 
 Package: calamares
-Architecture: any
+Architecture: linux-any
-Depends: libkpmcore4, os-prober, ${misc:Depends}, ${shlibs:Depends}
+Depends: libkpmcore5, os-prober, ${misc:Depends}, ${shlibs:Depends}
 Recommends: squashfs-tools
 Description: distribution-independent installer framework
  Calamares is a distribution-independent installer framework.

debian/copyright

@@ -3,33 +3,81 @@ Upstream-Name: calamares
 Source: https://github.com/calamares/calamares
 
 Files: *
-Copyright: 2014-2016, Teo Mrnjavac <teo@kde.org>
+Copyright: 2017, Adriaan de Groot <groot@kde.org>
-           2014, Aurélien Gâteau <agateau@kde.org>
+           2017, Alf Gaida <agaida@siduction.org>
-           2014, Rohan Garg <rohan@kde.org>
+	   2017, Kyle Robbertze <krobbertze@gmail.com>
-           2006, Alexander Neundorf, <neundorf@kde.org>
+           2017, Gabriel Craciunescu <crazy@frugalware.org>
-	   2006, Allen Winter, <winter@kde.org>
+	   2016, Artoo <artoo@manjaro.org>
-	   2009, Sebastian Trueg, <trueg@kde.org>
-	   2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
 	   2016, Luca Giambonini <almack@chakraos.org>
 	   2016, Lisa Vitolo <shainer@chakraos.org>
-	   2014, Philip Müller <philm@manjaro.org>
+           2016, David McKinney <mckinney@subgraph.com>
-	   2011, Nikita Krupen'ko <krnekit@gmail.com>
+	   2016, Andrius Štikonas <andrius@stikonas.eu>
-	   2011 Kitware, Inc.
+	   2015, Sacha Schutz <sacha@labsquare.org>
-	   2008,2010,2011, by Volker Lanz
 	   2015, Anke Boersma <demm@kaosx.us>
+	   2015, Alexandre Arnt <qtgzmanager@gmail.com>
+	   2014-2016, Kevin Kofler <kevin.kofler@chello.at>
+           2014-2016, Teo Mrnjavac <teo@kde.org>
+	   2014-2015, Philip Müller <philm@manjaro.org>
+           2014-2015, Rohan Garg <rohan@kde.org>
+	   2014, Schutz Sacha <sacha@labsquare.org>
+           2014, Aurélien Gâteau <agateau@kde.org>
+	   2014, Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
 	   2014, Daniel Hillenbrand <codeworkx@bbqlinux.org>
 	   2014, Benjamin Vaudour <benjamin.vaudour@yahoo.fr>
-	   2014, Kevin Kofler <kevin.kofler@chello.at>
+	   2013, Kay Sievers
+	   2012, Digia Plc and/or its subsidiary(-ies)
+           2011, Lennart Poettering
+	   2011, Nikita Krupen'ko <krnekit@gmail.com>
+	   2011, Kitware, Inc.
+	   2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
+	   2010-2012, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+	   2010-2011, Leo Franchi <lfranchi@kde.org>
+	   2009, Sebastian Trueg, <trueg@kde.org>
+	   2008-2011, by Volker Lanz
 	   2007, Matthias Kretz <kretz@kde.org>i
 	   2007, Bernhard Loos <nhuh.put@web.de>
-	   2010-2011, Christian Muehlhaeuser <muesli@tomahawk-player.org>
+	   2007, Free Software Foundation, Inc. <http:fsf.org/>
-	   2010-2011, Leo Franchi <lfranchi@kde.org>
-	   2010-2012, Jeff Mitchell <jeff@tomahawk-player.org>
-	   1999, Ian Zepp (icszepp@islc.net)
 	   2006, by Dominic Battre <dominic@battre.de>
 	   2006, by Martin Pool <mbp@canonical.com>
+	   2006, Allen Winter, <winter@kde.org>
+	   1999, Ian Zepp (icszepp@islc.net)
 License: GPL-3+
 
+Files: src/qml/calamares/slideshow/*qml
+Copyright: 2017, Adriaan de Groot <groot@kde.org>
+           2016 The Qt Company Ltd
+	   2012 Digia Plc and/or its subsidiary(-ies)
+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
+ version 2 of the License, or (at your option) any later version.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License can be found in /usr/share/common-licenses/LGPL-2.1.
+
+Files: src/libcalamaresui/widgets/waitingspinnerwidget.*
+Copyright:  2012-2014 Alexander Turkin
+            2014 by William Hallatt
+            2015 by Jacob Dawid
+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.
+
 Files: src/libcalamares/kdsingleapplicationguard/*
 Copyright: 2001-2010 Klaralvdalens Datakonsult AB
 License: LGPL-2
@@ -50,7 +98,7 @@ License: LGPL-2
 
 Files: debian/*
 Copyright: 2014 Rohan Garg <rohan@kde.org>
-           2016 Jonathan Carter <jcarter@linux.com>
+           2016-2017 Jonathan Carter <jcc@debian.org>
 License: GPL-3+
 
 License: GPL-3+
@@ -70,3 +118,4 @@ License: GPL-3+
  On Debian systems the full text of the GNU General Public License
  version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
+

debian/lintian-overrides

@@ -7,11 +7,11 @@ calamares: script-not-executable usr/lib/calamares/modules/initramfscfg/encrypt_
 calamares: extra-license-file usr/share/calamares/modules/license.conf
 
 # Private libraries, so no -dev packages or symbol files
-calamares: non-dev-pkg-with-shlib-symlink usr/lib/libcalamaresui.so.3.1.0 usr/lib/libcalamaresui.so
+calamares: non-dev-pkg-with-shlib-symlink usr/lib/libcalamaresui.so.3.1.5 usr/lib/libcalamaresui.so
-calamares: non-dev-pkg-with-shlib-symlink usr/lib/libcalamares.so.3.1.0 usr/lib/libcalamares.so
+calamares: non-dev-pkg-with-shlib-symlink usr/lib/libcalamares.so.3.1.5 usr/lib/libcalamares.so
-calamares: no-symbols-control-file usr/lib/libcalamaresui.so.3.1.0
+calamares: no-symbols-control-file usr/lib/libcalamaresui.so.3.1.5
-calamares: no-symbols-control-file usr/lib/libcalamares.so.3.1.0
+calamares: no-symbols-control-file usr/lib/libcalamares.so.3.1.5
-calamares: package-name-doesnt-match-sonames libcalamares3.1.0 libcalamaresui3.1.0
+calamares: package-name-doesnt-match-sonames libcalamares3.1.5 libcalamaresui3.1.5
 
 # Debian live media relies on sudo so this message isn't needed
 calamares: desktop-command-not-in-package usr/share/applications/calamares.desktop sudo

debian/patches/use-sudo-instead-of-pkexec

@@ -1,12 +1,6 @@
 Description: Use sudo instead of pkexec
  pkexec breaks window detection and causes calamares to not start under GNOME.
  Using sudo works fine and fixes above issues.
- .
- calamares (3.0.1-1) unstable; urgency=low
- .
-   * Initial release (Closes: #842671)
-Author: Jonathan Carter <jcarter@linux.com>
-Bug-Debian: https://bugs.debian.org/842671
 
 --- calamares-3.0.1.orig/calamares.desktop
 +++ calamares-3.0.1/calamares.desktop