diff --git a/src/jyut-dict/jyut-dict.pro b/src/jyut-dict/jyut-dict.pro index e32aa7e8..9888ae1b 100644 --- a/src/jyut-dict/jyut-dict.pro +++ b/src/jyut-dict/jyut-dict.pro @@ -110,18 +110,23 @@ win32: { RC_ICONS = resources/icon/icon.ico } -#unix:!macx { -# # Move files to appropriate locations on desktop to install the program -# binfile.files += $$system_path($$OUT_PWD)/"Jyut Dictionary" -# binfile.path = /opt/jyut-dict/ -# shortcutfiles.files += platform/linux/jyut-dict.desktop -# shortcutfiles.path = /usr/share/applications/ -# icon.files += resources/icon/variant_3/icon.svg -# icon.path = /opt/jyut-dict/ -# INSTALLS += binfile -# INSTALLS += shortcutfiles -# INSTALLS += icon -#} +unix:!macx { + # Move files to appropriate locations on desktop to install the program + binfile.extra = cp \"$$system_path($$OUT_PWD)/Jyut Dictionary\" $$system_path($$OUT_PWD)/jyut-dict + binfile.files += $$system_path($$OUT_PWD)/jyut-dict + binfile.path = /usr/bin/ + binfile.CONFIG += no_check_exist + dictfile.files += resources/db/eng.db + dictfile.path = /usr/share/jyut-dict/dictionaries/ + shortcutfiles.files += platform/linux/jyut-dict.desktop + shortcutfiles.path = /usr/share/applications/ + icon.files += resources/icon/jyut-dict.svg + icon.path = /usr/share/icons/hicolor/scalable/apps/ + INSTALLS += binfile + INSTALLS += dictfile + INSTALLS += shortcutfiles + INSTALLS += icon +} unix|win32:!macx { # Copy dictionary database to the build directory diff --git a/src/jyut-dict/logic/search/sqldatabasemanager.cpp b/src/jyut-dict/logic/search/sqldatabasemanager.cpp index 8fa9f308..f582dbf8 100644 --- a/src/jyut-dict/logic/search/sqldatabasemanager.cpp +++ b/src/jyut-dict/logic/search/sqldatabasemanager.cpp @@ -35,8 +35,7 @@ void SQLDatabaseManager::openEnglishDatabase() + "/Dictionaries/eng.db"}; #else QFileInfo bundleFile{QCoreApplication::applicationDirPath() + "/eng.db"}; - QFileInfo localFile{QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) - + "/dictionaries/eng.db"}; + QFileInfo localFile{"/usr/share/jyut-dict/dictionaries/eng.db"}; #endif #ifdef PORTABLE diff --git a/src/jyut-dict/platform/linux/create-deb.sh b/src/jyut-dict/platform/linux/create-deb.sh new file mode 100755 index 00000000..65184050 --- /dev/null +++ b/src/jyut-dict/platform/linux/create-deb.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +cd ../.. + +tar -cvzf ../jyut-dict_0.19.0614.tar.gz * --overwrite + +cd ../ + +rm -rf jyut-dict_0.19.0614 +mkdir jyut-dict_0.19.0614 + +cd jyut-dict_0.19.0614 + +tar -xvzf ../jyut-dict_0.19.0614.tar.gz --overwrite + +cp -r ../jyut-dict/platform/linux/debian ./debian + +rm ./eng.db +rm ./jyut-dict + +dh_make -c mit -s -f ../jyut-dict_0.19.0614.tar.gz -p jyut-dict_0.19.0614 + +debuild \ No newline at end of file diff --git a/src/jyut-dict/platform/linux/debian/.debhelper/generated/jyutdict/installed-by-dh_installdocs b/src/jyut-dict/platform/linux/debian/.debhelper/generated/jyutdict/installed-by-dh_installdocs deleted file mode 100644 index e69de29b..00000000 diff --git a/src/jyut-dict/platform/linux/debian/.debhelper/jyutdict/dbgsym-root/DEBIAN/control b/src/jyut-dict/platform/linux/debian/.debhelper/jyutdict/dbgsym-root/DEBIAN/control deleted file mode 100644 index 3ce24548..00000000 --- a/src/jyut-dict/platform/linux/debian/.debhelper/jyutdict/dbgsym-root/DEBIAN/control +++ /dev/null @@ -1,13 +0,0 @@ -Package: jyutdict-dbgsym -Package-Type: ddeb -Source: jyutdict -Version: 0.19.0614-1 -Auto-Built-Package: debug-symbols -Architecture: amd64 -Maintainer: Aaron -Installed-Size: 4389 -Depends: jyutdict (= 0.19.0614-1) -Section: debug -Priority: optional -Description: debug symbols for jyutdict -Build-Ids: 993168fc72acee19333e11fd622690a1a088c196 diff --git a/src/jyut-dict/platform/linux/debian/.debhelper/jyutdict/dbgsym-root/DEBIAN/md5sums b/src/jyut-dict/platform/linux/debian/.debhelper/jyutdict/dbgsym-root/DEBIAN/md5sums deleted file mode 100644 index e052d1b6..00000000 --- a/src/jyut-dict/platform/linux/debian/.debhelper/jyutdict/dbgsym-root/DEBIAN/md5sums +++ /dev/null @@ -1 +0,0 @@ -eb54142ea326e4aae4194063be299b0c usr/lib/debug/.build-id/99/3168fc72acee19333e11fd622690a1a088c196.debug diff --git a/src/jyut-dict/platform/linux/debian/.debhelper/jyutdict/dbgsym-root/usr/share/doc/jyutdict-dbgsym b/src/jyut-dict/platform/linux/debian/.debhelper/jyutdict/dbgsym-root/usr/share/doc/jyutdict-dbgsym deleted file mode 120000 index 729adea8..00000000 --- a/src/jyut-dict/platform/linux/debian/.debhelper/jyutdict/dbgsym-root/usr/share/doc/jyutdict-dbgsym +++ /dev/null @@ -1 +0,0 @@ -jyutdict \ No newline at end of file diff --git a/src/jyut-dict/platform/linux/debian/changelog b/src/jyut-dict/platform/linux/debian/changelog index aedfcb31..fdb3b099 100644 --- a/src/jyut-dict/platform/linux/debian/changelog +++ b/src/jyut-dict/platform/linux/debian/changelog @@ -1,5 +1,5 @@ -jyutdict (0.19.0614-1) unstable; urgency=medium +jyut-dict (0.19.0614-1) bionic; urgency=medium * Initial release - -- Aaron Tan Mon, 17 Jun 2019 00:48:23 -0400 + -- Aaron Tan Fri, 14 Jun 2019 00:48:23 -0400 diff --git a/src/jyut-dict/platform/linux/debian/control b/src/jyut-dict/platform/linux/debian/control index e4eeba2a..81c2bbfa 100644 --- a/src/jyut-dict/platform/linux/debian/control +++ b/src/jyut-dict/platform/linux/debian/control @@ -1,14 +1,14 @@ -Source: jyutdict +Source: jyut-dict Section: utils Priority: optional Maintainer: Aaron Build-Depends: debhelper (>= 10), libqt5core5a (>= 5.9.0), libqt5gui5 (>= 5.9.0), libqt5network5 (>= 5.9.0), libqt5widgets5 (>= 5.9.0) Standards-Version: 4.1.2 Homepage: https://github.com/aaronhktan/jyut-dict -#Vcs-Git: https://anonscm.debian.org/git/collab-maint/jyutdict.git -#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/jyutdict.git +#Vcs-Git: https://anonscm.debian.org/git/collab-maint/jyut-dict.git +#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/jyut-dict.git -Package: jyutdict +Package: jyut-dict Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: Search words in Cantonese and Mandarin! diff --git a/src/jyut-dict/platform/linux/debian/copyright b/src/jyut-dict/platform/linux/debian/copyright index 8811b4ec..f6bc9a48 100644 --- a/src/jyut-dict/platform/linux/debian/copyright +++ b/src/jyut-dict/platform/linux/debian/copyright @@ -6,10 +6,6 @@ Files: * Copyright: 2019 Aaron Tan License: MIT -Files: debian/* -Copyright: 2019 Aaron -License: MIT - License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -28,8 +24,3 @@ License: MIT LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. -# Please avoid picking licenses with terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/src/jyut-dict/platform/linux/debian/files b/src/jyut-dict/platform/linux/debian/files index a17ba769..bd51434a 100644 --- a/src/jyut-dict/platform/linux/debian/files +++ b/src/jyut-dict/platform/linux/debian/files @@ -1,3 +1,3 @@ -jyutdict-dbgsym_0.19.0614-1_amd64.ddeb debug optional -jyutdict_0.19.0614-1_amd64.buildinfo utils optional -jyutdict_0.19.0614-1_amd64.deb utils optional +jyut-dict-dbgsym_0.19.0614-1_amd64.ddeb debug optional +jyut-dict_0.19.0614-1_amd64.buildinfo utils optional +jyut-dict_0.19.0614-1_amd64.deb utils optional diff --git a/src/jyut-dict/platform/linux/debian/jyutdict.cron.d.ex b/src/jyut-dict/platform/linux/debian/jyutdict.cron.d.ex index 32e77b36..de105575 100644 --- a/src/jyut-dict/platform/linux/debian/jyutdict.cron.d.ex +++ b/src/jyut-dict/platform/linux/debian/jyutdict.cron.d.ex @@ -1,4 +1,4 @@ # -# Regular cron jobs for the jyutdict package +# Regular cron jobs for the jyut-dict package # -0 4 * * * root [ -x /usr/bin/jyutdict_maintenance ] && /usr/bin/jyutdict_maintenance +0 4 * * * root [ -x /usr/bin/jyut-dict_maintenance ] && /usr/bin/jyut-dict_maintenance diff --git a/src/jyut-dict/platform/linux/debian/jyutdict.doc-base.EX b/src/jyut-dict/platform/linux/debian/jyutdict.doc-base.EX index 665538b2..c60d90ef 100644 --- a/src/jyut-dict/platform/linux/debian/jyutdict.doc-base.EX +++ b/src/jyut-dict/platform/linux/debian/jyutdict.doc-base.EX @@ -1,20 +1,20 @@ -Document: jyutdict -Title: Debian jyutdict Manual +Document: jyut-dict +Title: Debian jyut-dict Manual Author: -Abstract: This manual describes what jyutdict is +Abstract: This manual describes what jyut-dict is and how it can be used to manage online manuals on Debian systems. Section: unknown Format: debiandoc-sgml -Files: /usr/share/doc/jyutdict/jyutdict.sgml.gz +Files: /usr/share/doc/jyut-dict/jyut-dict.sgml.gz Format: postscript -Files: /usr/share/doc/jyutdict/jyutdict.ps.gz +Files: /usr/share/doc/jyut-dict/jyut-dict.ps.gz Format: text -Files: /usr/share/doc/jyutdict/jyutdict.text.gz +Files: /usr/share/doc/jyut-dict/jyut-dict.text.gz Format: HTML -Index: /usr/share/doc/jyutdict/html/index.html -Files: /usr/share/doc/jyutdict/html/*.html +Index: /usr/share/doc/jyut-dict/html/index.html +Files: /usr/share/doc/jyut-dict/html/*.html diff --git a/src/jyut-dict/platform/linux/debian/jyutdict/DEBIAN/control b/src/jyut-dict/platform/linux/debian/jyutdict/DEBIAN/control deleted file mode 100644 index e3328004..00000000 --- a/src/jyut-dict/platform/linux/debian/jyutdict/DEBIAN/control +++ /dev/null @@ -1,15 +0,0 @@ -Package: jyutdict -Version: 0.19.0614-1 -Architecture: amd64 -Maintainer: Aaron -Installed-Size: 30749 -Depends: libc6 (>= 2.14), libgcc1 (>= 1:3.0), libqt5core5a (>= 5.9.0), libqt5gui5 (>= 5.9.0), libqt5network5 (>= 5.9.0), libqt5sql5 (>= 5.9.0), libqt5widgets5 (>= 5.9.0), libstdc++6 (>= 5.2) -Section: utils -Priority: optional -Homepage: https://github.com/aaronhktan/jyut-dict -Description: Search words in Cantonese and Mandarin! - This application allows you to search for definitions - of words in Cantonese or Mandarin, from the open-source - CC-CEDICT and CC-CANTO dictionaries. It accepts - Simplified Chinese, Traditional Chinese, Jyutping, Pinyin, or - English as input. diff --git a/src/jyut-dict/platform/linux/debian/jyutdict/DEBIAN/md5sums b/src/jyut-dict/platform/linux/debian/jyutdict/DEBIAN/md5sums deleted file mode 100644 index 9ef5e6a9..00000000 --- a/src/jyut-dict/platform/linux/debian/jyutdict/DEBIAN/md5sums +++ /dev/null @@ -1,7 +0,0 @@ -129a8e204a0cabd90d92503f3109a4d0 opt/jyut-dict/Jyut Dictionary -8abd5a229cb1ea75807001d3b9f7192f opt/jyut-dict/eng.db -a58079499419e8f26d48684df88f3265 opt/jyut-dict/icon.svg -7520bc39972902e55365dfe753e6d2d6 usr/share/applications/jyut-dict.desktop -d9ad3a8c064ec7dbc98286880e0305d7 usr/share/doc/jyutdict/README.Debian -c2a257648057a05b0a41dc6e8622ac8a usr/share/doc/jyutdict/changelog.Debian.gz -d1636eb695e853d3e35104dbb9934fdf usr/share/doc/jyutdict/copyright diff --git a/src/jyut-dict/platform/linux/debian/jyutdict/opt/jyut-dict/Jyut Dictionary b/src/jyut-dict/platform/linux/debian/jyutdict/opt/jyut-dict/Jyut Dictionary deleted file mode 100755 index fca7d3ab..00000000 Binary files a/src/jyut-dict/platform/linux/debian/jyutdict/opt/jyut-dict/Jyut Dictionary and /dev/null differ diff --git a/src/jyut-dict/platform/linux/debian/jyutdict/opt/jyut-dict/eng.db b/src/jyut-dict/platform/linux/debian/jyutdict/opt/jyut-dict/eng.db deleted file mode 100644 index 96e90c57..00000000 Binary files a/src/jyut-dict/platform/linux/debian/jyutdict/opt/jyut-dict/eng.db and /dev/null differ diff --git a/src/jyut-dict/platform/linux/debian/jyutdict/usr/share/applications/jyut-dict.desktop b/src/jyut-dict/platform/linux/debian/jyutdict/usr/share/applications/jyut-dict.desktop deleted file mode 100644 index c82bb261..00000000 --- a/src/jyut-dict/platform/linux/debian/jyutdict/usr/share/applications/jyut-dict.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Version=0.19.0614 -Type=Application -Name=Jyut Dictionary -GenericName=Cantonese Dictionary -Comment=Look up definitions for words in Cantonese or Mandarin -Exec=/usr/opt/jyut-dict -Terminal=false -Icon=/usr/share/jyut-dict/icon.svg -Keywords=Jyut;Dictionary;Cantonese;Mandarin;Chinese;Words; -Categories=Dictionary;Office;TextTools;Education;Utilities -StartupNotify=true diff --git a/src/jyut-dict/platform/linux/debian/jyutdict/usr/share/doc/jyutdict/README.Debian b/src/jyut-dict/platform/linux/debian/jyutdict/usr/share/doc/jyutdict/README.Debian deleted file mode 100644 index 77bf7a87..00000000 --- a/src/jyut-dict/platform/linux/debian/jyutdict/usr/share/doc/jyutdict/README.Debian +++ /dev/null @@ -1,6 +0,0 @@ -jyutdict for Debian ------------------- - - - - -- Aaron Mon, 17 Jun 2019 01:39:58 -0400 diff --git a/src/jyut-dict/platform/linux/debian/jyutdict/usr/share/doc/jyutdict/changelog.Debian.gz b/src/jyut-dict/platform/linux/debian/jyutdict/usr/share/doc/jyutdict/changelog.Debian.gz deleted file mode 100644 index 3523c056..00000000 Binary files a/src/jyut-dict/platform/linux/debian/jyutdict/usr/share/doc/jyutdict/changelog.Debian.gz and /dev/null differ diff --git a/src/jyut-dict/platform/linux/debian/jyutdict/usr/share/doc/jyutdict/copyright b/src/jyut-dict/platform/linux/debian/jyutdict/usr/share/doc/jyutdict/copyright deleted file mode 100644 index 4f8bb4d6..00000000 --- a/src/jyut-dict/platform/linux/debian/jyutdict/usr/share/doc/jyutdict/copyright +++ /dev/null @@ -1,34 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: jyutdict -Source: - -Files: * -Copyright: - -License: GPL-2.0+ - -Files: debian/* -Copyright: 2019 Aaron -License: GPL-2.0+ - -License: GPL-2.0+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see - . - On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. -# Please avoid picking licenses with terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. diff --git a/src/jyut-dict/platform/linux/debian/manpage.xml.ex b/src/jyut-dict/platform/linux/debian/manpage.xml.ex index e93724a2..ef998ea6 100644 --- a/src/jyut-dict/platform/linux/debian/manpage.xml.ex +++ b/src/jyut-dict/platform/linux/debian/manpage.xml.ex @@ -56,9 +56,9 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/ - - - + + + ]> diff --git a/src/jyut-dict/platform/linux/debian/menu.ex b/src/jyut-dict/platform/linux/debian/menu.ex index 08b6d5fd..a1402236 100644 --- a/src/jyut-dict/platform/linux/debian/menu.ex +++ b/src/jyut-dict/platform/linux/debian/menu.ex @@ -1,2 +1,2 @@ -?package(jyutdict):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\ - title="jyutdict" command="/usr/bin/jyutdict" +?package(jyut-dict):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\ + title="jyut-dict" command="/usr/bin/jyut-dict" diff --git a/src/jyut-dict/platform/linux/debian/postinst.ex b/src/jyut-dict/platform/linux/debian/postinst.ex index 0f8690f9..23ea8a05 100644 --- a/src/jyut-dict/platform/linux/debian/postinst.ex +++ b/src/jyut-dict/platform/linux/debian/postinst.ex @@ -1,5 +1,5 @@ #!/bin/sh -# postinst script for jyutdict +# postinst script for jyut-dict # # see: dh_installdeb(1) diff --git a/src/jyut-dict/platform/linux/debian/postrm.ex b/src/jyut-dict/platform/linux/debian/postrm.ex index 43b2b0a6..a5752307 100644 --- a/src/jyut-dict/platform/linux/debian/postrm.ex +++ b/src/jyut-dict/platform/linux/debian/postrm.ex @@ -1,5 +1,5 @@ #!/bin/sh -# postrm script for jyutdict +# postrm script for jyut-dict # # see: dh_installdeb(1) diff --git a/src/jyut-dict/platform/linux/debian/preinst.ex b/src/jyut-dict/platform/linux/debian/preinst.ex index 3c36ac6b..a3ffc2a1 100644 --- a/src/jyut-dict/platform/linux/debian/preinst.ex +++ b/src/jyut-dict/platform/linux/debian/preinst.ex @@ -1,5 +1,5 @@ #!/bin/sh -# preinst script for jyutdict +# preinst script for jyut-dict # # see: dh_installdeb(1) diff --git a/src/jyut-dict/platform/linux/debian/prerm.ex b/src/jyut-dict/platform/linux/debian/prerm.ex index f1ad8a2d..984814d6 100644 --- a/src/jyut-dict/platform/linux/debian/prerm.ex +++ b/src/jyut-dict/platform/linux/debian/prerm.ex @@ -1,5 +1,5 @@ #!/bin/sh -# prerm script for jyutdict +# prerm script for jyut-dict # # see: dh_installdeb(1) diff --git a/src/jyut-dict/platform/linux/debian/rules b/src/jyut-dict/platform/linux/debian/rules index 18b38e75..acc0905f 100755 --- a/src/jyut-dict/platform/linux/debian/rules +++ b/src/jyut-dict/platform/linux/debian/rules @@ -1,18 +1,4 @@ #!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#export DH_VERBOSE = 1 - - -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all - -# see ENVIRONMENT in dpkg-buildflags(1) -# package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - %: dh $@ @@ -20,10 +6,3 @@ override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info - - -# dh_make generated override targets -# This is example for Cmake (See https://bugs.debian.org/641051 ) -#override_dh_auto_configure: -# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) - diff --git a/src/jyut-dict/platform/linux/debian/watch.ex b/src/jyut-dict/platform/linux/debian/watch.ex index 6a1b89ab..6dac4115 100644 --- a/src/jyut-dict/platform/linux/debian/watch.ex +++ b/src/jyut-dict/platform/linux/debian/watch.ex @@ -11,28 +11,28 @@ version=4 # HTTP site (basic) #http://example.com/downloads.html \ -# files/jyutdict-([\d\.]+)\.tar\.gz debian uupdate +# files/jyut-dict-([\d\.]+)\.tar\.gz debian uupdate # Uncomment to examine an FTP server -#ftp://ftp.example.com/pub/jyutdict-(.*)\.tar\.gz debian uupdate +#ftp://ftp.example.com/pub/jyut-dict-(.*)\.tar\.gz debian uupdate # SourceForge hosted projects -# http://sf.net/jyutdict/ jyutdict-(.*)\.tar\.gz debian uupdate +# http://sf.net/jyut-dict/ jyut-dict-(.*)\.tar\.gz debian uupdate # GitHub hosted projects #opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%-$1.tar.gz%" \ -# https://github.com//jyutdict/tags \ +# https://github.com//jyut-dict/tags \ # (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate # PyPI -# https://pypi.debian.net/jyutdict/jyutdict-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) +# https://pypi.debian.net/jyut-dict/jyut-dict-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) # Direct Git -# opts="mode=git" http://git.example.com/jyutdict.git \ +# opts="mode=git" http://git.example.com/jyut-dict.git \ # refs/tags/v([\d\.]+) debian uupdate # Uncomment to find new files on GooglePages -# http://example.googlepages.com/foo.html jyutdict-(.*)\.tar\.gz +# http://example.googlepages.com/foo.html jyut-dict-(.*)\.tar\.gz diff --git a/src/jyut-dict/platform/linux/jyut-dict.desktop b/src/jyut-dict/platform/linux/jyut-dict.desktop index c82bb261..a0074363 100644 --- a/src/jyut-dict/platform/linux/jyut-dict.desktop +++ b/src/jyut-dict/platform/linux/jyut-dict.desktop @@ -4,9 +4,9 @@ Type=Application Name=Jyut Dictionary GenericName=Cantonese Dictionary Comment=Look up definitions for words in Cantonese or Mandarin -Exec=/usr/opt/jyut-dict +Exec=/usr/bin/jyut-dict Terminal=false -Icon=/usr/share/jyut-dict/icon.svg +Icon=/usr/share/icons/hicolor/scalable/apps/jyut-dict.svg Keywords=Jyut;Dictionary;Cantonese;Mandarin;Chinese;Words; -Categories=Dictionary;Office;TextTools;Education;Utilities +Categories=Dictionary;Office;TextTools;Education;Utility StartupNotify=true diff --git a/src/jyut-dict/platform/linux/debian/jyutdict/opt/jyut-dict/icon.svg b/src/jyut-dict/resources/icon/jyut-dict.svg similarity index 100% rename from src/jyut-dict/platform/linux/debian/jyutdict/opt/jyut-dict/icon.svg rename to src/jyut-dict/resources/icon/jyut-dict.svg