Update to 3.0.1

debian/calamares.install

@@ -1,11 +0,0 @@
-#debian/calamares/usr usr
-
-#usr/bin/* usr/bin
-#usr/share/* usr/share
-#usr/lib/libcalamares.so
-#usr/include/libcalamares usr/include
-#usr/lib/calamares usr/lib
-#usr/lib/cmake usr/lib
-#usr/lib/libcalamares.so.2.*
-#usr/lib/libcalamaresui.so usr/lib
-#usr/lib/libcalamaresui.so.2.* usr/lib

debian/changelog

@@ -1,4 +1,4 @@
-calamares (2.4.5-1) unstable; urgency=low
+calamares (3.0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #842671)
 

debian/control

@@ -17,8 +17,8 @@ Build-Depends: cmake,
                libkf5parts-dev,
                libkf5service-dev,
                libkf5solid-dev,
-               libkpmcore3,
+               libkpmcore4,
-               libkpmcore3-dev,
+               libkpmcore4-dev,
                libparted-dev,
                libpolkit-qt5-1-dev,
                libqt5svg5-dev,

debian/lintian-overrides

@@ -0,0 +1,14 @@
+# These are hooks that is incorperated in initramfs and does not need to be executable by itself.
+calamares: script-not-executable usr/lib/calamares/modules/initramfscfg/encrypt_hook
+calamares: script-not-executable usr/lib/calamares/modules/initramfscfg/encrypt_hook_nokey
+
+# This is a false-alarm. This file does not contain licensing information,
+# instead, it's a configuration file for licence options in the installer.
+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.2.4.5 usr/lib/libcalamaresui.so
+calamares: non-dev-pkg-with-shlib-symlink usr/lib/libcalamares.so.2.4.5 usr/lib/libcalamares.so
+calamares: no-symbols-control-file usr/lib/libcalamaresui.so.2.4.5
+calamares: no-symbols-control-file usr/lib/libcalamares.so.2.4.5
+calamares: package-name-doesnt-match-sonames libcalamares2.4.5 libcalamaresui2.4.5

debian/patches/Build-wit-qtwebkit-instead-of-qwebengine

@@ -1,27 +0,0 @@
-Description: Build with qtwebkit instead of qwbengine
- Qwebengine bundles parts of the chromium web browser and might not be
- packaged for Debian any time soon. This patch makes Calamares use qtwebkit
- instead.
- .
- calamares (2.2.2-1) unstable; urgency=low
- .
-   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
-Author: Jonathan Carter <jcarter@linux.com>
-
----
-
-Origin: other
-Last-Update: 2016-05-16
-
-Index: calamares-2.4.5/CMakeLists.txt
-===================================================================
---- calamares-2.4.5.orig/CMakeLists.txt	2016-11-25 19:38:44.000000000 +0200
-+++ calamares-2.4.5/CMakeLists.txt	2016-12-07 13:54:10.000000000 +0200
-@@ -57,6 +57,7 @@
- 
- option( WITH_PYTHON "Enable Python modules support." ON )
- option( WITH_CRASHREPORTER "Build with CrashReporter" ON )
-+option ( WEBVIEW_FORCE_WEBKIT "Build with QtWebKit instead of QWebEngine" ON )
- 
- if( CMAKE_SYSTEM_PROCESSOR MATCHES "arm" OR NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libcrashreporter-qt/CMakeLists.txt" )
-     message( STATUS "Build of crashreporter disabled." )

debian/patches/fix-fdo-desktop-entry

@@ -1,20 +0,0 @@
-Description: fix fdo desktop entry
- Add "Keywords=calamares;system;installer" to .desktop file.
- This has been accepted upstream and will be in calamares 2.4.6.
- .
- calamares (2.4.5-1) unstable; urgency=low
- .
-   * Initial release (Closes: #842671)
-Author: Jonathan Carter <jcarter@linux.com>
-Bug-Debian: https://bugs.debian.org/842671
-
---- calamares-2.4.5.orig/calamares.desktop
-+++ calamares-2.4.5/calamares.desktop
-@@ -3,6 +3,7 @@ Type=Application
- Version=1.0
- Name=Calamares
- GenericName=System Installer
-+Keywords=calamares;system;installer
- TryExec=calamares
- Exec=pkexec /usr/bin/calamares
- Comment=Calamares — System Installer

debian/patches/fix-spelling-mistake

@@ -1,19 +0,0 @@
-Description: Fix spelling mistake
- s/emty/empty/g src/libcalamares/kdsingleapplicationguard/kdsingleapplicationguard.cpp
- This has been accepted upstream and will be in calamares 2.4.6.
- .
- calamares (2.4.5-1) unstable; urgency=low
-Author: Jonathan Carter <jcarter@linux.com>
-Bug-Debian: https://bugs.debian.org/842671
-
---- calamares-2.4.5.orig/src/libcalamares/kdsingleapplicationguard/kdsingleapplicationguard.cpp
-+++ calamares-2.4.5/src/libcalamares/kdsingleapplicationguard/kdsingleapplicationguard.cpp
-@@ -723,7 +723,7 @@ void KDSingleApplicationGuard::Private::
- 
-     const QString name = QCoreApplication::applicationName();
-     if ( name.isEmpty() ) {
--        qWarning( "KDSingleApplicationGuard: QCoreApplication::applicationName must not be emty" );
-+        qWarning( "KDSingleApplicationGuard: QCoreApplication::applicationName must not be empty" );
-         return;
-     }
- 

debian/patches/series

@@ -1,3 +1 @@
-Build-wit-qtwebkit-instead-of-qwebengine
+use-sudo-instead-of-pkexec
-fix-spelling-mistake
-fix-fdo-desktop-entry

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

@@ -0,0 +1,21 @@
+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
+@@ -5,7 +5,7 @@ Name=Calamares
+ GenericName=System Installer
+ Keywords=calamares;system;installer
+ TryExec=calamares
+-Exec=pkexec /usr/bin/calamares
++Exec=sudo /usr/bin/calamares
+ Comment=Calamares — System Installer
+ Icon=calamares
+ Terminal=false