From e4c1aa750eb3252c90fa485f71f2f0f2ce29de5b Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Thu, 7 Mar 2024 18:15:53 +0100 Subject: [PATCH] Old files cleanups in preparation of 6.0 release --- Makefile | 8 +- bin/kde5-migrate-user-conf | 50 --------- bin/kickoffcfg | 81 -------------- etc/pam.d/kde | 9 -- etc/pam.d/kde-np | 11 -- etc/sudoers.d/kde4 | 11 -- kde/apps/konsole/openmamba.profile | 168 ----------------------------- kde/config/konsolerc | 2 - 8 files changed, 1 insertion(+), 339 deletions(-) delete mode 100755 bin/kde5-migrate-user-conf delete mode 100755 bin/kickoffcfg delete mode 100644 etc/pam.d/kde delete mode 100644 etc/pam.d/kde-np delete mode 100644 etc/sudoers.d/kde4 delete mode 100644 kde/apps/konsole/openmamba.profile delete mode 100644 kde/config/konsolerc diff --git a/Makefile b/Makefile index 097dc72..6560187 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Makefile for desktop-base-kde -# Copyright (C) 2004-2022 by Silvan Calarco +# Copyright (C) 2004-2024 by Silvan Calarco # Copyright (C) 2005-2007 by Davide Madrisan include VERSION @@ -100,12 +100,6 @@ dist-update: $(pck_infiles:.in=) locales: $(pck_catalogs:.po=.mo) $(pck_catalogs1:.po=.mo) $(pck_catalogs2:.po=.mo) install-kde-distro-addons: dist-update - @$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/pam.d - @$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)/sudoers.d/ - @$(INSTALL_DIR) $(DESTDIR)$(bindir) - @$(INSTALL_DIR) $(DESTDIR)$(datadir) - @$(INSTALL_DIR) $(DESTDIR)$(sbindir) - @$(INSTALL_DIR) $(DESTDIR)$(kde5datadir) @$(INSTALL_DIR) $(DESTDIR)$(kde5configdir) $(INSTALL_DATA) kde/config/kscreenlockerrc $(DESTDIR)$(kde5configdir)/kscreenlockerrc $(INSTALL_DATA) kde/config/powerdevilrc $(DESTDIR)$(kde5configdir)/powerdevilrc diff --git a/bin/kde5-migrate-user-conf b/bin/kde5-migrate-user-conf deleted file mode 100755 index 2b42ad1..0000000 --- a/bin/kde5-migrate-user-conf +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# openmamba simple kde4->kde5 user config migration script -if [ "$1" = "-f" ]; then - FORCE=1 -#else -# [ -e ~/.kde4/share/config/ -a ! -e ~/.kde4/share/.kde5_conf_migrated ] || exit 0 -fi -for p in ~/.kde4/share/config/*; do - [ -L $p ] && continue - f=`basename $p` - if [ -e ~/.config/$f ]; then - if [ "$FORCE" ]; then - echo "Migrating $p -> ~/.config/$f [forced]" - mv ~/.config/$f ~/.config/$f.bak - mv $p ~/.config/ || exit 1 - ln -s ../../../.config/$f $p || exit 1 - fi - #echo "SKIPPED: $p" - else - echo "Migrating $p -> ~/.config/$f" - mv $p ~/.config/ || exit 1 - ln -s ../../../.config/$f $p || exit 1 - fi -done - -for p in ~/.kde4/share/apps/*; do - [ -L $p ] && continue - f=`basename $p` - if [ -e ~/.local/share/$f ]; then - if [ "$FORCE" ]; then - echo "Migrating $p -> ~/.local/share/$f [forced]" - mv ~/.local/share/$f ~/.local/share/$f.bak - mv $p ~/.local/share/ || exit 1 - ln -s ../../../.local/share/$f $p || exit 1 - fi - #echo "SKIPPED: $p" - else - echo "Migrating $p -> ~/.local/share/$f" - mv $p ~/.local/share || exit 1 - ln -s ../../../.local/share/$f $p || exit 1 - fi -done -touch ~/.kde4/share/.kde5_conf_migrated -# Switch Akonadi db backend from QSQLITE3 to QMYSQL -if [ "`akonadictl --version | grep \"Akonadi 5\"`" -a -e ~/.config/akonadi/akonadiserverrc ]; then - grep -q "^Driver=QSQLITE" ~/.config/akonadi/akonadiserverrc && { - sed -i "s|^Driver=QSQLITE.*|Driver=QMYSQL|" ~/.config/akonadi/akonadiserverrc - sed -i "s|^ServerPath=/usr/sbin/mysqld|ServerPath=/usr/bin/mysqld|" ~/.config/akonadi/akonadiserverrc - } -fi diff --git a/bin/kickoffcfg b/bin/kickoffcfg deleted file mode 100755 index 6cb556d..0000000 --- a/bin/kickoffcfg +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh -if [ `id -u` -eq 0 ]; then - CONFDIR=/opt/kde/share/config -else - CONFDIR=~/.kde4/share/config -fi -XDG_APPS_DIR=/usr/share/applications -FAVORITES=`/opt/kde/bin/kreadconfig --file $CONFDIR/kickoffrc --group Favorites --key FavoriteURLs 2>/dev/null` - -function usage() { - echo "KDE4 kickoff configuration tool" - echo - echo "Usage:" - echo " kickoffcfg {--add-favorite|--del-favorite} /path/to/desktopfile.desktop" - echo " kickoffcfg --update-favorite /path/to/old/desktopfile.desktop /path/to/new/desktopfile.desktop" - echo " kickoffcfg --autoupdate-favorites" - echo - echo "Current favorites:" - echo $FAVORITES - exit 1 -} - -[ "$1" ] || usage - -if [ "$1" = "--add-favorite" ]; then - [ "$2" ] || usage - # ADD - echo "$FAVORITES" | grep $2 >/dev/null || { - if [ "$FAVORITES" ]; then - FAVORITES="$FAVORITES,$2" - else - FAVORITES="$2" - fi - /opt/kde/bin/kwriteconfig --file $CONFDIR/kickoffrc --group Favorites --key FavoriteURLs $FAVORITES - } -elif [ "$1" = "--del-favorite" ]; then - [ "$2" ] || usage - # DELETE - MODFAVORITES=`echo "$FAVORITES" | sed "s|$2||;s|^,||;s|,,|,|"` - if [ ! "$MODFAVORITES" ]; then - /opt/kde/bin/kwriteconfig --file $CONFDIR/kickoffrc --group Favorites --key FavoriteURLs '' - elif [ "$FAVORITES" != "$MODFAVORITES" ]; then - /opt/kde/bin/kwriteconfig --file $CONFDIR/kickoffrc --group Favorites --key FavoriteURLs $MODFAVORITES - fi -elif [ "$1" = "--update-favorite" ]; then - [ "$2" -a "$3" ] || usage - # UPDATE - MODFAVORITES=`echo "$FAVORITES" | sed "s|$2|$3|"` - /opt/kde/bin/kwriteconfig --file $CONFDIR/kickoffrc --group Favorites --key FavoriteURLs $MODFAVORITES -elif [ "$1" = "--autoupdate-favorites" ]; then - SAVEIFS=$IFS - IFS="," - for f in $FAVORITES; do - if [ "$f" = "$XDG_APPS_DIR/chromium-devel.desktop" ]; then - kickoffcfg --update-favorite $f $XDG_APPS_DIR/chromium.desktop - fi - if [ ! -e "$f" ]; then - DIRNAME=`dirname $f` - BASENAME=`basename $f` - BASENAME_LC=`echo $BASENAME | tr '[:upper:]' '[:lower:]'` - if [ -e $XDG_APPS_DIR/$BASENAME ]; then - echo "kickoffcfg: migrating $f to $XDG_APPS_DIR/$BASENAME" - kickoffcfg --update-favorite $f $XDG_APPS_DIR/$BASENAME - elif [ -e $XDG_APPS_DIR/org.kde.$BASENAME ]; then - echo "kickoffcfg: migrating $f to $XDG_APPS_DIR/org.kde.$BASENAME" - kickoffcfg --update-favorite $f $XDG_APPS_DIR/org.kde.$BASENAME - elif [ -e $XDG_APPS_DIR/org.kde.$BASENAME_LC ]; then - echo "kickoffcfg: migrating $f to $XDG_APPS_DIR/org.kde.$BASENAME_LC" - kickoffcfg --update-favorite $f $XDG_APPS_DIR/org.kde.$BASENAME_LC - else - echo "WARNING: favorite link $f does not exist; ignoring." - fi - fi - done - IFS=$SAVEIFS -else - echo "Invalid option $1; aborting." - echo - usage -fi -exit 0 diff --git a/etc/pam.d/kde b/etc/pam.d/kde deleted file mode 100644 index ef35d71..0000000 --- a/etc/pam.d/kde +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 -auth required pam_group.so -auth include system-auth -auth required pam_nologin.so -account include system-auth -password include system-auth -session required pam_limits.so -session required pam_unix.so -session required pam_mkhomedir.so silent diff --git a/etc/pam.d/kde-np b/etc/pam.d/kde-np deleted file mode 100644 index 7872288..0000000 --- a/etc/pam.d/kde-np +++ /dev/null @@ -1,11 +0,0 @@ -#%PAM-1.0 -# -# PAM configuration for KDM autologin -# -auth required pam_group.so -auth required pam_permit.so -account include system-auth -session required pam_limits.so -session required pam_permit.so -session required pam_mkhomedir.so silent -password required pam_deny.so diff --git a/etc/sudoers.d/kde4 b/etc/sudoers.d/kde4 deleted file mode 100644 index 8ad682c..0000000 --- a/etc/sudoers.d/kde4 +++ /dev/null @@ -1,11 +0,0 @@ -# KDE4 sudoers.d file. -# -# This file MUST be edited with the 'visudo' command as root. -# -# See the sudoers man page for the details on how to write a sudoers file. -# - -# Cmnd alias specification -Cmnd_Alias KDE4_CMD = /opt/kde/bin/*, /opt/kde/lib/kde4/libexec/* - -%sysadmin ALL = PASSWD: KDE4_CMD diff --git a/kde/apps/konsole/openmamba.profile b/kde/apps/konsole/openmamba.profile deleted file mode 100644 index a6ffdfd..0000000 --- a/kde/apps/konsole/openmamba.profile +++ /dev/null @@ -1,168 +0,0 @@ -[General] -Name=Shell -Name[af]=Tolk -Name[ar]=القشرة -Name[as]=শ্বেল -Name[be@latin]=Abałonka -Name[bg]=Шел -Name[bn]=শেল -Name[bn_IN]=শেল -Name[br]=Shell -Name[ca]=Intèrpret d'ordres -Name[ca@valencia]=Intèrpret d'ordes -Name[cs]=Shell -Name[csb]=Pòwłoka -Name[cy]=Plisgyn -Name[da]=Skal -Name[de]=Shell -Name[el]=Κέλυφος -Name[en_GB]=Shell -Name[eo]=Ŝelo -Name[es]=Intérprete de órdenes -Name[et]=Shell -Name[eu]=Shell-a -Name[fi]=Komentorivi -Name[fr]=Terminal -Name[fy]=Flues -Name[ga]=Blaosc -Name[gl]=Shell -Name[gu]=શેલ -Name[he]=מעטפת -Name[hi]=शेल -Name[hne]=सेल -Name[hr]=Ljuska -Name[hsb]=terminal (shell) -Name[hu]=Parancsértelmező -Name[is]=Skél -Name[it]=Shell -Name[ja]=シェル -Name[ka]=Shell -Name[kk]=Қоршау-орта -Name[km]=សែល -Name[kn]=ಆದೇಶಗ್ರಾಹಿ (ಶೆಲ್) -Name[ko]=셸 -Name[ku]=Shell -Name[lt]=Apvalkalas -Name[lv]=Čaula -Name[mai]=शेल -Name[mk]=Школка -Name[ml]=ഷെല്‍ -Name[mr]=शेल -Name[ms]=Shell -Name[nb]=Skall -Name[nds]=Befehlsfinster -Name[nl]=Shell -Name[nn]=Skal -Name[oc]=Copèla -Name[or]=Shell -Name[pa]=ਸ਼ੈੱਲ -Name[pl]=Powłoka -Name[pt]=Linha de Comandos -Name[pt_BR]=Shell -Name[ro]=Interpretor -Name[ru]=Командная оболочка -Name[se]=Skálžu -Name[si]=Shell -Name[sk]=Shell -Name[sl]=Lupina -Name[sr]=Шкољка -Name[sr@latin]=Školjka -Name[sv]=Skal -Name[ta]=ஓடு -Name[te]=షెల్ -Name[tg]=Shell -Name[th]=เชลล์ -Name[tr]=Kabuk -Name[uk]=Оболонка -Name[uz]=Terminal -Name[uz@cyrillic]=Терминал -Name[wa]=Shell -Name[xh]=Iqokobhe -Name[x-test]=xxShellxx -Name[zh_CN]=Shell -Name[zh_TW]=Shell -Comment=Konsole default profile -Comment[af]=Konsole verstekprofiel -Comment[ar]=لوحة الإعدادات الافتراضية -Comment[as]=Konsole ৰ অবিকল্পিত পাৰ্শ্বৰূপ -Comment[be@latin]=Zmoŭčany profil prahramy „Konsole” -Comment[bg]=Профил по подразбиране на конзолата -Comment[bn]=কনসোল ডিফল্ট প্রোফাইল -Comment[bn_IN]=Konsole-র ডিফল্ট প্রোফাইল -Comment[ca]=Perfil per omissió del Konsole -Comment[ca@valencia]=Perfil per omissió del Konsole -Comment[cs]=Výchozí profil Konsole -Comment[csb]=Domëszlny profil Kònsolë -Comment[da]=Standardprofil for Konsole -Comment[de]=Konsole-Standardprofil -Comment[el]=Προκαθορισμένο προφίλ του Konsole -Comment[en_GB]=Konsole default profile -Comment[eo]=Defaŭlta profilo por Konzolo -Comment[es]=Perfil predeterminado de Konsole -Comment[et]=Konsooli vaikimisi profiil -Comment[eu]=Konsole profila lehenetsia -Comment[fi]=Konsolen oletusprofiili -Comment[fr]=Profil par défaut de Konsole -Comment[fy]=Standertprofyl (konsole) -Comment[ga]=Próifíl réamhshocraithe Konsole -Comment[gl]=Perfil predeterminado de Konsole -Comment[gu]=કોન્સોલ મૂળભૂત પ્રોફાઇલ -Comment[he]=פרופיל ברירת־המחדל של קונסול -Comment[hi]=कंसोल डिफ़ॉल्ट प्रोफ़ाइल -Comment[hne]=कंसोल डिफाल्ट प्रोफाइल -Comment[hr]=Zadani profil Konzole -Comment[hsb]=Standardny profil konsole -Comment[hu]=Alapértelmezett Konsole-profil -Comment[is]=Sjálfgefið sniðmát Konsole -Comment[it]=Profilo predefinito di Konsole -Comment[ja]=Konsole の標準プロファイル -Comment[kk]=Konsole-дың әдетті профилі -Comment[km]=ទម្រង់​លំនាំដើម​របស់​កុងសូល -Comment[kn]=ಕನ್ಸೋಲ್ ನ (ಆದೇಶ ಗ್ರಾಹಿ) ಪೂರ್ವನಿಯೋಜಿತ ವ್ಯಕ್ತಿವೈಶಿಷ್ಟ್ಯ (ಪ್ರೊಫೈಲ್) -Comment[ko]=Konsole 기본 프로필 -Comment[ku]=Profîla standard a Konsolê -Comment[lt]=Konsole numatytas profilis -Comment[lv]=Konsole noklusējuma profils -Comment[mai]=कंसोल पूर्वनिर्धारित प्रोफाइल -Comment[mk]=Стандарден профил на Конзола -Comment[ml]=കണ്‍സോളിന്റെ സ്വതേയുള്ള പ്രൊഫൈല്‍ -Comment[mr]=कंसोल मुलभूत प्रोफाइल -Comment[nb]=Konsoles standardprofil -Comment[nds]=Standard-Konsoletörn -Comment[nl]=Standaardprofiel (Konsole) -Comment[nn]=Standardprofil for Konsoll -Comment[or]=କୋନସୋଲ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ସଂକ୍ଷିପ୍ତ ଚିତ୍ର -Comment[pa]=ਕਨਸੋਲ ਡਿਫਾਲਟ ਪਰੋਫਾਇਲ -Comment[pl]=Domyślny profil Konsoli -Comment[pt]=Perfil predefinido do Konsole -Comment[pt_BR]=Perfil padrão do Konsole -Comment[ro]=Profil konsolă implicit -Comment[ru]=Стандартный профиль Konsole -Comment[se]=Konsolla standárdprofiila -Comment[si]=Konsole default profile -Comment[sk]=Štandardný profil Konsole -Comment[sl]=Privzeti profil za Konzolo -Comment[sr]=Подразумевани профил Конзоле -Comment[sr@latin]=Podrazumevani profil Konsole -Comment[sv]=Terminalens standardprofil -Comment[ta]=முனையத்தின் இயல்பிருப்பு பண்பு -Comment[te]=Konsole అప్రమేయ ప్రొఫైల్ -Comment[tg]=Профили консоли стандартӣ -Comment[th]=โพรไฟล์ปริยายของคอนโซล K -Comment[tr]=Konsole öntanımlı profili -Comment[uk]=Типовий профіль Konsole -Comment[wa]=Prémetou profil pol Konsole -Comment[x-test]=xxKonsole default profilexx -Comment[zh_CN]=Konsole 默认配置文件 -Comment[zh_TW]=Konsole 預設設定檔 -Icon=utilities-terminal -LocalTabTitleFormat=%d : %n -RemoteTabTitleFormat=%h : %u - -[Appearance] -ColorScheme=Linux -Font=Liberation Mono,9,-1,5,50,0,0,0,0,0 - -[Scrolling] -ScrollMode=FixedLineCount -ScrollLineCount=1000 diff --git a/kde/config/konsolerc b/kde/config/konsolerc deleted file mode 100644 index b794c14..0000000 --- a/kde/config/konsolerc +++ /dev/null @@ -1,2 +0,0 @@ -[Desktop Entry] -DefaultProfile=openmamba.profile