Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for performing operations on LVM logical volumes. #828

Merged
merged 109 commits into from Dec 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
d01a35e
Missing import; thanks to crazy on IRC
adriaandegroot Oct 3, 2017
e9e2f2e
[core] Automatic merge of Transifex translations
adriaandegroot Oct 3, 2017
7fbb68c
[desktop] Automatic merge of Transifex translations
adriaandegroot Oct 3, 2017
1eaeb60
[dummypythonqt] Automatic merge of Transifex translations
adriaandegroot Oct 3, 2017
6f24217
[python] Automatic merge of Transifex translations
adriaandegroot Oct 3, 2017
8d341ed
use orphaned Branding::ProductLogo as sidebar image
bill-auger Oct 3, 2017
b1bae41
Missing import; thanks to crazy on IRC
adriaandegroot Oct 3, 2017
7adb963
Merge pull request #826 from bill-auger/master
adriaandegroot Oct 4, 2017
1491a02
Documentation for the branding variables
adriaandegroot Oct 4, 2017
30e56e1
finished: use generic shutdown command
abucodonosor Oct 4, 2017
b47c8a7
Merge pull request #827 from abucodonosor/finished
adriaandegroot Oct 4, 2017
8599c28
Document finished.conf some more
adriaandegroot Oct 4, 2017
27e9852
CMake: be more descriptive about squashfs
adriaandegroot Oct 4, 2017
4912d8a
Fix create partition job to work with LVM devices.
stikonas Oct 6, 2017
7803163
Correct for distortion of globe.
adriaandegroot Oct 9, 2017
8135aa9
finished: fix configuration file syntax
abucodonosor Oct 11, 2017
28edfef
Merge pull request #830 from abucodonosor/bug-829
philmmanjaro Oct 12, 2017
c10d747
finished: fix configuration file syntax
abucodonosor Oct 11, 2017
00fa7bf
Code-formatting, add copyright notice
adriaandegroot Oct 12, 2017
8b76b86
Code-formatting, add (unused for now) overload of getLocationPosition()
adriaandegroot Oct 12, 2017
b805a8d
CMake: minor docs, typo's
adriaandegroot Oct 12, 2017
e920512
Testing: add test to check the shipped config-files for correctness.
adriaandegroot Oct 12, 2017
6000cba
Testing: test each module's config files
adriaandegroot Oct 12, 2017
c6c6c2f
Testing: refactor so that C++ and Python modules all get yaml-config …
adriaandegroot Oct 12, 2017
9f84519
Merge branch '3.1.x-stable'
adriaandegroot Oct 12, 2017
7057354
Use KPMcore NewOperation to create partitions.
stikonas Oct 12, 2017
ceba157
Use KPMcore DeleteOperation to delete partitions.
stikonas Oct 12, 2017
173f4ab
Update release-procedures
adriaandegroot Oct 13, 2017
a776f9a
[core] Automatic merge of Transifex translations
adriaandegroot Oct 13, 2017
8424e6e
[python] Automatic merge of Transifex translations
adriaandegroot Oct 13, 2017
aabcd6b
Bump version
adriaandegroot Oct 13, 2017
bdf8c18
use private env var for travis IRC notify channel
bill-auger Oct 16, 2017
38c3f8b
Clarify defaultFileSystem documentation.
stikonas Oct 20, 2017
5db8a8f
Testing: refactor python-test tool to allow independent use.
adriaandegroot Oct 23, 2017
acd2d9f
Testing: be more verbose about what files are loaded.
adriaandegroot Oct 23, 2017
b372337
Merge pull request #838 from stikonas/master
adriaandegroot Oct 23, 2017
e7c51aa
Document defaultFileSystemType
adriaandegroot Oct 23, 2017
174fa98
Documentation: minor polishing on netinstall
adriaandegroot Oct 23, 2017
9acc9d8
Merge pull request #835 from bill-auger/master
adriaandegroot Oct 23, 2017
286305a
Travis: fix up weird language setting
adriaandegroot Oct 23, 2017
1969cde
[core] Automatic merge of Transifex translations
adriaandegroot Oct 23, 2017
12dfe51
[desktop] Automatic merge of Transifex translations
adriaandegroot Oct 23, 2017
4314f2c
Netinstall: fix datatype passed to packages module
adriaandegroot Oct 23, 2017
5841466
Netinstall: optimize structure for packages
adriaandegroot Oct 23, 2017
36a711c
Netinstall: fix misleading message (thanks to @abucodonosor)
adriaandegroot Oct 23, 2017
9b5772c
Keyboard: warn about missing ckbcomp, thanks @abucodonosor
adriaandegroot Oct 23, 2017
c15db95
Merge branch '3.1.x-stable' (netinstall fixes)
adriaandegroot Oct 23, 2017
10ede79
[bootloader] use generic file names instead of grub
philmmanjaro Oct 23, 2017
df84208
[bootloader] use generic file names instead of grub
philmmanjaro Oct 23, 2017
e37460d
[ci] Revert bdf8c18126, can't use env-vars in notification step
adriaandegroot Oct 23, 2017
41f1789
[packages] Document run_operations() some more
adriaandegroot Oct 23, 2017
e6e1e22
[netinstall] logging about the number of packages to process
adriaandegroot Oct 23, 2017
a64e6ef
Bump version number
adriaandegroot Oct 24, 2017
055d416
Merge branch '3.1.x-stable'
adriaandegroot Oct 24, 2017
5e101bc
Document KPMCore versions that make sense
adriaandegroot Oct 24, 2017
ad2edf4
Linking: Reduce library dependencies in welcome module
adriaandegroot Oct 24, 2017
fe0cb88
Linking: be a little more relaxed in linking to dependent libs
adriaandegroot Oct 24, 2017
ebb0331
CMake: remove unused module
adriaandegroot Oct 24, 2017
d179a9e
Tidied up bitness check
crispg72 Oct 24, 2017
9985824
CI: Replace Jenkins-oriented scripts with Travis-oriented ones
adriaandegroot Oct 25, 2017
a7ed314
CI: try to work around build timeouts
adriaandegroot Oct 25, 2017
3b30bbd
Bump version number, pretending 3.1.8-rc1 is pending
adriaandegroot Oct 25, 2017
c2c2793
[branding] correct documentation of productIcon sizes
adriaandegroot Oct 25, 2017
cc6db5b
pep8
Bezzy1999 Oct 25, 2017
17fb91c
added my name
Bezzy1999 Oct 25, 2017
05a766c
CI: bump timeout some more, against all logic
adriaandegroot Oct 25, 2017
2aa5a14
Merge pull request #843 from Bezzy1999/cleanup-bitness
adriaandegroot Oct 26, 2017
274025d
Fix reported partition size.
stikonas Oct 27, 2017
951e5ad
Merge pull request #845 from stikonas/3.1.x-stable
adriaandegroot Oct 27, 2017
a3ab82f
CI: drop silly workarounds now service is restored.
adriaandegroot Oct 27, 2017
ff3a403
CI: defer to Travis driver script
adriaandegroot Oct 27, 2017
fb1522f
Use KPMcore Resize Operation.
stikonas Oct 27, 2017
d2ea83a
NetInstallPage.cpp: fix displaying for Name and Description
abucodonosor Oct 28, 2017
b15d970
[bootloader] fix regression introduced with d179a9e
philmmanjaro Oct 28, 2017
a138eb5
Coverity: fix issues reported in QJsonModel
adriaandegroot Oct 30, 2017
e09f179
Coverity: repair previous commit
adriaandegroot Oct 30, 2017
12f4104
Merge pull request #850 from abucodonosor/3.1.x-stable
adriaandegroot Oct 30, 2017
a179c6c
Merge pull request #846 from stikonas/3.1.x-stable
adriaandegroot Oct 30, 2017
5474dc6
[partition] allow KPMcore 3.0.2 (with warning)
adriaandegroot Oct 30, 2017
4ea8b2e
CMake: report on the example-distro feature correctly
adriaandegroot Oct 30, 2017
2e80ab9
locale.conf: explain what all the settings are about
abucodonosor Oct 30, 2017
fc53438
locale.conf: fix localeGenPath comment
abucodonosor Oct 30, 2017
71da7b3
RequirementsChecker.cpp: rearrange cDebug() output
abucodonosor Oct 30, 2017
3749beb
modules/users: warn when fallback groups is used
abucodonosor Oct 30, 2017
599f9d4
users.conf: document some things
abucodonosor Oct 30, 2017
370279c
Merge pull request #853 from abucodonosor/debug
adriaandegroot Oct 31, 2017
b303acf
Merge branch '3.1.x-stable'
adriaandegroot Oct 31, 2017
477a985
users.conf: made requested changes
abucodonosor Oct 31, 2017
d2c91de
add kate temp files to gitignore
bill-auger Oct 28, 2017
e94543e
Merge pull request #855 from bill-auger/master
adriaandegroot Nov 1, 2017
1456375
Merge pull request #854 from abucodonosor/modules
adriaandegroot Nov 1, 2017
35f5612
[locale] Fix GeoIP (reported by demm, crazy)
adriaandegroot Nov 1, 2017
30d08f3
Merge pull request #852 from abucodonosor/docs
adriaandegroot Nov 1, 2017
eed207a
CMake: ensure configuration-test can #include yamlcpp headers
adriaandegroot Nov 2, 2017
2d31e98
[libcalamaresui] Unrelated typedef for JobList
adriaandegroot Nov 3, 2017
f3eb557
[libcalamares] Provide some convenience functions for extracting conf…
adriaandegroot Nov 3, 2017
970b6fc
CMake: find PythonQt better
adriaandegroot Nov 3, 2017
ee0b3b8
[netinstall] Improve 'next' button handling
adriaandegroot Nov 6, 2017
f424af3
[netinstall] Avoid crash when do groups are available
adriaandegroot Nov 6, 2017
91e949f
[netinstall] Apply Calamares C++ style
adriaandegroot Nov 6, 2017
51c74c6
[netinstall] Convenience typedefs
adriaandegroot Nov 6, 2017
62c03d6
Merge branch '3.1.x-stable'
adriaandegroot Nov 6, 2017
fda4b4e
CMake: improve searching for PythonQt
adriaandegroot Nov 6, 2017
b5f2f22
Documentation: update HACKING
adriaandegroot Nov 6, 2017
ac14e8a
Documentation: update AUTHORS
adriaandegroot Nov 6, 2017
1620f6a
Merge branch 'master' into lvm2
stikonas Nov 11, 2017
652ffae
Remove unnecessary kpmcore includes.
stikonas Nov 11, 2017
2a785bd
Disable newPartitionTableButton for LVM device.
tctara Sep 5, 2016
a2e3af2
Require KPMcore 3.3
stikonas Dec 15, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -46,3 +46,6 @@ CMakeLists.txt.user

# Backup files
*~

# Kate
*.kate-swp
6 changes: 2 additions & 4 deletions .travis.yml
@@ -1,6 +1,4 @@
language:
- cpp
- python
language: cpp

python:
- 3.5
Expand All @@ -18,5 +16,5 @@ install:
- docker build -t calamares .

script:
- docker run -v $PWD:/src --tmpfs /build:rw,size=65536k calamares bash -lc "cd /build && cmake -DWEBVIEW_FORCE_WEBKIT=1 -DKDE_INSTALL_USE_QT_SYS_PATHS=ON /src && make -j2 && make install DESTDIR=/build/INSTALL_ROOT"
- docker run -v $PWD:/src --tmpfs /build:rw,size=65536k -e SRCDIR=/src -e BUILDDIR=/build calamares "/src/ci/travis.sh"

26 changes: 24 additions & 2 deletions AUTHORS
@@ -1,2 +1,24 @@
Teo Mrnjavac <teo@kde.org>
Adriaan de Groot <groot@kde.org>
# MAINTAINER

Teo Mrnjavac <teo@kde.org> (maintainer -2017)
Adriaan de Groot <groot@kde.org> (maintainer 2017-)

# CONTRIBUTORS

Alf Gaida
Allen Welkie
Andrius Štikonas
Bernhard Landauer
Bezzy1999
bill-auger
crispg72
demmm
Gabriel Craciunescu
Kai Dohmen
Kevin Kofler
Kyle Robertze
Lisa Vitolo
n3rdopolis
Philip Müller
Ramon Buldó
Rohan Garg
17 changes: 8 additions & 9 deletions CMakeLists.txt
Expand Up @@ -50,7 +50,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )

# Clang warnings: doing *everything* is counter-productive, since it warns
# about things which we can't fix (e.g. C++98 incompatibilities, but
# Calaares is C++14).
# Calamares is C++14).
foreach( CLANG_WARNINGS
-Weverything
-Wno-c++98-compat
Expand Down Expand Up @@ -88,6 +88,8 @@ else()
set( SUPPRESS_BOOST_WARNINGS "" )
endif()

# Use mark_thirdparty_code() to reduce warnings from the compiler
# on code that we're not going to fix. Call this with a list of files.
macro(mark_thirdparty_code)
set_source_files_properties( ${ARGV}
PROPERTIES
Expand Down Expand Up @@ -164,8 +166,8 @@ set( CALAMARES_TRANSLATION_LANGUAGES ar ast bg ca cs_CZ da de el en en_GB es_MX
### Bump version here
set( CALAMARES_VERSION_MAJOR 3 )
set( CALAMARES_VERSION_MINOR 1 )
set( CALAMARES_VERSION_PATCH 5 )
set( CALAMARES_VERSION_RC 0 )
set( CALAMARES_VERSION_PATCH 8 )
set( CALAMARES_VERSION_RC 1 )

set( CALAMARES_VERSION ${CALAMARES_VERSION_MAJOR}.${CALAMARES_VERSION_MINOR}.${CALAMARES_VERSION_PATCH} )
set( CALAMARES_VERSION_SHORT "${CALAMARES_VERSION}" )
Expand Down Expand Up @@ -265,12 +267,9 @@ else()
endif()
# Doesn't list mksquashfs as an optional dep, though, because it
# hasn't been sent through the find_package() scheme.
set_package_properties( mksquashfs PROPERTIES
DESCRIPTION "Create squashed filesystems"
URL "http://tldp.org/HOWTO/SquashFS-HOWTO/creatingandusing.html"
PURPOSE "Create example distro"
TYPE OPTIONAL
)
#
# "http://tldp.org/HOWTO/SquashFS-HOWTO/creatingandusing.html"
add_feature_info( ExampleDistro ${mksquashfs_FOUND} "Create example-distro target.")

# add_subdirectory( thirdparty )
add_subdirectory( src )
Expand Down
21 changes: 19 additions & 2 deletions CMakeModules/CalamaresAddModuleSubdirectory.cmake
Expand Up @@ -6,9 +6,12 @@ set( MODULE_DATA_DESTINATION share/calamares/modules )
function( calamares_add_module_subdirectory )
set( SUBDIRECTORY ${ARGV0} )

set( MODULE_CONFIG_FILES "" )

# If this subdirectory has a CMakeLists.txt, we add_subdirectory it...
if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt" )
add_subdirectory( ${SUBDIRECTORY} )
file( GLOB MODULE_CONFIG_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY} "${SUBDIRECTORY}/*.conf" )
# ...otherwise, we look for a module.desc.
elseif( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/module.desc" )
set( MODULES_DIR ${CMAKE_INSTALL_LIBDIR}/calamares/modules )
Expand Down Expand Up @@ -39,7 +42,7 @@ function( calamares_add_module_subdirectory )
# message( " ${Green}FILES:${ColorReset} ${MODULE_FILES}" )
message( " ${Green}MODULE_DESTINATION:${ColorReset} ${MODULE_DESTINATION}" )
if( MODULE_CONFIG_FILES )
if (INSTALL_CONFIG)
if ( INSTALL_CONFIG )
message( " ${Green}CONFIGURATION_FILES:${ColorReset} ${MODULE_CONFIG_FILES} => ${MODULE_DATA_DESTINATION}" )
else()
message( " ${Green}CONFIGURATION_FILES:${ColorReset} ${MODULE_CONFIG_FILES} => [Skipping installation]" )
Expand All @@ -56,9 +59,23 @@ function( calamares_add_module_subdirectory )
RENAME calamares-${SUBDIRECTORY}.mo
)
endif()

else()
message( "-- ${BoldYellow}Warning:${ColorReset} tried to add module subdirectory ${BoldRed}${SUBDIRECTORY}${ColorReset} which has no CMakeLists.txt or module.desc." )
message( "" )
endif()

# Check any config files for basic correctness
if ( BUILD_TESTING AND MODULE_CONFIG_FILES )
set( _count 0 )
foreach( _config_file ${MODULE_CONFIG_FILES} )
set( _count_str "-${_count}" )
if ( _count EQUAL 0 )
set( _count_str "" )
endif()
add_test(
NAME config-${SUBDIRECTORY}${_count_str}
COMMAND test_conf ${CMAKE_CURRENT_BINARY_DIR}/${SUBDIRECTORY}/${_config_file} )
math( EXPR _count "${_count} + 1" )
endforeach()
endif()
endfunction()
85 changes: 75 additions & 10 deletions CMakeModules/FindPythonQt.cmake
Expand Up @@ -9,6 +9,20 @@ if(NOT PYTHONLIBS_FOUND)
message(FATAL_ERROR "error: Python is required to build PythonQt")
endif()

# Cut X.Y[.Z] down to just X.Y
string(REGEX REPLACE
"^([0-9][0-9]*)\.([0-9][0-9]*)"
"\\1.\\2@"
_PYTHONLIBS_MAJMIN
${PYTHONLIBS_VERSION_STRING}
)
string(REGEX REPLACE
"@.*"
""
PYTHONLIBS_MAJMIN
${_PYTHONLIBS_MAJMIN}
)

if(NOT EXISTS "${PYTHONQT_INSTALL_DIR}")
find_path(PYTHONQT_INSTALL_DIR include/PythonQt/PythonQt.h DOC "Directory where PythonQt was installed.")
endif()
Expand All @@ -22,17 +36,58 @@ find_path(PYTHONQT_INCLUDE_DIR PythonQt.h
"${PYTHONQT_INSTALL_DIR}/src"
DOC "Path to the PythonQt include directory")

# Minimum v3.1 is needed
find_library(PYTHONQT_LIBRARY_RELEASE PythonQt PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
find_library(PYTHONQT_LIBRARY_DEBUG NAMES PythonQt${CTK_CMAKE_DEBUG_POSTFIX} PythonQt${CMAKE_DEBUG_POSTFIX} PythonQt PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
find_library(PYTHONQT_QTALL_LIBRARY_RELEASE PythonQt_QtAll PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
find_library(PYTHONQT_QTALL_LIBRARY_DEBUG NAMES PythonQt_QtAll${CTK_CMAKE_DEBUG_POSTFIX} PythonQt_QtAll${CMAKE_DEBUG_POSTFIX} PythonQt_QtAll PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
if ( NOT PythonQt_FIND_QUIETLY )
message( STATUS "Searching for PythonQt (PythonLibs ${PYTHONLIBS_MAJMIN}) .." )
if ( PYTHONQT_INCLUDE_DIR )
message( STATUS " .. found include ${PYTHONQT_INCLUDE_DIR}" )
endif()
endif()

# Also check for v3.2+
find_library(PYTHONQT_LIBRARY_RELEASE PythonQt-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
find_library(PYTHONQT_LIBRARY_DEBUG NAMES PythonQt-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX} PythonQt-Qt5-Python3${CMAKE_DEBUG_POSTFIX} PythonQt-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "The PythonQt library.")
find_library(PYTHONQT_QTALL_LIBRARY_RELEASE PythonQt_QtAll-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
find_library(PYTHONQT_QTALL_LIBRARY_DEBUG NAMES PythonQt_QtAll-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX} PythonQt_QtAll-Qt5-Python3${CMAKE_DEBUG_POSTFIX} PythonQt_QtAll-Qt5-Python3 PATHS "${PYTHONQT_INSTALL_DIR}/lib" DOC "Full Qt bindings for the PythonQt library.")
# Minimum v3.1 is needed
find_library(PYTHONQT_LIBRARY_RELEASE
NAMES
PythonQt-Qt5-Python${PYTHONLIBS_MAJMIN}
PythonQt-Qt5-Python3
PythonQt
PATHS "${PYTHONQT_INSTALL_DIR}/lib"
DOC "The PythonQt library."
)
find_library(PYTHONQT_LIBRARY_DEBUG
NAMES
PythonQt-Qt5-Python${PYTHONLIBS_MAJMIN}JMIN${CTK_CMAKE_DEBUG_POSTFIX}
PythonQt-Qt5-Python${PYTHONLIBS_MAJMIN}${CMAKE_DEBUG_POSTFIX}
PythonQt-Qt5-Python${PYTHONLIBS_MAJMIN}
PythonQt-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX}
PythonQt-Qt5-Python3${CMAKE_DEBUG_POSTFIX}
PythonQt-Qt5-Python3
PythonQt${CTK_CMAKE_DEBUG_POSTFIX}
PythonQt${CMAKE_DEBUG_POSTFIX}
PythonQt
PATHS "${PYTHONQT_INSTALL_DIR}/lib"
DOC "The PythonQt library (debug build)."
)
find_library(PYTHONQT_QTALL_LIBRARY_RELEASE
NAMES
PythonQt_QtAll-Qt5-Python${PYTHONLIBS_MAJMIN}
PythonQt_QtAll-Qt5-Python3
PythonQt_QtAll
PATHS "${PYTHONQT_INSTALL_DIR}/lib"
DOC "Full Qt bindings for the PythonQt library."
)
find_library(PYTHONQT_QTALL_LIBRARY_DEBUG
NAMES
PythonQt_QtAll-Qt5-Python${PYTHONLIBS_MAJMIN}${CTK_CMAKE_DEBUG_POSTFIX}
PythonQt_QtAll-Qt5-Python${PYTHONLIBS_MAJMIN}${CMAKE_DEBUG_POSTFIX}
PythonQt_QtAll-Qt5-Python${PYTHONLIBS_MAJMIN}
PythonQt_QtAll-Qt5-Python3${CTK_CMAKE_DEBUG_POSTFIX}
PythonQt_QtAll-Qt5-Python3${CMAKE_DEBUG_POSTFIX}
PythonQt_QtAll-Qt5-Python3
PythonQt_QtAll${CTK_CMAKE_DEBUG_POSTFIX}
PythonQt_QtAll${CMAKE_DEBUG_POSTFIX}
PythonQt_QtAll
PATHS "${PYTHONQT_INSTALL_DIR}/lib"
DOC "Full Qt bindings for the PythonQt library (debug build)."
)

set(PYTHONQT_LIBRARY)
if(PYTHONQT_LIBRARY_RELEASE)
Expand All @@ -50,6 +105,16 @@ if(PYTHONQT_QTALL_LIBRARY_DEBUG)
list(APPEND PYTHONQT_QTALL_LIBRARY debug ${PYTHONQT_QTALL_LIBRARY_DEBUG})
endif()

if ( NOT PythonQt_FIND_QUIETLY )
if ( PYTHONQT_LIBRARY )
message( STATUS " .. found library ${PYTHONQT_LIBRARY}" )
endif()
if ( PYTHONQT_QTALL_LIBRARY )
message( STATUS " .. found qtall ${PYTHONQT_QTALL_LIBRARY}" )
endif()
endif()


mark_as_advanced(PYTHONQT_INSTALL_DIR)
mark_as_advanced(PYTHONQT_INCLUDE_DIR)
mark_as_advanced(PYTHONQT_LIBRARY_RELEASE)
Expand Down
10 changes: 7 additions & 3 deletions calamares.desktop
Expand Up @@ -66,7 +66,11 @@ Comment[ja]=Calamares — システムインストーラー
Name[lt]=Calamares
Icon[lt]=calamares
GenericName[lt]=Sistemos diegimas į kompiuterį
Comment[lt]=Calamares — sistemos diegyklė
Comment[lt]=Calamares — Sistemos diegimo programa
Name[nb]=Calamares
Icon[nb]=calamares
GenericName[nb]=Systeminstallatør
Comment[nb]=Calamares-systeminstallatør
Name[nl]=Calamares
Icon[nl]=calamares
GenericName[nl]=Installatieprogramma
Expand All @@ -81,8 +85,8 @@ GenericName[pt_BR]=Instalador de Sistema
Comment[pt_BR]=Calamares — Instalador de Sistema
Name[cs_CZ]=Calamares
Icon[cs_CZ]=calamares
GenericName[cs_CZ]=Instalační program systému
Comment[cs_CZ]=Calamares - instalační program systému
GenericName[cs_CZ]=Instalátor systému
Comment[cs_CZ]=Calamares – instalátor operačních systémů
Name[ru]=Calamares
Icon[ru]=calamares
GenericName[ru]=Установщик системы
Expand Down