From kde-i18n-doc  Mon Jul 18 19:22:43 2016
From: Friedrich W. H. Kossebau <kossebau () kde ! org>
Date: Mon, 18 Jul 2016 19:22:43 +0000
To: kde-i18n-doc
Subject: [calligra] karbon: Use org.kde prefix for Karbon desktop/appdata file & D-Bus name
Message-Id: <E1bPE7n-0005f7-2f () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-i18n-doc&m=146886980311192

Git commit 137f92beff82c8d053f649fcd256523b6620258f by Friedrich W. H. Koss=
ebau.
Committed on 18/07/2016 at 18:55.
Pushed by kossebau into branch 'master'.

Use org.kde prefix for Karbon desktop/appdata file & D-Bus name

CCMAIL:kde-i18n-doc@kde.org

M  +2    -2    karbon/data/CMakeLists.txt
R  +1    -1    karbon/data/org.kde.karbon.appdata.xml [from: karbon/data/ka=
rbon.appdata.xml - 099% similarity]
R  +1    -1    karbon/data/org.kde.karbon.desktop [from: karbon/data/karbon=
.desktop - 099% similarity]
M  +1    -1    karbon/ui/KarbonAboutData.h

http://commits.kde.org/calligra/137f92beff82c8d053f649fcd256523b6620258f

diff --git a/karbon/data/CMakeLists.txt b/karbon/data/CMakeLists.txt
index be83684..4ef239e 100644
--- a/karbon/data/CMakeLists.txt
+++ b/karbon/data/CMakeLists.txt
@@ -1,8 +1,8 @@
 install( FILES  simple.kgr allcolors.kgr  DESTINATION ${DATA_INSTALL_DIR}/=
karbon/gradients)
 install( FILES  palettes/svg-colors.gpl DESTINATION ${DATA_INSTALL_DIR}/ka=
rbon/palettes)
 install( FILES  karbon.rc karbon_readonly.rc  DESTINATION ${KXMLGUI_INSTAL=
L_DIR}/karbon)
-install( PROGRAMS  karbon.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
-install( FILES karbon.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appd=
ata/)
+install( PROGRAMS  org.kde.karbon.desktop  DESTINATION ${XDG_APPS_INSTALL_=
DIR})
+install( FILES org.kde.karbon.appdata.xml DESTINATION ${SHARE_INSTALL_PREF=
IX}/appdata/)
 install( FILES  karbonrc DESTINATION ${CONFIG_INSTALL_DIR} )
 =

 # TODO: with the new embedded JSON data for plugins there is no schema ATM=
 to define extended properties
diff --git a/karbon/data/karbon.appdata.xml b/karbon/data/org.kde.karbon.ap=
pdata.xml
similarity index 99%
rename from karbon/data/karbon.appdata.xml
rename to karbon/data/org.kde.karbon.appdata.xml
index 80d3017..f990453 100644
--- a/karbon/data/karbon.appdata.xml
+++ b/karbon/data/org.kde.karbon.appdata.xml
@@ -1,6 +1,6 @@
 <?xml version=3D"1.0" encoding=3D"utf-8"?>
 <component type=3D"desktop">
-  <id>karbon.desktop</id>
+  <id>org.kde.karbon.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
   <name>Karbon</name>
diff --git a/karbon/data/karbon.desktop b/karbon/data/org.kde.karbon.desktop
similarity index 99%
rename from karbon/data/karbon.desktop
rename to karbon/data/org.kde.karbon.desktop
index a935ada..2415387 100644
--- a/karbon/data/karbon.desktop
+++ b/karbon/data/org.kde.karbon.desktop
@@ -153,4 +153,4 @@ Comment[zh_CN]=3D=E5=88=9B=E5=BB=BA=E5=8F=AF=E7=BC=A9=
=E6=94=BE=E7=9F=A2=E9=87=8F=E7=BB=98=E5=9B=BE
 Comment[zh_TW]=3D=E5=BB=BA=E7=AB=8B=E5=8F=AF=E8=AA=BF=E6=95=B4=E5=90=91=E9=
=87=8F=E5=9C=96
 X-DocPath=3Dhttp://userbase.kde.org/Special:MyLanguage/Karbon
 X-DBUS-StartupType=3DMulti
-X-DBUS-ServiceName=3Dorg.calligra.karbon
+X-DBUS-ServiceName=3Dorg.kde.karbon
diff --git a/karbon/ui/KarbonAboutData.h b/karbon/ui/KarbonAboutData.h
index 19a8572..3301276 100644
--- a/karbon/ui/KarbonAboutData.h
+++ b/karbon/ui/KarbonAboutData.h
@@ -39,7 +39,7 @@ KAboutData * newKarbonAboutData()
         i18n("You are invited to participate in any way."),
         QStringLiteral("https://www.calligra.org/karbon/"));
     aboutData->setProductName("karbon"); // for bugs.kde.org
-    aboutData->setOrganizationDomain("calligra.org");
+    aboutData->setOrganizationDomain("kde.org");
     aboutData->addAuthor(
         i18n("Rob Buis"),
         QString(),