From 0818c1fa153e54bbe928b1e6dc7782891bbc1aa1 Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Sat, 4 Feb 2017 11:46:56 +0200 Subject: [PATCH] Update to 3.0.1 --- debian/calamares.install | 11 -------- debian/changelog | 2 +- debian/control | 4 +-- debian/lintian-overrides | 14 ++++++++++ .../Build-wit-qtwebkit-instead-of-qwebengine | 27 ------------------- debian/patches/fix-fdo-desktop-entry | 20 -------------- debian/patches/fix-spelling-mistake | 19 ------------- debian/patches/series | 4 +-- debian/patches/use-sudo-instead-of-pkexec | 21 +++++++++++++++ 9 files changed, 39 insertions(+), 83 deletions(-) delete mode 100644 debian/calamares.install create mode 100644 debian/lintian-overrides delete mode 100644 debian/patches/Build-wit-qtwebkit-instead-of-qwebengine delete mode 100644 debian/patches/fix-fdo-desktop-entry delete mode 100644 debian/patches/fix-spelling-mistake create mode 100644 debian/patches/use-sudo-instead-of-pkexec diff --git a/debian/calamares.install b/debian/calamares.install deleted file mode 100644 index 5aa6775..0000000 --- a/debian/calamares.install +++ /dev/null @@ -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 diff --git a/debian/changelog b/debian/changelog index e57f151..2778269 100644 --- a/debian/changelog +++ b/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) diff --git a/debian/control b/debian/control index 347ad07..01b8411 100644 --- a/debian/control +++ b/debian/control @@ -17,8 +17,8 @@ Build-Depends: cmake, libkf5parts-dev, libkf5service-dev, libkf5solid-dev, - libkpmcore3, - libkpmcore3-dev, + libkpmcore4, + libkpmcore4-dev, libparted-dev, libpolkit-qt5-1-dev, libqt5svg5-dev, diff --git a/debian/lintian-overrides b/debian/lintian-overrides new file mode 100644 index 0000000..fef3e84 --- /dev/null +++ b/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 diff --git a/debian/patches/Build-wit-qtwebkit-instead-of-qwebengine b/debian/patches/Build-wit-qtwebkit-instead-of-qwebengine deleted file mode 100644 index 63b8f0a..0000000 --- a/debian/patches/Build-wit-qtwebkit-instead-of-qwebengine +++ /dev/null @@ -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) -Author: Jonathan Carter - ---- - -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." ) diff --git a/debian/patches/fix-fdo-desktop-entry b/debian/patches/fix-fdo-desktop-entry deleted file mode 100644 index 20f35fc..0000000 --- a/debian/patches/fix-fdo-desktop-entry +++ /dev/null @@ -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 -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 diff --git a/debian/patches/fix-spelling-mistake b/debian/patches/fix-spelling-mistake deleted file mode 100644 index 130ef3f..0000000 --- a/debian/patches/fix-spelling-mistake +++ /dev/null @@ -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 -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; - } - diff --git a/debian/patches/series b/debian/patches/series index 286af5a..4522ba4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -Build-wit-qtwebkit-instead-of-qwebengine -fix-spelling-mistake -fix-fdo-desktop-entry +use-sudo-instead-of-pkexec diff --git a/debian/patches/use-sudo-instead-of-pkexec b/debian/patches/use-sudo-instead-of-pkexec new file mode 100644 index 0000000..54a5ed7 --- /dev/null +++ b/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 +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