Commit recent changes

ubuntu/cosmic
Jonathan Carter 7 years ago
parent 31a89e912f
commit 6a3fbb906c

24
.gitignore vendored

@ -46,27 +46,3 @@ CMakeLists.txt.user
# Backup files # Backup files
*~ *~
.gitmodules
AUTHORS
CMakeLists.txt
CMakeModules/
CalamaresAddBrandingSubdirectory.cmake
CalamaresAddLibrary.cmake
CalamaresAddModuleSubdirectory.cmake
CalamaresAddPlugin.cmake
CalamaresBuildTreeSettings.cmake.in
CalamaresConfig.cmake.in
CalamaresConfigVersion.cmake.in
CalamaresUse.cmake.in
LICENSE
README.md
calamares.desktop
ci/
cmake_uninstall.cmake.in
com.github.calamares.calamares.policy
data/
lang/
settings.conf
src/
thirdparty/

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

@ -1,5 +1,5 @@
Description: Use sudo instead of pkexec Description: Use sudo instead of pkexec
pkexec breaks window detection and causes calamares to not start under GNOME. Using pkexec breaks window detection and causes calamares to not start under GNOME.
Using sudo works fine and fixes above issues. Using sudo works fine and fixes above issues.
--- calamares-3.0.1.orig/calamares.desktop --- calamares-3.0.1.orig/calamares.desktop

Loading…
Cancel
Save