debian: Update version and refactor deb-pkg build

minminlittleshrimp · minminlittleshrimp · commit c843fa13d5d4 · 2025-08-03T13:59:03.000+07:00
Signed-off-by: lum3hc &lt;Minh.LuuQuang@vn.bosch.com&gt;
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
-Release/
-Debug/
-build/
+Release
+Debug
+build
 automotive-dlt.spec
 automotive-dlt.pc
 config.h
@@ -9,15 +9,27 @@ include/dlt/dlt_user.h
 .project
 .cproject
 .settings
-.idea/
+.idea
 *~
 *.o
 *.out
 *.swp
-cmake-build-debug/
-.vscode/
-googletest/
+cmake-build-debug
+.vscode
 
 # exclude temporary files
 cscope.out
 *.swp
+
+# Temp debian build files
+*.debhelper.log
+.debhelper
+*.substvars
+debian/debhelper-build-stamp
+debian/dlt-daemon
+debian/dlt-examples
+debian/dlt-tools
+debian/files
+debian/libdlt-dev
+debian/libdlt2
+debian/tmp
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -298,7 +298,11 @@ if(WITH_SYSTEMD
 
     find_package(PkgConfig REQUIRED)
     execute_process(COMMAND pkg-config --modversion systemd OUTPUT_VARIABLE SYSTEMD_VERSION)
-    string(REPLACE "\n" "" SYSTEMD_VERSION ${SYSTEMD_VERSION})
+    if(SYSTEMD_VERSION)
+        string(REPLACE "\n" "" SYSTEMD_VERSION ${SYSTEMD_VERSION})
+    else()
+        set(SYSTEMD_VERSION "NOT_FOUND")
+    endif()
 
     if(WITH_SYSTEMD)
         add_definitions(-DDLT_SYSTEMD_ENABLE)
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+dlt-daemon (2.18.10) UNRELEASED; urgency=medium
+
+  * Update Debian package build to v2.18.10
+
+ -- Luu Quang Minh <minh.luuquang@vn.bosch.com>  Sun, 03 Aug 2025 12:51:56 +0700
+
 dlt-daemon (2.18.7) unstable; urgency=low
 
    * Initial release
diff --git a/debian/compat b/debian/compat
diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: dlt-daemon
 Section: utils
 Priority: extra
 Maintainer: Advanced Driver Information Technology
-Build-Depends: debhelper (>= 9), cmake, pandoc,
+Build-Depends: debhelper-compat (= 13), cmake, pandoc,
  libdbus-1-dev, pkg-config, zlib1g-dev, libsystemd-dev
 
 
diff --git a/debian/dlt-daemon.install b/debian/dlt-daemon.install
@@ -4,4 +4,4 @@ INSTALL_PREFIX_PATH/etc/dlt.conf
 INSTALL_PREFIX_PATH/share/man/man1/dlt-daemon.1.gz
 INSTALL_PREFIX_PATH/share/man/man5/dlt.conf.5.gz
 INSTALL_PREFIX_PATH/share/man/man5/dlt_gateway.conf.5.gz
-lib/systemd/system/dlt.service
+INSTALL_PREFIX_PATH/lib/systemd/system/dlt.service
diff --git a/debian/dlt-examples.install b/debian/dlt-examples.install
@@ -1 +1 @@
-INSTALL_PREFIX_PATH/bin/dlt-example-*
+INSTALL_PREFIX_PATH/bin/dlt-example-*
diff --git a/debian/dlt-tools.install b/debian/dlt-tools.install
@@ -15,5 +15,5 @@ INSTALL_PREFIX_PATH/share/man/man1/dlt-passive-node-ctrl.1.gz
 INSTALL_PREFIX_PATH/share/man/man1/dlt-receive.1.gz
 INSTALL_PREFIX_PATH/share/man/man1/dlt-system.1.gz
 INSTALL_PREFIX_PATH/share/man/man5/dlt-system.conf.5.gz
-lib/systemd/system/dlt-adaptor-udp.service
-lib/systemd/system/dlt-receive.service
+INSTALL_PREFIX_PATH/lib/systemd/system/dlt-adaptor-udp.service
+INSTALL_PREFIX_PATH/lib/systemd/system/dlt-receive.service
diff --git a/debian/libdlt-dev.install b/debian/libdlt-dev.install
@@ -1,3 +1,3 @@
 INSTALL_PREFIX_PATH/include/dlt/*
 INSTALL_PREFIX_PATH/lib/*/libdlt.so
-INSTALL_PREFIX_PATH/lib/*/pkgconfig/automotive-dlt.pc
+INSTALL_PREFIX_PATH/lib/*/pkgconfig/automotive-dlt.pc
diff --git a/debian/libdlt2.install b/debian/libdlt2.install
@@ -1 +1 @@
-INSTALL_PREFIX_PATH/lib/*/libdlt.so.*
+INSTALL_PREFIX_PATH/lib/*/libdlt.so.*
diff --git a/debian/not-installed b/debian/not-installed
@@ -0,0 +1,11 @@
+${INSTALL_PREFIX_PATH}/lib/${DEB_HOST_MULTIARCH}/cmake/automotive-dlt/*
+${INSTALL_PREFIX_PATH}/share/dlt-filetransfer/dlt-test-filetransfer-file
+${INSTALL_PREFIX_PATH}/share/dlt-filetransfer/dlt-test-filetransfer-image.png
+${INSTALL_PREFIX_PATH}/share/man/man1/dlt-adaptor-stdin.1.gz
+${INSTALL_PREFIX_PATH}/share/man/man1/dlt-adaptor-udp.1.gz
+${INSTALL_PREFIX_PATH}/share/man/man1/dlt-control.1.gz
+${INSTALL_PREFIX_PATH}/share/man/man1/dlt-sortbytimestamp.1.gz
+${INSTALL_PREFIX_PATH}/bin/dlt-kpi
+${INSTALL_PREFIX_PATH}/bin/dlt-sortbytimestamp
+${INSTALL_PREFIX_PATH}/bin/dlt-test-*
+${INSTALL_PREFIX_PATH}/lib/systemd/system/dlt*
diff --git a/debian/rules b/debian/rules
@@ -13,7 +13,8 @@ override_dh_auto_configure:
 	-DWITH_SYSTEMD=ON -DWITH_SYSTEMD_JOURNAL=ON \
 	-DWITH_MAN=ON -DWITH_DLT_DBUS=ON \
 	-DWITH_DLT_KPI=ON -DWITH_DLT_ADAPTOR=ON \
-	-DWITH_DLT_SYSTEM=ON -DCMAKE_INSTALL_PREFIX=/opt/tooling/dlt \
+	-DWITH_DLT_SYSTEM=ON \
+	-DCMAKE_INSTALL_PREFIX=/opt/tooling/dlt \
 	-DCMAKE_INSTALL_SYSCONFDIR=/opt/tooling/dlt/etc \
 	-DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH)
 
@@ -23,4 +24,4 @@ override_dh_shlibdeps:
 
 override_dh_install:
 	sed -i 's/INSTALL_PREFIX_PATH/opt\/tooling\/dlt/g' debian/*.install; \
-	dh_install
+	dh_install
diff --git a/debian/source/format b/debian/source/format
@@ -0,0 +1 @@
+1.0
diff --git a/debian/source/option b/debian/source/option
@@ -0,0 +1 @@
+extend-diff-ignore = .*

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-INSTALL_PREFIX_PATH/bin/dlt-example-*`
	`1`	`+INSTALL_PREFIX_PATH/bin/dlt-example-*`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-INSTALL_PREFIX_PATH/lib//libdlt.so.`
	`1`	`+INSTALL_PREFIX_PATH/lib//libdlt.so.`