Rename share/FaceRecognizer.desktop -> share/org.Rabbit.FaceRecognize…

…r.desktop

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

debian/control

@@ -6,7 +6,7 @@ Section: main
 Priority: optional
 Maintainer: Kang Lin <[email protected]>
 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

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
     ;;
 

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
     ;;
 

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)

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%<project>-$1.tar.gz%" \
+   https://github.com/KangLin/FaceRecognizer/tags \
+   (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate

share/FaceRecognizer.desktop → 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

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