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

Merge pull request #6526 from suvari/master

Browse Source 
plasma-desktop: clean conflicted files with plasma-workspaces
This commit is contained in:
Kamil ATLI
2019-02-13 21:53:54 +03:00
committed by GitHub
parent b6c30ade14 7504fe2617
commit 5688a08899
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/plasma/plasma-desktop/actions.py
+6
View File
@@ -20,4 +20,10 @@ def build():
def install(): def install():
kde5.install() kde5.install()
# Conflicts with plasma-workspace
pisitools.remove("/usr/share/doc/HTML")
pisitools.remove("/usr/share/locale/")
pisitools.remove("/usr/lib/qt5/plugins/kcms/kcm_translations.so")
pisitools.remove("/usr/share/kpackage/kcms/kcm_translations/*")
pisitools.dodoc("HACKING", "COPYING") pisitools.dodoc("HACKING", "COPYING")
desktop/kde/plasma/plasma-desktop/pspec.xml
+7
View File
@@ -177,6 +177,13 @@
</Package> </Package>
<History> <History>
<Update release="28">
<Date>2019-02-13</Date>
<Version>5.14.5</Version>
<Comment>Clean kcm_translations.mo</Comment>
<Name>Kamil Atlı</Name>
<Email>suvari@pisilinux.org</Email>
</Update>
<Update release="27"> <Update release="27">
<Date>2019-02-09</Date> <Date>2019-02-09</Date>
<Version>5.14.5</Version> <Version>5.14.5</Version>