diff --git a/debian/calamares.1 b/debian/calamares.1 index 87ade04..ef6c0cb 100644 --- a/debian/calamares.1 +++ b/debian/calamares.1 @@ -30,4 +30,4 @@ Please report any bugs to https://calamares.io/bugs .B calamares is written by Teo Mrnjavac .LP -This man page is written by Jonathan Carter +This man page is written by Jonathan Carter diff --git a/debian/changelog b/debian/changelog index 9b97840..e8f5835 100644 --- a/debian/changelog +++ b/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 Wed, 27 Sep 2017 08:46:01 +0200 + calamares (3.1.3-1) unstable; urgency=low * Initial release (Closes: #842671) - -- Jonathan Carter Tue, 18 Jul 2017 14:38:15 +0200 + -- Jonathan Carter Tue, 18 Jul 2017 14:38:15 +0200 diff --git a/debian/control b/debian/control index 23f708f..e571644 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: calamares Section: utils Priority: optional -Maintainer: Jonathan Carter +Maintainer: Jonathan Carter Build-Depends: cmake, cryptsetup, debhelper (>= 10), @@ -17,8 +17,7 @@ Build-Depends: cmake, libkf5parts-dev, libkf5service-dev, libkf5solid-dev, - libkpmcore4, - libkpmcore4-dev, + libkpmcore-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 -Depends: libkpmcore4, os-prober, ${misc:Depends}, ${shlibs:Depends} +Architecture: linux-any +Depends: libkpmcore5, os-prober, ${misc:Depends}, ${shlibs:Depends} Recommends: squashfs-tools Description: distribution-independent installer framework Calamares is a distribution-independent installer framework. diff --git a/debian/copyright b/debian/copyright index c31d233..ef2bc40 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,33 +3,81 @@ Upstream-Name: calamares Source: https://github.com/calamares/calamares Files: * -Copyright: 2014-2016, Teo Mrnjavac - 2014, Aurélien Gâteau - 2014, Rohan Garg - 2006, Alexander Neundorf, - 2006, Allen Winter, - 2009, Sebastian Trueg, - 2010-2011, Christian Muehlhaeuser +Copyright: 2017, Adriaan de Groot + 2017, Alf Gaida + 2017, Kyle Robbertze + 2017, Gabriel Craciunescu + 2016, Artoo 2016, Luca Giambonini 2016, Lisa Vitolo - 2014, Philip Müller - 2011, Nikita Krupen'ko - 2011 Kitware, Inc. - 2008,2010,2011, by Volker Lanz + 2016, David McKinney + 2016, Andrius Štikonas + 2015, Sacha Schutz 2015, Anke Boersma + 2015, Alexandre Arnt + 2014-2016, Kevin Kofler + 2014-2016, Teo Mrnjavac + 2014-2015, Philip Müller + 2014-2015, Rohan Garg + 2014, Schutz Sacha + 2014, Aurélien Gâteau + 2014, Pier Luigi Fiorini 2014, Daniel Hillenbrand 2014, Benjamin Vaudour - 2014, Kevin Kofler + 2013, Kay Sievers + 2012, Digia Plc and/or its subsidiary(-ies) + 2011, Lennart Poettering + 2011, Nikita Krupen'ko + 2011, Kitware, Inc. + 2010-2012, Jeff Mitchell + 2010-2012, Christian Muehlhaeuser + 2010-2011, Leo Franchi + 2009, Sebastian Trueg, + 2008-2011, by Volker Lanz 2007, Matthias Kretz i 2007, Bernhard Loos - 2010-2011, Christian Muehlhaeuser - 2010-2011, Leo Franchi - 2010-2012, Jeff Mitchell - 1999, Ian Zepp (icszepp@islc.net) + 2007, Free Software Foundation, Inc. 2006, by Dominic Battre 2006, by Martin Pool + 2006, Allen Winter, + 1999, Ian Zepp (icszepp@islc.net) License: GPL-3+ +Files: src/qml/calamares/slideshow/*qml +Copyright: 2017, Adriaan de Groot + 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 - 2016 Jonathan Carter + 2016-2017 Jonathan Carter 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'. + diff --git a/debian/lintian-overrides b/debian/lintian-overrides index bd3d990..4b20b52 100644 --- a/debian/lintian-overrides +++ b/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/libcalamares.so.3.1.0 usr/lib/libcalamares.so -calamares: no-symbols-control-file usr/lib/libcalamaresui.so.3.1.0 -calamares: no-symbols-control-file usr/lib/libcalamares.so.3.1.0 -calamares: package-name-doesnt-match-sonames libcalamares3.1.0 libcalamaresui3.1.0 +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.5 usr/lib/libcalamares.so +calamares: no-symbols-control-file usr/lib/libcalamaresui.so.3.1.5 +calamares: no-symbols-control-file usr/lib/libcalamares.so.3.1.5 +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 diff --git a/debian/patches/use-sudo-instead-of-pkexec b/debian/patches/use-sudo-instead-of-pkexec index 54a5ed7..68117d6 100644 --- a/debian/patches/use-sudo-instead-of-pkexec +++ b/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 -Bug-Debian: https://bugs.debian.org/842671 --- calamares-3.0.1.orig/calamares.desktop +++ calamares-3.0.1/calamares.desktop