Skip to content

Commit f0142da

Browse files
scxscx
committed
Change Application ID
Fixes parnoldx#101 Replace hyphen-minus with underscore. See also: - elementary/houston#566 - flatpak/flatpak-builder#37 - parnoldx#67 - flathub/flathub#128
1 parent 989bff9 commit f0142da

13 files changed

Lines changed: 30 additions & 27 deletions

‎CMakeLists.txt‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
project (com.github.parnold-x.nasc)
1+
project (com.github.parnold_x.nasc)
22
cmake_minimum_required (VERSION 2.8)
33
cmake_policy (VERSION 2.6)
44

@@ -34,7 +34,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/config.vala.in ${CMAKE_SOURCE_DIR}/src/c
3434

3535
#GSettings
3636
include(GSettings)
37-
add_schema("data/com.github.parnold-x.nasc.gschema.xml")
37+
add_schema("data/com.github.parnold_x.nasc.gschema.xml")
3838

3939
set(NEEDED_PKG
4040
glib-2.0
@@ -97,27 +97,27 @@ OPTIONS
9797
include_directories(${CMAKE_BINARY_DIR})
9898
include_directories(${CMAKE_SOURCE_DIR})
9999
include_directories(${CMAKE_SOURCE_DIR}/libqalculatenasc)
100-
add_executable(com.github.parnold-x.nasc ${VALA_C})
101-
add_dependencies(com.github.parnold-x.nasc
100+
add_executable(com.github.parnold_x.nasc ${VALA_C})
101+
add_dependencies(com.github.parnold_x.nasc
102102
qalculatenasc)
103-
target_link_libraries(com.github.parnold-x.nasc
103+
target_link_libraries(com.github.parnold_x.nasc
104104
${QALCULATE_LIB_PATH}
105105
${DEPS_LIBRARIES}
106106
qalculatenasc
107107
-lcln)
108108

109-
install (TARGETS com.github.parnold-x.nasc RUNTIME DESTINATION bin)
109+
install (TARGETS com.github.parnold_x.nasc RUNTIME DESTINATION bin)
110110

111-
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.parnold-x.nasc.desktop DESTINATION share/applications)
112-
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.parnold-x.nasc.appdata.xml DESTINATION share/metainfo)
111+
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.parnold_x.nasc.desktop DESTINATION share/applications)
112+
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.parnold_x.nasc.appdata.xml DESTINATION share/metainfo)
113113
# install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/datasets/country.xml DESTINATION share/qalculate)
114114
# install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/datasets/datasetsNasc.xml DESTINATION share/qalculate)
115-
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/16/com.github.parnold-x.nasc.svg DESTINATION share/icons/hicolor/16x16/apps)
116-
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/24/com.github.parnold-x.nasc.svg DESTINATION share/icons/hicolor/24x24/apps)
117-
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/32/com.github.parnold-x.nasc.svg DESTINATION share/icons/hicolor/32x32/apps)
118-
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/48/com.github.parnold-x.nasc.svg DESTINATION share/icons/hicolor/48x48/apps)
119-
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/64/com.github.parnold-x.nasc.svg DESTINATION share/icons/hicolor/64x64/apps)
120-
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/128/com.github.parnold-x.nasc.svg DESTINATION share/icons/hicolor/128x128/apps)
115+
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/16/com.github.parnold_x.nasc.svg DESTINATION share/icons/hicolor/16x16/apps)
116+
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/24/com.github.parnold_x.nasc.svg DESTINATION share/icons/hicolor/24x24/apps)
117+
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/32/com.github.parnold_x.nasc.svg DESTINATION share/icons/hicolor/32x32/apps)
118+
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/48/com.github.parnold_x.nasc.svg DESTINATION share/icons/hicolor/48x48/apps)
119+
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/64/com.github.parnold_x.nasc.svg DESTINATION share/icons/hicolor/64x64/apps)
120+
install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/128/com.github.parnold_x.nasc.svg DESTINATION share/icons/hicolor/128x128/apps)
121121
install (FILES ${QALCULATE_LIB_PATH} DESTINATION ${CMAKE_INSTALL_LIBDIR})
122122
install (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/styles DESTINATION share/qalculate)
123123
#overwrite the standard libqalculate datasets.xml with a extended one

data/com.github.parnold-x.nasc.appdata.xml renamed to data/com.github.parnold_x.nasc.appdata.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- Copyright 2017 Peter Arnold <parnold1@gmail.com> -->
33
<component type="desktop">
4-
<id>com.github.parnold-x.nasc</id>
4+
<id>com.github.parnold_x.nasc</id>
55
<metadata_license>CC0</metadata_license>
66
<project_license>GPL-3.0+</project_license>
77
<name>NaSC</name>
@@ -10,9 +10,9 @@
1010
<p>It’s an app where you do maths like a normal person. It lets you type whatever you want and smartly figures out what is math and spits out an answer on the right pane. Then you can plug those answers in to future equations and if that answer changes, so does the equations it’s used in.</p>
1111
</description>
1212
<provides>
13-
<binary>com.github.parnold-x.nasc</binary>
13+
<binary>com.github.parnold_x.nasc</binary>
1414
</provides>
15-
<launchable type="desktop-id">com.github.parnold-x.nasc.desktop</launchable>
15+
<launchable type="desktop-id">com.github.parnold_x.nasc.desktop</launchable>
1616
<releases>
1717
<release version="0.5.1" date="2018-11-05">
1818
<description>

data/com.github.parnold-x.nasc.desktop renamed to data/com.github.parnold_x.nasc.desktop

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,18 @@ Type=Application
33
Name=NaSC
44
Comment=Do maths like a normal person
55
GenericName=Desktop calculator
6-
TryExec=com.github.parnold-x.nasc
7-
Exec=com.github.parnold-x.nasc
8-
Icon=com.github.parnold-x.nasc
6+
TryExec=com.github.parnold_x.nasc
7+
Exec=com.github.parnold_x.nasc
8+
Icon=com.github.parnold_x.nasc
99
StartupWMClass=nasc
1010
StartupNotify=true
1111
Terminal=false
1212
Categories=Utility;Calculator;Education;Math;
1313
Actions=AboutDialog;
1414

15+
X-Desktop-File-Install-Version=0.23
16+
X-Flatpak-RenamedFrom=nasc.desktop;com.github.parnold-x.nasc.desktop;
17+
1518
[Desktop Action AboutDialog]
1619
Name=About NaSC
17-
Exec=com.github.parnold-x.nasc --about
20+
Exec=com.github.parnold_x.nasc --about

data/com.github.parnold-x.nasc.gschema.xml renamed to data/com.github.parnold_x.nasc.gschema.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<schemalist>
2-
<schema id="com.github.parnold-x.nasc" path="/com/github/parnold-x/nasc/" gettext-domain="nasc">
2+
<schema id="com.github.parnold_x.nasc" path="/com/github/parnold-x/nasc/" gettext-domain="nasc">
33

44
<key name="show-tutorial" type="b">
55
<default>true</default>

icons/128/com.github.parnold-x.nasc.svg renamed to icons/128/com.github.parnold_x.nasc.svg

File renamed without changes.

icons/16/com.github.parnold-x.nasc.svg renamed to icons/16/com.github.parnold_x.nasc.svg

File renamed without changes.

icons/24/com.github.parnold-x.nasc.svg renamed to icons/24/com.github.parnold_x.nasc.svg

File renamed without changes.

icons/32/com.github.parnold-x.nasc.svg renamed to icons/32/com.github.parnold_x.nasc.svg

File renamed without changes.

icons/48/com.github.parnold-x.nasc.svg renamed to icons/48/com.github.parnold_x.nasc.svg

File renamed without changes.

icons/64/com.github.parnold-x.nasc.svg renamed to icons/64/com.github.parnold_x.nasc.svg

File renamed without changes.

0 commit comments

Comments
 (0)