OSDN Git Service

Merge tag 'v3.2.39.3'
authorhayao <hayao@fascode.net>
Sun, 23 May 2021 13:26:25 +0000 (22:26 +0900)
committerhayao <hayao@fascode.net>
Sun, 23 May 2021 13:26:25 +0000 (22:26 +0900)
1  2 
AUTHORS
CMakeLists.txt
README.md
calamares.desktop
ci/RELEASE.sh
settings.conf
src/modules/packages/main.py
src/modules/packages/packages.conf
src/modules/users/users.conf
src/modules/welcome/welcome.conf

diff --cc AUTHORS
Simple merge
diff --cc CMakeLists.txt
Simple merge
diff --cc README.md
+++ b/README.md
@@@ -5,35 -5,34 +5,38 @@@
  # Calamares: Distribution-Independent Installer Framework
  ---------
  
- [![GitHub release](https://img.shields.io/github/v/release/sereneteam/alterlinux-calamares?color=%234169e1&include_prereleases&style=flat-square)](https://github.com/sereneteam/alterlinux-calamares/releases)
- [![GitHub license](https://img.shields.io/github/license/sereneteam/alterlinux-calamares?style=flat-square&logo=gnu)](https://github.com/sereneteam/alterlinux-calamares/blob/master/LICENSE)
+ [![GitHub release](https://img.shields.io/github/release/calamares/calamares.svg)](https://github.com/calamares/calamares/releases)
+ [![GitHub Build Status](https://img.shields.io/github/workflow/status/calamares/calamares/ci?label=GH%20build)](https://github.com/calamares/calamares/actions?query=workflow%3Aci)
+ [![Travis Build Status](https://travis-ci.org/calamares/calamares.svg?branch=calamares)](https://travis-ci.org/calamares/calamares)
+ [![Coverity Scan Build Status](https://scan.coverity.com/projects/5389/badge.svg)](https://scan.coverity.com/projects/5389)
+ [![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSE)
  
 -
 -| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [Freenode (IRC): #calamares](https://webchat.freenode.net/?channel=#calamares?nick=guest) | [Wiki](https://github.com/calamares/calamares/wiki) |
 -|:--:|:--:|:--:|:--:|:--:|
 -
 -
 -> Calamares is a distribution-independent system installer, with an advanced partitioning
 -> feature for both manual and automated partitioning operations. Calamares is designed to
 -> be customizable by distribution maintainers without need for cumbersome patching,
 -> thanks to third party branding and external modules support.
 -
 -## Target Audience
 -
 -Calamares is a Linux installer; users who install Linux on a computer will hopefully
 -use it just **once**, to install their Linux distribution. Calamares is not
 -a "ready to use" application: distributions apply a huge amount of customisation
 -and configuration to Calamares, and the target audience for this repository
 -is those distributions, and the people who make those Linux distro's.
 -
 -Calamares has some [generic user documentation](https://github.com/calamares/calamares/wiki/Use-Guide)
 -for end-users, but most of what we have is for distro developers.
 -
 -## Getting Calamares
 +[If you find a Bug, please report a Bug](https://github.com/SereneTeam/alterlinux-calamares/issues/new/choose)
 +
 +***
 +
 +### Dependencies
 +
 +Main:
 +* Compiler with C++14 support: [GCC](https://www.archlinux.org/packages/core/x86_64/gcc/) >= 5 or [Clang](https://www.archlinux.org/packages/extra/x86_64/clang/) >= 3.5.1
 +* [CMake](https://www.archlinux.org/packages/extra/x86_64/cmake/) >= 3.3
 +* [Qt](https://www.archlinux.org/packages/extra/x86_64/qt5-base/) >= 5.9
 +* [yaml-cpp](https://www.archlinux.org/packages/community/x86_64/yaml-cpp/) >= 0.5.1
 +* [Python](https://www.archlinux.org/packages/extra/x86_64/python/) >= 3.3 (required for some modules)
 +* [Boost.Python](https://www.archlinux.org/packages/extra/x86_64/boost/) and [Boost-libs](https://www.archlinux.org/packages/extra/x86_64/boost-libs/) >= 1.55.0 (required for some modules)
 +* [KDE extra-cmake-modules](https://www.archlinux.org/packages/extra/any/extra-cmake-modules/) >= 5.18 (recommended; required for some modules;
 +  required for some tests)
 +* [KDE Frameworks KCoreAddons](https://www.archlinux.org/packages/extra/x86_64/kcoreaddons/) (>= 5.58 recommended)
 +* ~~PythonQt (optional, deprecated)~~ (Not available)
 +
 +Modules:
 +* Individual modules may have their own requirements;
 +  these are listed in CMake output. Particular requirements (not complete):
 +* *fsresizer* [KPMCore](https://www.archlinux.org/packages/community/x86_64/kpmcore/) >= 3.3 (>= 4.1 recommended)
 +* *partition* [KPMCore](https://www.archlinux.org/packages/community/x86_64/kpmcore/) >= 3.3 (>= 4.1 recommended)
 +* *users* [LibPWQuality](https://www.archlinux.org/packages/extra/x86_64/libpwquality/) (optional)
 +
 +### Building (Vanilla)
  
  Clone Calamares from GitHub. The default branch is called *calamares*.
  
@@@ -1,12 -1,12 +1,12 @@@
  [Desktop Entry]
  Type=Application
  Version=1.0
 -Name=Install System
 -GenericName=System Installer
 -Keywords=calamares;system;installer;
 +Name=Install Alter Linux
 +GenericName=Alter Linux Installer
 +Keywords=calamares;alter;linux;installer;
  TryExec=calamares
- Exec=pkexec /usr/bin/calamares
 +Comment=Alter Linux Installer - by Calamares
+ Exec=sh -c "pkexec calamares"
 -Comment=Calamares — System Installer
  Icon=calamares
  Terminal=false
  StartupNotify=true
diff --cc ci/RELEASE.sh
Simple merge
diff --cc settings.conf
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge