Hello community,
here is the log from the commit of package plasma5-openSUSE for
openSUSE:Factory checked in at 2016-11-14 20:09:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.plasma5-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-openSUSE"
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-openSUSE/plasma5-openSUSE.changes
2016-11-10 13:58:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.plasma5-openSUSE.new/plasma5-openSUSE.changes
2016-11-14 20:09:16.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Nov 9 18:02:56 UTC 2016 - fab...@ritter-vogt.de
+
+- Add org.opensuse.desktop.defaultPanel/metadata.json into tar
+ instead of metadata.desktop in panel.diff
+- Simplify lookandfeel.diff
+- Replace org.openSUSE.desktop/metadata.desktop with
+ org.openSUSE.desktop/metadata.json in tar
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma5-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.HRi64g/_old 2016-11-14 20:09:17.000000000 +0100
+++ /var/tmp/diff_new_pack.HRi64g/_new 2016-11-14 20:09:17.000000000 +0100
@@ -35,8 +35,8 @@
# Diff between /usr/share/sddm/themes/breeze-openSUSE
# and /usr/share/sddm/themes/breeze
Source3: sddmtheme.diff
-# Diff between
/usr/share/plasma/layout-templates/org.kde.plasma.desktop.defaultPanel
-# and /usr/share/plasma/layout-templates/org.opensuse.desktop.defaultPanel
+# Diff between
/usr/share/plasma/layout-templates/org.kde.plasma.desktop.defaultPanel/contents
+# and
/usr/share/plasma/layout-templates/org.opensuse.desktop.defaultPanel/contents
Source4: panel.diff
# Diff between
/usr/share/plasma/shells/org.kde.plasma.desktop/contents/layout.js
# and
/usr/share/plasma/look-and-feel/org.openSUSE.desktop/contents/layouts/org.kde.plasma.desktop-layout.js
@@ -155,10 +155,9 @@
# Copy over preview picture
cp %{SOURCE6} %{buildroot}%{_datadir}/sddm/themes/breeze-openSUSE
-mkdir -p %{buildroot}%{_kf5_plasmadir}/layout-templates/
-cp -R %{_kf5_plasmadir}/layout-templates/org.kde.plasma.desktop.defaultPanel
%{buildroot}%{_kf5_plasmadir}/layout-templates/org.opensuse.desktop.defaultPanel
-pushd
%{buildroot}%{_kf5_plasmadir}/layout-templates/org.opensuse.desktop.defaultPanel
-patch -p2 -i %{SOURCE4}
+cp -R
%{_kf5_plasmadir}/layout-templates/org.kde.plasma.desktop.defaultPanel/contents
%{buildroot}%{_kf5_plasmadir}/layout-templates/org.opensuse.desktop.defaultPanel/contents
+pushd
%{buildroot}%{_kf5_plasmadir}/layout-templates/org.opensuse.desktop.defaultPanel/contents
+patch -p3 -i %{SOURCE4}
popd
# Single file for the layout, so we can use patch -o
++++++ lookandfeel.diff ++++++
--- /var/tmp/diff_new_pack.HRi64g/_old 2016-11-14 20:09:17.000000000 +0100
+++ /var/tmp/diff_new_pack.HRi64g/_new 2016-11-14 20:09:17.000000000 +0100
@@ -10,7 +10,7 @@
index cdbdb42..1ff40ab 100644
--- a/org.kde.breeze.desktop/contents/logout/Logout.qml
+++ b/org.openSUSE.desktop/contents/logout/Logout.qml
-@@ -83,13 +83,14 @@ PlasmaCore.ColorScope {
+@@ -83,9 +83,9 @@ PlasmaCore.ColorScope {
Rectangle {
anchors.fill: parent
color: PlasmaCore.ColorScope.backgroundColor
@@ -21,16 +21,3 @@
anchors.fill: parent
onClicked: root.cancelRequested()
}
- UserDelegate {
-+ id: users
- width: units.iconSizes.enormous
- height: width
- anchors {
-@@ -102,6 +103,7 @@ PlasmaCore.ColorScope {
- name: kuser.fullName
- }
- ColumnLayout {
-+ id: layout
- anchors {
- top: parent.verticalCenter
- topMargin: units.gridUnit * 2
++++++ panel.diff ++++++
--- /var/tmp/diff_new_pack.HRi64g/_old 2016-11-14 20:09:17.000000000 +0100
+++ /var/tmp/diff_new_pack.HRi64g/_new 2016-11-14 20:09:17.000000000 +0100
@@ -11,73 +11,3 @@
kickoff.currentConfigGroup = ["Shortcuts"]
kickoff.writeConfig("global", "Alt+F1")
-diff --git a/org.kde.plasma.desktop.defaultPanel/metadata.desktop
b/org.opensuse.desktop.defaultPanel/metadata.desktop
-index 90f4a5d..8e29706 100644
---- a/org.kde.plasma.desktop.defaultPanel/metadata.desktop
-+++ b/org.opensuse.desktop.defaultPanel/metadata.desktop
-@@ -1,60 +1,15 @@
- [Desktop Entry]
- Encoding=UTF-8
--Name=Default Panel
--Name[ar]=اللوحة الافتراضيّة
--Name[ast]=Panel por defeutu
--Name[bs]=Podrazumijevani panel
--Name[ca]=Plafó per omissió
--Name[ca@valencia]=Plafó per omissió
--Name[cs]=Výchozí panel
--Name[da]=Standardpanel
--Name[de]=Standard-Kontrollleiste
--Name[el]=Προκαθορισμένος πίνακας
--Name[en_GB]=Default Panel
--Name[es]=Panel por omisión
--Name[et]=Vaikimisi paneel
--Name[fi]=Oletuspaneeli
--Name[fr]=Tableau de bord par défaut
--Name[gl]=Panel predeterminado
--Name[he]=לוחות ברירת־מחדל
--Name[hu]=Alapértelmezett panel
--Name[id]=Panel Standar
--Name[is]=Sjálfgefið spjald
--Name[it]=Pannello predefinito
--Name[ja]=標準のパネル
--Name[ko]=기본 패널
--Name[lt]=Numatytas skydelis
--Name[mr]=मूलभूत पटल
--Name[nb]=Standardpanel
--Name[nds]=Standardpaneel
--Name[nl]=Standaard paneel
--Name[nn]=Standardpanel
--Name[pa]=ਡਿਫਾਲਟ ਪੈਨਲ
--Name[pl]=Domyślny panel
--Name[pt]=Painel Predefinido
--Name[pt_BR]=Painel padrão
--Name[ru]=Стандартная панель
--Name[sk]=Štandardný panel
--Name[sl]=Privzeti pult
--Name[sr]=Подразумевани панел
--Name[sr@ijekavian]=Подразумијевани панел
--Name[sr@ijekavianlatin]=Podrazumijevani panel
--Name[sr@latin]=Podrazumevani panel
--Name[sv]=Standardpanel
--Name[tr]=Öntanımlı Pano
--Name[uk]=Типова панель
--Name[x-test]=xxDefault Panelxx
--Name[zh_CN]=默认面板
--Name[zh_TW]=預設面板
-+Name=Default openSUSE Panel
- Type=Service
- ServiceTypes=Plasma/LayoutTemplate
- X-Plasma-Shell=plasmashell
- X-Plasma-ContainmentCategories=panel
--X-KDE-PluginInfo-Author=Aaron Seigo
--X-KDE-PluginInfo-Email=ase...@kde.org
--X-KDE-PluginInfo-Name=org.kde.plasma.desktop.defaultPanel
-+X-KDE-PluginInfo-Author=openSUSE KDE Team
-+X-KDE-PluginInfo-Email=opensuse-...@opensuse.org
-+X-KDE-PluginInfo-Name=org.opensuse.desktop.defaultPanel
- X-KDE-PluginInfo-Version=1.0
--X-KDE-PluginInfo-Website=http://plasma.kde.org/
-+X-KDE-PluginInfo-Website=http://opensuse.org
- X-KDE-PluginInfo-Category=
- X-KDE-PluginInfo-Depends=
- X-KDE-PluginInfo-License=GPL
++++++ plasma5-openSUSE-13.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma5-openSUSE/config-files/usr/share/plasma/layout-templates/org.opensuse.desktop.defaultPanel/metadata.json
new/plasma5-openSUSE/config-files/usr/share/plasma/layout-templates/org.opensuse.desktop.defaultPanel/metadata.json
---
old/plasma5-openSUSE/config-files/usr/share/plasma/layout-templates/org.opensuse.desktop.defaultPanel/metadata.json
1970-01-01 01:00:00.000000000 +0100
+++
new/plasma5-openSUSE/config-files/usr/share/plasma/layout-templates/org.opensuse.desktop.defaultPanel/metadata.json
2016-11-09 18:41:45.000000000 +0100
@@ -0,0 +1,28 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "opensuse-...@opensuse.org",
+ "Name": "openSUSE KDE Team"
+ },
+ {
+ "Email": "ase...@kde.org",
+ "Name": "Aaron Seigo"
+ }
+ ],
+ "Category": "",
+ "Dependencies": [
+ ],
+ "EnabledByDefault": true,
+ "Id": "org.opensuse.desktop.defaultPanel",
+ "License": "GPL",
+ "Name": "Default openSUSE Panel",
+ "ServiceTypes": [
+ "Plasma/LayoutTemplate"
+ ],
+ "Version": "1.0",
+ "Website": "http://opensuse.org/";
+ },
+ "X-Plasma-ContainmentCategories": "panel",
+ "X-Plasma-Shell": "plasmashell"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma5-openSUSE/config-files/usr/share/plasma/look-and-feel/org.openSUSE.desktop/metadata.desktop
new/plasma5-openSUSE/config-files/usr/share/plasma/look-and-feel/org.openSUSE.desktop/metadata.desktop
---
old/plasma5-openSUSE/config-files/usr/share/plasma/look-and-feel/org.openSUSE.desktop/metadata.desktop
2014-09-24 19:34:20.000000000 +0200
+++
new/plasma5-openSUSE/config-files/usr/share/plasma/look-and-feel/org.openSUSE.desktop/metadata.desktop
1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Comment=Default openSUSE theme
-Encoding=UTF-8
-Keywords=Desktop, Workspace, Appearance, Look and Feel, Logout, Lock, Suspend,
Shutdown, Hibernate,
-Name=openSUSE
-Type=Service
-
-X-KDE-ServiceTypes=Plasma/LookAndFeel
-X-KDE-ParentApp=
-X-KDE-PluginInfo-Author=openSUSE KDE team
-X-KDE-PluginInfo-Category=
-X-KDE-PluginInfo-Email=opensuse-...@opensuse.org
-X-KDE-PluginInfo-License=GPLv2+
-X-KDE-PluginInfo-Name=org.openSUSE.desktop
-X-KDE-PluginInfo-Version=2.0
-X-KDE-PluginInfo-Website=http://en.opensuse.org/Portal:KDE
-X-Plasma-MainScript=defaults
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/plasma5-openSUSE/config-files/usr/share/plasma/look-and-feel/org.openSUSE.desktop/metadata.json
new/plasma5-openSUSE/config-files/usr/share/plasma/look-and-feel/org.openSUSE.desktop/metadata.json
---
old/plasma5-openSUSE/config-files/usr/share/plasma/look-and-feel/org.openSUSE.desktop/metadata.json
1970-01-01 01:00:00.000000000 +0100
+++
new/plasma5-openSUSE/config-files/usr/share/plasma/look-and-feel/org.openSUSE.desktop/metadata.json
2016-11-09 23:41:37.000000000 +0100
@@ -0,0 +1,63 @@
+{
+ "KPlugin": {
+ "Authors": [
+ {
+ "Email": "opensuse-...@opensuse.org",
+ "Name": "openSUSE KDE Team"
+ },
+ {
+ "Email": "plasma-de...@kde.org",
+ "Name": "KDE Visual Design Group"
+ }
+ ],
+ "Category": "",
+ "Description": "Default openSUSE KDE Desktop",
+ "Id": "org.openSUSE.desktop",
+ "License": "GPLv2+",
+ "Name": "openSUSE",
+ "ServiceTypes": [
+ "Plasma/LookAndFeel"
+ ],
+ "Version": "2.0",
+ "Website": "http://opensuse.org";
+ },
+ "Keywords": "Desktop;Workspace;Appearance;Look and
Feel;Logout;Lock;Suspend;Shutdown;Hibernate;",
+ "Keywords[ca@valencia]": "Escriptori;Espai de treball;Aparença;Aparença i
comportament;Eixida;Bloqueig;Suspensió;Aturada;Hibernació;",
+ "Keywords[ca]": "Escriptori;Espai de treball;Aparença;Aparença i
comportament;Sortida;Bloqueig;Suspensió;Aturada;Hibernació;",
+ "Keywords[da]": "Skrivebord;Desktop;Arbejdsområde;Udseende;log
ud;Lås;Suspendér;Nedlukning;dvale;",
+ "Keywords[de]": "Desktop;Arbeitsfläche;Erscheinungsbild;Erscheinungsbild
und Verhalten;Abmelden;Sperren;Standby;Ruhezustand;Tiefschlaf;Herunterfahren;",
+ "Keywords[el]": "Επιφάνεια εργασίας;Χώρος εργασίας;Εμφάνιση;Όψη και
Αίσθηση;Αποσύνδεση;Κλείδωμα;Αναστολή;Τερματισμός;Νάρκη;",
+ "Keywords[en_GB]": "Desktop;Workspace;Appearance;Look and
Feel;Logout;Lock;Suspend;Shutdown;Hibernate;",
+ "Keywords[es]": "Escritorio;Espacio de trabajo;Apariencia;Aspecto
visual;Cerrar sesión;Bloquear;Suspender;Apagar;Hibernar;",
+ "Keywords[et]":
"töölaud;töötsoon;välimus;väljalogimine;lukustamine;seiskamine;väljalülitamine;talveuni;uni;",
+ "Keywords[fi]": "Desktop;Workspace;Appearance;Look and
Feel;Logout;Lock;Suspend;Shutdown;Hibernate;Työpöytä;Työtila;Ulkoasu;Ulkoasu ja
tuntuma;Kirjaudu ulos;Lukitse;Valmiustila;Sammuta;Lepotila;",
+ "Keywords[fr]": "bureau;espace de
travail;apparence;déconnexion;verrouillage;suspension;arrêt;hibernation",
+ "Keywords[gl]": "Escritorio;Espazo de traballo;Aparencia;Aparencia e
Comportamento;Saír;Trancar;Bloquear;Suspender;Apagar;Hibernar",
+ "Keywords[hu]":
"Asztal;Munkaterület;Megjelenés;Kinézet;Kijelentkezés;Zárolás;Felfüggesztés;Leállítás;Hibernálás",
+ "Keywords[id]": "Desktop;Ruang Kerja;Tampilan;Tampilan dan
Rasa;Keluar;Kunci;Suspensi;Matikan;Hibernasi;",
+ "Keywords[is]": "skjáborð;vinnusvæði;útlit;ásýnd og
hegðun;Útskráning;Læsing;setja í bið;slökkva;svæfa;",
+ "Keywords[it]": "desktop;spazio di
lavoro;aspetto;uscita;blocco;sospensione;spegnimento;ibernazione;",
+ "Keywords[ja]": "デスクトップ;ワークスペース;外観;外観と挙動;ログアウト;ロック;サスペンド;シャットダウン;休止状態;",
+ "Keywords[ko]": "Desktop;Workspace;Appearance;Look and
Feel;Logout;Lock;Suspend;Shutdown;Hibernate;데스크톱;작업공간;모양;로그아웃;잠금;대기모드;종료;끄기;최대절전모드;",
+ "Keywords[lt]": "Darbalaukis;Erdvė;Išvaizda;Išvaizda ir
turinys;Atsijungti;užrakinti;sulaikyti;Išjungti;Hibernuoti;",
+ "Keywords[nl]": "Bureaublad;Werkruimte;Uiterlijk;Uiterlijk en
gedrag;Afmelden;Vergrendelen;Onderbreken;Afsluiten;Slapen naar schijf;",
+ "Keywords[nn]":
"skrivebord;arbeidsområde;arbeidsflate;ustjånad;åtferd;utlogging;logga
ut;låsa;låsing;pausemodus;kvilemodus;dvalemodus;avslutting;",
+ "Keywords[pl]": "Pulpit;Przestrzeń robocza;Wygląd;Wygląd i
Odczucia;Wylogowanie;Zablokowanie
;Wstrzymanie;Zamknięcie;Hibernowanie;Wrażenia;",
+ "Keywords[pt]": "Ecrã;Área de Trabalho;Aparência;Aparência e
Comportamento;Encerrar;Bloquear;Suspender;Desligar;Hibernar;",
+ "Keywords[pt_BR]": "Área de trabalho;Espaço de
trabalho;Aparência;Aparência e Comportamento;Encerrar
sessão;Bloquear;Suspender;Desligar;Hibernar;",
+ "Keywords[ru]": "Desktop;Workspace;Appearance;Look and
Feel;Logout;Lock;Suspend;Shutdown;Hibernate;рабочий стол;рабочая среда;внешний
вид;визуальное представление;выход;завершение сеанса;блокировка;приостановка
работы;завершение работы;выключение;спящий режим;ждущий режим;",
+ "Keywords[sk]": "Plocha;pracovná
plocha;vzhľad;nastavenie;odhlásenie;zamknutie;uspanie;vypnutie;hibernácia;",
+ "Keywords[sl]": "Namizje;delovni prostor;videz;videz in
občutek;odjava;zaklep;pripravljenost;izklop;mirovanje;",
+ "Keywords[sr@ijekavian]": "Desktop;Workspace;Appearance;Look and
Feel;Logout;Lock;Suspend;Shutdown;Hibernate;површ;радни
простор;изглед;осећај;одјављивање;закључавање;суспендовање;гашење;хибернисање;",
+ "Keywords[sr@ijekavianlatin]": "Desktop;Workspace;Appearance;Look and
Feel;Logout;Lock;Suspend;Shutdown;Hibernate;površ;radni
prostor;izgled;osećaj;odjavljivanje;zaključavanje;suspendovanje;gašenje;hibernisanje;",
+ "Keywords[sr@latin]": "Desktop;Workspace;Appearance;Look and
Feel;Logout;Lock;Suspend;Shutdown;Hibernate;površ;radni
prostor;izgled;osećaj;odjavljivanje;zaključavanje;suspendovanje;gašenje;hibernisanje;",
+ "Keywords[sr]": "Desktop;Workspace;Appearance;Look and
Feel;Logout;Lock;Suspend;Shutdown;Hibernate;површ;радни
простор;изглед;осећај;одјављивање;закључавање;суспендовање;гашење;хибернисање;",
+ "Keywords[sv]": "Skrivbord;Arbetsrymd;Utseende;Utseende och
känsla;Utloggning;Lås;Viloläge;Avstängning;Dvala;",
+ "Keywords[tr]": "Masaüstü;Çalışma Alanı;Görünüm;Görünüm ve
Doku;Çık;Kilitle;Askıya Al;Kapat;Uyku;",
+ "Keywords[uk]": "Desktop;Workspace;Appearance;Look and
Feel;Logout;Lock;Suspend;Shutdown;Hibernate;стільниця;робочий
простір;воркспейс;вигляд;вигляд і
поведінка;вихід;вийти;заблокувати;замкнути;призупинити;вимкнути;приспати;",
+ "Keywords[x-test]": "xxDesktopxx;xxWorkspacexx;xxAppearancexx;xxLook and
Feelxx;xxLogoutxx;xxLockxx;xxSuspendxx;xxShutdownxx;xxHibernatexx;",
+ "Keywords[zh_CN]": "Desktop;Workspace;Appearance;Look and
Feel;Logout;Lock;Suspend;Shutdown;Hibernate;桌面;工作空间;外观;观感;注销;锁定;待机;关机;休眠;",
+ "Keywords[zh_TW]": "Desktop;Workspace;Appearance;Look and
Feel;Logout;Lock;Suspend;Shutdown;Hibernate;",
+ "X-KDE-ParentApp": "",
+ "X-Plasma-MainScript": "defaults"
+}
