From 9305f9f3fa11ced3e508f6f79f6e88a1978a7914 Mon Sep 17 00:00:00 2001 From: Kang Lin Date: Thu, 30 May 2024 16:20:05 +0800 Subject: [PATCH] Rename share/FaceRecognizer.desktop -> share/org.Rabbit.FaceRecognizer.desktop --- App/CMakeLists.txt | 2 +- debian/README | 6 ------ debian/README.Debian | 6 ------ debian/README.source | 10 ---------- debian/control | 2 +- debian/postinst | 14 +++++++------- debian/postrm | 4 ++-- debian/rules | 2 +- debian/watch | 7 +++++++ ...desktop => org.Rabbit.FaceRecognizer.desktop} | 2 +- test/test_linux.sh | 16 ++++++---------- 11 files changed, 26 insertions(+), 45 deletions(-) delete mode 100644 debian/README delete mode 100644 debian/README.Debian delete mode 100644 debian/README.source create mode 100644 debian/watch rename share/{FaceRecognizer.desktop => org.Rabbit.FaceRecognizer.desktop} (93%) diff --git a/App/CMakeLists.txt b/App/CMakeLists.txt index ab9ed7c..8243f92 100644 --- a/App/CMakeLists.txt +++ b/App/CMakeLists.txt @@ -88,7 +88,7 @@ IF(WIN32) ENDIF() if(UNIX AND NOT ANDROID) - INSTALL(FILES ${CMAKE_SOURCE_DIR}/share/FaceRecognizer.desktop + INSTALL(FILES ${CMAKE_SOURCE_DIR}/share/org.Rabbit.FaceRecognizer.desktop DESTINATION "share/applications" COMPONENT Application) INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/share/FaceRecognizer.sh diff --git a/debian/README b/debian/README deleted file mode 100644 index a8ef878..0000000 --- a/debian/README +++ /dev/null @@ -1,6 +0,0 @@ -The Debian Package FaceRecognizer ----------------------------- - -Comments regarding the Package - - -- Kang Lin Sat, 20 Apr 2019 19:53:02 -0700 diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index c9d88cb..0000000 --- a/debian/README.Debian +++ /dev/null @@ -1,6 +0,0 @@ -FaceRecognizer for Debian ------------------------ - - - - -- Kang Lin Sat, 20 Apr 2019 19:53:02 -0700 diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 205fa7a..0000000 --- a/debian/README.source +++ /dev/null @@ -1,10 +0,0 @@ -FaceRecognizer for Debian ------------------------ - - - - - - -- Kang Lin Sat, 20 Apr 2019 19:53:02 -0700 - diff --git a/debian/control b/debian/control index e598c5a..46bea39 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Section: main Priority: optional Maintainer: Kang Lin Build-Depends: debhelper (>=13~), debhelper-compat (=13), fakeroot, cmake, - libssl-dev, rabbitcommon-dev (>=2), + libssl-dev, rabbitcommon-dev (>=2.2.4), qt6-tools-dev, qt6-tools-dev-tools, qt6-base-dev, qt6-base-dev-tools, qt6-l10n-tools, qt6-translations-l10n, qt6-scxml-dev, qt6-webengine-dev, qt6-webengine-dev-tools diff --git a/debian/postinst b/debian/postinst index 64b8fe1..bb4dce4 100644 --- a/debian/postinst +++ b/debian/postinst @@ -27,14 +27,14 @@ case "$1" in ln -s $INSTALL_ROOT/log $INSTALL_ROOT/bin/log fi - if [ ! -f /usr/share/applications/FaceRecognizer.desktop ]; then - ln -s $INSTALL_ROOT/share/applications/FaceRecognizer.desktop /usr/share/applications/FaceRecognizer.desktop + if [ ! -f /usr/share/applications/org.Rabbit.FaceRecognizer.desktop ]; then + ln -s $INSTALL_ROOT/share/applications/org.Rabbit.FaceRecognizer.desktop /usr/share/applications/org.Rabbit.FaceRecognizer.desktop fi - if [ ! -f /usr/share/pixmaps/FaceRecognizer.png ]; then + if [ ! -f /usr/share/pixmaps/org.Rabbit.FaceRecognizer.png ]; then if [ ! -d /usr/share/pixmaps ]; then mkdir -p /usr/share/pixmaps fi - ln -s $INSTALL_ROOT/share/pixmaps/FaceRecognizer.png /usr/share/pixmaps/FaceRecognizer.png + ln -s $INSTALL_ROOT/share/pixmaps/FaceRecognizer.png /usr/share/pixmaps/org.Rabbit.FaceRecognizer.png fi #echo "/$INSTALL_ROOT/lib" > /etc/ld.so.conf.d/FaceRecognizer.conf #echo "$INSTALL_ROOT/bin" >> /etc/ld.so.conf.d/FaceRecognizer.conf @@ -46,9 +46,9 @@ case "$1" in ;; abort-upgrade|abort-remove|abort-deconfigure) - rm -fr /usr/share/applications/FaceRecognizer.desktop - rm -fr /etc/ld.so.conf.d/FaceRecognizer.conf - rm -fr /usr/share/pixmaps/FaceRecognizer.png + rm -fr /usr/share/applications/org.Rabbit.FaceRecognizer.desktop + #rm -fr /etc/ld.so.conf.d/FaceRecognizer.conf + rm -fr /usr/share/pixmaps/org.Rabbit.FaceRecognizer.png ldconfig ;; diff --git a/debian/postrm b/debian/postrm index 7c62b0b..6d229bf 100644 --- a/debian/postrm +++ b/debian/postrm @@ -21,9 +21,9 @@ set -e case "$1" in purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - rm -fr /usr/share/applications/FaceRecognizer.desktop + rm -fr /usr/share/applications/org.Rabbit.FaceRecognizer.desktop rm -fr /etc/ld.so.conf.d/FaceRecognizer.conf - rm -fr /usr/share/pixmaps/FaceRecognizer.png + rm -fr /usr/share/pixmaps/org.Rabbit.FaceRecognizer.png ldconfig ;; diff --git a/debian/rules b/debian/rules index f8eafab..718513d 100755 --- a/debian/rules +++ b/debian/rules @@ -89,7 +89,7 @@ override_dh_auto_install: --prefix $(PACKAGE_DIR)/opt/FaceRecognizer override_dh_shlibdeps: - dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -l`pwd`/$(PACKAGE_DIR)/opt/FaceRecognizer/lib:`pwd`/$(PACKAGE_DIR)/opt/FaceRecognizer/lib/`uname -m`-linux-gnu:$(LIB_PARAS) + dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -l`pwd`/$(BUILD_DIR)/lib:$(LIB_PARAS) override_dh_builddeb: dh_builddeb --package=facerecognizer -P$(PACKAGE_DIR) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..4b235ff --- /dev/null +++ b/debian/watch @@ -0,0 +1,7 @@ +# Compulsory line, this is a version 4 file +version=4 + +# GitHub hosted projects +opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%-$1.tar.gz%" \ + https://github.com/KangLin/FaceRecognizer/tags \ + (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate diff --git a/share/FaceRecognizer.desktop b/share/org.Rabbit.FaceRecognizer.desktop similarity index 93% rename from share/FaceRecognizer.desktop rename to share/org.Rabbit.FaceRecognizer.desktop index 5fd11a2..6b98df0 100644 --- a/share/FaceRecognizer.desktop +++ b/share/org.Rabbit.FaceRecognizer.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Icon=FaceRecognizer +Icon=org.Rabbit.FaceRecognizer Exec=/opt/FaceRecognizer/bin/FaceRecognizer.sh Path=/opt/FaceRecognizer diff --git a/test/test_linux.sh b/test/test_linux.sh index ad030a4..bb5c90d 100755 --- a/test/test_linux.sh +++ b/test/test_linux.sh @@ -8,13 +8,13 @@ if [ -n "$1" ]; then PROJECT_NAME=$1 fi -if [ ! -f /opt/${PROJECT_NAME}/share/applications/${PROJECT_NAME}.desktop ]; then - echo "There are not /opt/share/applications/${PROJECT_NAME}.desktop" +if [ ! -f /opt/${PROJECT_NAME}/share/applications/org.Rabbit.${PROJECT_NAME}.desktop ]; then + echo "There are not /opt/share/applications/org.Rabbit.${PROJECT_NAME}.desktop" EXIT_CODE=$[EXIT_CODE+1] fi -if [ ! -f /usr/share/applications/${PROJECT_NAME}.desktop ]; then - echo "There are not /usr/share/applications/${PROJECT_NAME}.desktop" +if [ ! -f /usr/share/applications/org.Rabbit.${PROJECT_NAME}.desktop ]; then + echo "There are not /usr/share/applications/org.Rabbit.${PROJECT_NAME}.desktop" EXIT_CODE=$[EXIT_CODE+1] fi @@ -23,14 +23,10 @@ if [ ! -f /opt/${PROJECT_NAME}/share/pixmaps/${PROJECT_NAME}.png ]; then EXIT_CODE=$[EXIT_CODE+1] fi -if [ ! -f /usr/share/pixmaps/${PROJECT_NAME}.png ]; then - echo "There are not /usr/share/pixmaps/${PROJECT_NAME}.png" +if [ ! -f /usr/share/pixmaps/org.Rabbit.${PROJECT_NAME}.png ]; then + echo "There are not /usr/share/pixmaps/org.Rabbit.${PROJECT_NAME}.png" EXIT_CODE=$[EXIT_CODE+1] fi -if [ ! -f /etc/ld.so.conf.d/${PROJECT_NAME}.conf ]; then - echo "There are not /etc/ld.so.conf.d/${PROJECT_NAME}.conf" - EXIT_CODE=$[EXIT_CODE+1] -fi exit $EXIT_CODE