Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4114 from ertugerata/master

Browse Source 
yali add conflicts
This commit is contained in:
Ertuğrul Erata
2017-11-04 18:21:28 +02:00
committed by GitHub
parent f7ddbf8973 6faa36bba0
commit 7567d3e607
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
distribution.xml
+2 -2
View File
@@ -20,10 +20,10 @@
<Package>prison-qt5</Package> <Package>prison-qt5</Package>
<Package>xorg-video-modesetting</Package> <Package>xorg-video-modesetting</Package>
<!--for yali --> <!--for yali -->
<Package>busybox-mkinitcpio</Package> <!--Package>busybox-mkinitcpio</Package>
<Package>mkinitcpio</Package> <Package>mkinitcpio</Package>
<Package>Calamares</Package> <Package>Calamares</Package>
<Package>calamares-theme-pisilinux</Package> <Package>calamares-theme-pisilinux</Package-->
<!--no longer avilable, replaced qt5-quickcontrols2--> <!--no longer avilable, replaced qt5-quickcontrols2-->
<Package>qt5-quick1</Package> <Package>qt5-quick1</Package>
<Package>qt5-quick1-devel</Package> <Package>qt5-quick1-devel</Package>
system/installer/yali/pspec.xml
+11
View File
@@ -74,6 +74,10 @@
<Dependency>droid-fonts</Dependency> <Dependency>droid-fonts</Dependency>
<!-- <Dependency>cursor-theme-oxygen-white</Dependency> --> <!-- <Dependency>cursor-theme-oxygen-white</Dependency> -->
</RuntimeDependencies> </RuntimeDependencies>
<Conflicts>
<Package>Calamares</Package>
<Package>calamares-theme-pisilinux</Package>
</Conflicts>
<Files> <Files>
<Path fileType="executable">/usr/bin</Path> <Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path> <Path fileType="library">/usr/lib</Path>
@@ -84,6 +88,13 @@
</Package> </Package>
<History> <History>
<Update release="5">
<Date>2017-11-04</Date>
<Version>3.0.4.1</Version>
<Comment>Version bump.</Comment>
<Name>Ertuğrul Erata</Name>
<Email>ertugrulerata@gmail.com</Email>
</Update>
<Update release="4"> <Update release="4">
<Date>2017-08-12</Date> <Date>2017-08-12</Date>
<Version>3.0.4.1</Version> <Version>3.0.4.1</Version>