From 08e206deebe47d7697b169a02ecfe9a56c94bbcc Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 5 Jul 2022 17:21:20 +0200 Subject: [PATCH] Drop XML files autogenerated from qelectrotech.xml These files are the bare XML definitions, and they are automatically generated by update-mime-database (part of shared-mime-info) on update (e.g. by distro hooks) or manually. Keeping them in the sources, and installing them, is definitely not correct, as qelectrotech.xml is their canonical definition. Hence, drop them from the sources, together with references to them. --- CMakeLists.txt | 4 ---- cmake/define_definitions.cmake | 1 - cmake/paths_compilation_installation.cmake | 2 -- misc/translations_stat.pl | 2 +- misc/x-qet-element.xml | 20 -------------------- misc/x-qet-project.xml | 20 -------------------- misc/x-qet-titleblock.xml | 21 --------------------- qelectrotech.pro | 5 ----- 8 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 misc/x-qet-element.xml delete mode 100644 misc/x-qet-project.xml delete mode 100644 misc/x-qet-titleblock.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index ab2a6152e..a9d55c0fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,10 +147,6 @@ install(DIRECTORY examples DESTINATION share/qelectrotech) install(DIRECTORY titleblocks DESTINATION share/qelectrotech) install(FILES LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog DESTINATION share/doc/qelectrotech) install(FILES misc/qelectrotech.desktop DESTINATION share/applications) -install(FILES misc/x-qet-element.xml - misc/x-qet-project.xml - misc/x-qet-titleblock.xml - DESTINATION share/mime/application) install(FILES misc/x-qet-element.desktop misc/x-qet-project.desktop misc/x-qet-titleblock.desktop diff --git a/cmake/define_definitions.cmake b/cmake/define_definitions.cmake index 3feebe200..939cd8ff1 100644 --- a/cmake/define_definitions.cmake +++ b/cmake/define_definitions.cmake @@ -47,7 +47,6 @@ endif() endif() message("QET_LICENSE_PATH " ${QET_LICENSE_PATH}) -message("QET_MIME_XML_PATH " ${QET_MIME_XML_PATH}) message("QET_MIME_DESKTOP_PATH " ${QET_MIME_DESKTOP_PATH}) message("QET_MIME_PACKAGE_PATH " ${QET_MIME_PACKAGE_PATH}) message("QET_DESKTOP_PATH " ${QET_DESKTOP_PATH}) diff --git a/cmake/paths_compilation_installation.cmake b/cmake/paths_compilation_installation.cmake index 80ea425ea..70e50d743 100644 --- a/cmake/paths_compilation_installation.cmake +++ b/cmake/paths_compilation_installation.cmake @@ -28,7 +28,6 @@ if(UNIX AND NOT APPLE) set(QET_LANG_PATH "share/qelectrotech/lang/") set(QET_EXAMPLES_PATH "share/qelectrotech/examples/") set(QET_LICENSE_PATH "doc/qelectrotech/") - set(QET_MIME_XML_PATH "../share/mime/application/") set(QET_MIME_DESKTOP_PATH "../share/mimelnk/application/") set(QET_MIME_PACKAGE_PATH "../share/mime/packages/") set(QET_DESKTOP_PATH "share/applications/") @@ -47,7 +46,6 @@ if(APPLE) set(QET_LANG_PATH "../Resources/lang/") set(QET_EXAMPLES_PATH "share/qelectrotech/examples/") set(QET_LICENSE_PATH "doc/qelectrotech/") - set(QET_MIME_XML_PATH "../share/mime/application/") set(QET_MIME_DESKTOP_PATH "../share/mimelnk/application/") set(QET_DESKTOP_PATH "share/applications/") set(QET_ICONS_PATH "share/icons/hicolor/") diff --git a/misc/translations_stat.pl b/misc/translations_stat.pl index a2d52481d..bfd509b3c 100755 --- a/misc/translations_stat.pl +++ b/misc/translations_stat.pl @@ -34,7 +34,7 @@ my $todo = 'TODO'; our $default_language = 'fr'; our @misc_desktop_files = qw(misc/qelectrotech.desktop misc/x-qet-element.desktop misc/x-qet-project.desktop misc/x-qet-titleblock.desktop); -our @misc_xml_files = qw(misc/qelectrotech.xml misc/x-qet-element.xml misc/x-qet-project.xml misc/x-qet-titleblock.xml); +our @misc_xml_files = qw(misc/qelectrotech.xml); our @readme_files = qw(CREDIT README INSTALL ELEMENTS.LICENSE build-aux/linux/fedora/README.elements); our @ordered_languages = qw(fr en es pt cs pl ca de it ar sl hr el nl be ru ro da pt_br hu sr tr nb ja mn); our %languages = ( diff --git a/misc/x-qet-element.xml b/misc/x-qet-element.xml deleted file mode 100644 index eeb07505c..000000000 --- a/misc/x-qet-element.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - QElectroTech element file - Fichier élément QElectroTech - QElectroTech ملف عنصر - Archivo elemento QElectroTech - Fitxer símbol QElectroTech - Файл элемента QElectroTech - Ficheiro de elemento QElectroTech - Soubor s prvkem pro QElectroTech - Plik elementu QElectroTech - File del progetto QElectroTech - Αρχείο στοιχείου του QElectroTech - QElectroTech element bestand - QElectroTech element bestand - QElectroTech symbol fil - QElectroTech 要素ファイル - - diff --git a/misc/x-qet-project.xml b/misc/x-qet-project.xml deleted file mode 100644 index 42683f046..000000000 --- a/misc/x-qet-project.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - QElectroTech project file - Fichier projet QElectroTech - QElectroTech ملف مشروع - Archivo proyecto QElectroTech - Fitxer projecte QElectroTech - Файл проекта QElectroTech - Ficheiro de projecto QElectroTech - Soubor s projektem pro QElectroTech - Plik projektu QElectroTech - File del progetto QElectroTech - Αρχείο έργου του QElectroTech - QElectroTech project bestand - QElectroTech project bestand - QElectroTech projekt fil - QElectroTech プロジェクト・ファイル - - diff --git a/misc/x-qet-titleblock.xml b/misc/x-qet-titleblock.xml deleted file mode 100644 index 4037bf6e5..000000000 --- a/misc/x-qet-titleblock.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - QElectroTech title block template - QElectroTech Zeichnungskopf Vorlage - Modèle de cartouche QElectroTech - QElectroTech نموذج إطار تعريف - Файл шаблона основной надписи листа QElectroTech - Szablon tabliczki rysunkowej QElectroTech - Modelo de cartucho QElectroTech - Model de bloc de títol QElectroTech - Vzor záhlaví výkresu pro QElectroTech - Modelo de moldura QElectroTech - Modello di cartiglio per QElectroTech - Πρότυπο πινακίδας του QElectroTech - QElectroTech titel bloksjabloon - QElectroTech titel bloksjabloon - QElectroTech titelblok skabelon - QElectroTech 表題欄テンプレート - - diff --git a/qelectrotech.pro b/qelectrotech.pro index 997e6511f..d82fe47c1 100644 --- a/qelectrotech.pro +++ b/qelectrotech.pro @@ -13,7 +13,6 @@ unix { QET_LANG_PATH = 'share/qelectrotech/lang/' QET_EXAMPLES_PATH = 'share/qelectrotech/examples/' QET_LICENSE_PATH = 'doc/qelectrotech/' - QET_MIME_XML_PATH = '../share/mime/application/' QET_MIME_DESKTOP_PATH = '../share/mimelnk/application/' QET_MIME_PACKAGE_PATH = '../share/mime/packages/' QET_DESKTOP_PATH = 'share/applications/' @@ -43,7 +42,6 @@ macx { QET_LANG_PATH = '../Resources/lang/' QET_EXAMPLES_PATH = 'share/qelectrotech/examples/' QET_LICENSE_PATH = 'doc/qelectrotech/' - QET_MIME_XML_PATH = '../share/mime/application/' QET_MIME_DESKTOP_PATH = '../share/mimelnk/application/' QET_DESKTOP_PATH = 'share/applications/' QET_ICONS_PATH = 'share/icons/hicolor/' @@ -265,9 +263,6 @@ examples.files = examples/* copyright.path = $$join(INSTALL_PREFIX,,,$${QET_LICENSE_PATH}) copyright.files = LICENSE ELEMENTS.LICENSE CREDIT README ChangeLog -mime_xml.path = $$join(INSTALL_PREFIX,,,$${QET_MIME_XML_PATH}) -mime_xml.files = misc/x-qet-*.xml - mime_desktop.path = $$join(INSTALL_PREFIX,,,$${QET_MIME_DESKTOP_PATH}) mime_desktop.files = misc/x-qet-*.desktop