workflow: merge both terminal and GUI app into a single debian package (too)

Author: Toni500github

.github/workflows/release.yml

@@ -38,7 +38,7 @@ jobs:
       run: make DEBUG=0 GUI_APP=0 CXX=x86_64-linux-gnu-g++-11
 
     - name: Install to ./usr
-      run: mkdir -p ./usr && make install DESTDIR=. PREFIX=/usr
+      run: mkdir -p ./usr && make install DEBUG=0 DESTDIR=$(pwd) PREFIX=/usr
 
     - name: Compile (GUI app)
       run: make clean && make DEBUG=0 GUI_APP=1 CXX=x86_64-linux-gnu-g++-11
@@ -47,10 +47,10 @@ jobs:
       run: |
         install ./build/release/customfetch-gui -Dm 755 -v ./usr/bin/
         mkdir -p ./usr/share/applications
-        cp -f customfetch.desktop ./usr/share/applications/
+        install -Dm644 customfetch.desktop ./usr/share/applications/
 
     - name: Make Release
-      run: tar -zcf ./customfetch.tar.gz ./usr/
+      run: tar -zcf ./customfetch.tar.gz usr/
 
     - name: Upload to github artifacts
       uses: actions/upload-artifact@v4
@@ -85,7 +85,7 @@ jobs:
         mkdir -p Debian/Debhelper/Buildsystem/
         wget https://github.com/Debian/debhelper/raw/master/lib/Debian/Debhelper/Buildsystem/makefile.pm -O Debian/Debhelper/Buildsystem/make.pm
         sed -i "s#package Debian::Debhelper::Buildsystem::makefile#package Debian::Debhelper::Buildsystem::make#g" Debian/Debhelper/Buildsystem/make.pm
-        sed -i "s#DEBUG=0#DEBUG=0 CXX=x86_64-linux-gnu-g++-11#g" debian/rules
+        sed -i "s#DEBUG=#CXX=x86_64-linux-gnu-g++-11 DEBUG=#g" debian/rules
         dpkg-buildpackage -us -uc
         mv ../customfetch_2.0.0-beta1_amd64.deb ../customfetch_amd64.deb
 
@@ -95,44 +95,6 @@ jobs:
         name: customfetch-deb-pkg
         path: /tmp/customfetch-2.0.0-beta1.orig/customfetch_amd64.deb
 
-  build-deb-gui:
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: read
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: create tmp directory
-      run: mkdir /tmp/customfetch-2.0.0-beta1.orig
-
-    - name: Install Packages
-      run: |
-        sudo apt-get update && sudo apt-get upgrade -y
-        sudo apt-get install libwayland-dev g++-11 libgtk-3-dev pkg-config libgtkmm-3.0-dev libdconf-dev libglib2.0-dev libarchive-tools
-        sudo apt-get install binutils lintian debhelper gettext devscripts debmake autoconf automake autotools-dev dh-make fakeroot xutils pbuilder -y
-
-    - name: Clean
-      run: make distclean
-
-    - name: Create deb
-      run: |
-        cp -r $GITHUB_WORKSPACE /tmp/customfetch-2.0.0-beta1.orig
-        cd /tmp/customfetch-2.0.0-beta1.orig/customfetch
-        mkdir -p Debian/Debhelper/Buildsystem/
-        wget https://github.com/Debian/debhelper/raw/master/lib/Debian/Debhelper/Buildsystem/makefile.pm -O Debian/Debhelper/Buildsystem/make.pm
-        sed -i "s#package Debian::Debhelper::Buildsystem::makefile#package Debian::Debhelper::Buildsystem::make#g" Debian/Debhelper/Buildsystem/make.pm
-        sed -i "s#GUI_APP=0#GUI_APP=1 CXX=x86_64-linux-gnu-g++-11#g" debian/rules
-        sed -i "/^Build-Depends:/a Depends: libgtkmm-3.0-1v5,libgtk-3-0" debian/control
-        dpkg-buildpackage -us -uc
-        mv ../customfetch_2.0.0-beta1_amd64.deb ../customfetch-gui_amd64.deb
-
-    - name: Upload to github artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: customfetch-gui-deb-pkg
-        path: /tmp/customfetch-2.0.0-beta1.orig/customfetch-gui_amd64.deb
-
   build-macos-tar:
     runs-on: macos-latest
     permissions:
@@ -179,7 +141,7 @@ jobs:
 
   release:
     name: Create GitHub Release
-    needs: [build-linux-tar, build-macos-tar, build-deb-gui, build-deb, get-version]
+    needs: [build-linux-tar, build-macos-tar, build-deb, get-version]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -235,12 +197,3 @@ jobs:
           asset_path: customfetch-deb-pkg/customfetch_amd64.deb
           asset_name: customfetch_${{ needs.get-version.outputs.version }}_amd64.deb
           asset_content_type: application/vnd.debian.binary-package
-
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.release-url }}
-          asset_path: customfetch-gui-deb-pkg/customfetch-gui_amd64.deb
-          asset_name: customfetch-gui_${{ needs.get-version.outputs.version }}_amd64.deb
-          asset_content_type: application/vnd.debian.binary-package

cufetchpm/Makefile

@@ -26,7 +26,7 @@ NAME		 = cufetchpm
 TARGET		?= $(NAME)
 OLDVERSION	 = 0.0.0
 VERSION    	 = 0.0.1
-SRC 	   	 = $(wildcard src/*.cpp src/manager/*.cpp  ../src/util.cpp)
+SRC 	   	 = $(wildcard src/*.cpp ../src/util.cpp)
 OBJ 	   	 = $(SRC:.cpp=.o)
 LDLIBS   	+= $(BUILDDIR)/libfmt.a $(BUILDDIR)/libtiny-process-library.a
 CXXFLAGS  	?= -mtune=generic -march=native

debian/control

@@ -1,14 +1,14 @@
 Source: customfetch
 Section: utils
 Priority: optional
-Maintainer: toni500 <toni500minecraft@gmail.com>
+Maintainer: toni500 <tonino512@linuxmail.org>
 Build-Depends: pkg-config,libgtkmm-3.0-dev,libwayland-dev,libdconf-dev,libglib2.0-dev
 Standards-Version: 4.5.1
 Homepage: https://github.com/Toni500github/customfetch
 
 Package: customfetch
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgtkmm-3.0-1v5, libgtk-3-0
 Suggests: libwayland-client0,libdconf1,libglib2.0-0
-Description: Highly customizable and fast information fetcher program
- Inspired by neofetch and fastfetch
+Description: A modular information fetching (neofetch-like) tool.
+ Which its focus point is the performance and customizability.

debian/rules

@@ -19,9 +19,15 @@ export DH_VERBOSE = 1
 
 override_dh_auto_build:
 	dh_auto_build -- all DEBUG=0 GUI_APP=0
+	cp -f build/release/customfetch customfetch-terminal
+
+	# Clean and build GUI version
+	$(MAKE) clean
+	dh_auto_build -- all DEBUG=0 GUI_APP=1
 
 override_dh_auto_install:
-	dh_auto_install -- all DEBUG=0 GUI_APP=0
+	dh_auto_install -- all DEBUG=0 GUI_APP=1
+	install -Dm755 customfetch-terminal debian/customfetch/usr/bin/customfetch
 
 # dh_make generated override targets
 # This is example for Cmake (See https://bugs.debian.org/641051 )