Fix from Dino to Dino+ in CI

Signed-off-by: Maxim Logaev <maxlogaev@proton.me>

.github/workflows/build-win64.yml

@@ -17,26 +17,26 @@ jobs:
       - name: Install build-dependencies
         run: |
           msys2 -c './build-win64.sh --prepare'
-      - name: Build Dino (Meson, without saving)
+      - name: Build Dino+ (Meson, without saving)
         run: |
           msys2 -c './build-win64.sh -s meson -c -b -t -w'
-      - name: Build Dino (CMake)
+      - name: Build Dino+ (CMake)
         run: |
           msys2 -c './build-win64.sh -s cmake -c -b -t -i'
-      - name: Build Dino installer
+      - name: Build Dino+ installer
         run: |
           msys2 -c './build-win64.sh --build-installer'
-      - name: Upload Dino installer
+      - name: Upload Dino+ installer
         uses: actions/upload-artifact@v4
         with:
-          name: dino-installer
+          name: dino-plus-installer
           path: windows-installer/dino-installer.exe
-      - name: Release Dino installer
+      - name: Release Dino+ installer
         if: ${{ github.ref_type == 'tag' }}
         uses: svenstaro/upload-release-action@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: windows-installer/dino-installer.exe
-          asset_name: dino-installer.exe
+          asset_name: dino-plus-installer.exe
           tag: ${{ github.ref }}
-          release_name: Dino ${{ github.ref_name }}
+          release_name: Dino+ ${{ github.ref_name }}

.github/workflows/build.yml

@@ -10,9 +10,26 @@ jobs:
       - run: sudo apt-get update
       - run: sudo apt-get remove libunwind-14-dev
       - run: sudo apt-get install -y build-essential gettext cmake valac libgee-0.8-dev libsqlite3-dev libgtk-4-dev libnotify-dev libgpgme-dev libsoup2.4-dev libgcrypt20-dev libqrencode-dev libnice-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libsrtp2-dev libwebrtc-audio-processing-dev libadwaita-1-dev libsignal-protocol-c-dev libcanberra-dev
-      - run: ./configure --with-tests --with-libsignal-in-tree
-      - run: make
-      - run: make test
+      - run: ./configure --release --no-debug --with-tests --enable-plugin=notification-sound --prefix=/usr
+      - run: cmake --build build
+      - run: cmake --build build --target=test
+      - name: Build DEB-package
+        run: cd build && cpack -G DEB
+      - name: Upload Dino+ DEB-package
+        uses: actions/upload-artifact@v4
+        with:
+          name: dino-plus-deb
+          path: _packages/dino-plus.deb
+      - name: Release Dino+ DEB-package
+        if: ${{ github.ref_type == 'tag' }}
+        uses: svenstaro/upload-release-action@2.9.0
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: _packages/dino-plus.deb
+          asset_name: dino-plus.deb
+          tag: ${{ github.ref }}
+          release_name: Dino+ ${{ github.ref_name }}
+
   build-meson:
     runs-on: ubuntu-22.04
     steps:
@@ -40,7 +57,7 @@ jobs:
         with:
           manifest-path: im.dino.Dino.json
           build-bundle: true
-      - name: Release Dino installer
+      - name: Release Dino+ flatpak
         if: ${{ github.ref_type == 'tag' }}
         uses: svenstaro/upload-release-action@2.9.0
         with:
@@ -48,4 +65,4 @@ jobs:
           file: app.flatpak
           asset_name: app.flatpak
           tag: ${{ github.ref }}
-          release_name: Dino ${{ github.ref_name }}
+          release_name: Dino+ ${{ github.ref_name }}

CMakeLists.txt

@@ -223,6 +223,9 @@ add_subdirectory(main)
 add_subdirectory(crypto-vala)
 add_subdirectory(plugins)
 
+# To generate a DEB package
+include(Packing)
+
 # uninstall target
 configure_file("${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
 add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake COMMENT "Uninstall the project...")

LICENSE_SHORT

@@ -1,5 +1,6 @@
-Dino - Modern Jabber/XMPP Client using GTK+/Vala
-Copyright (C) 2016-2020 Dino contributors
+Dino+, a modern XMPP/Jabber client software based on Dino
+Copyright (C) 2016-2023 Dino contributors
+Copyright (C) 2024 Dino+ contributors
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

cmake/Packing.cmake

@@ -0,0 +1,34 @@
+# This is a package creation module using CPack.
+# Currently only DEB package generation is supported.
+
+set(CPACK_PACKAGE_NAME dino-plus)
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
+    "modern XMPP/Jabber client software, based on Dino.
+Dino+ is a fork of Dino, a modern XMPP/Jabber client
+written in Vala using GTK+, which includes a few
+relatively minor but important quality-of-life features.")
+
+set(CPACK_VERBATIM_VARIABLES YES)
+set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME})
+set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
+set(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_SOURCE_DIR}/_packages")
+set(CPACK_PACKAGE_VERSION ${VERSION_FULL})
+set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/mxlgv/dino")
+set(CPACK_PACKAGE_CONTACT "maxlogaev@proton.me")
+set(CPACK_COMPONENTS_GROUPING ALL_COMPONENTS_IN_ONE)
+set(CPACK_STRIP_FILES TRUE)
+
+# For DEB only
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Maxim Logaev <${CPACK_PACKAGE_CONTACT}>")
+set(CPACK_DEB_COMPONENT_INSTALL YES)
+set(CPACK_DEBIAN_PACKAGE_SECTION "net")
+set(CPACK_DEBIAN_PACKAGE_CONFLICTS "dino-im, dino-im-common")
+set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "ca-certificates, dbus, fonts-noto-color-emoji, network-manager")
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
+set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS_POLICY ">=")
+
+install(FILES ${CMAKE_SOURCE_DIR}/LICENSE_SHORT DESTINATION ${SHARE_INSTALL_PREFIX}/doc/${CPACK_PACKAGE_NAME} RENAME copyright)
+install(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION ${SHARE_INSTALL_PREFIX}/doc/${CPACK_PACKAGE_NAME})
+
+include(CPack)

windows-installer/dino.nsi

@@ -13,7 +13,7 @@ SetCompressor /SOLID lzma
 
 # Modern Interface
 !include "MUI2.nsh"
-!insertmacro MUI_PAGE_LICENSE "LICENSE_SHORT"
+!insertmacro MUI_PAGE_LICENSE "../LICENSE_SHORT"
 !insertmacro MUI_PAGE_INSTFILES
 !include "english.nsh"