Merge branch 'master' of github.com:cppfw/ruis-render-opengl

.github/workflows/ci.yml

@@ -69,7 +69,7 @@ jobs:
       - name: deploy deb packages
         run: |
           echo "${{ secrets.MYCI_REPO_SSH_KEY }}" > repo_key_rsa && chmod 600 repo_key_rsa
-          myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo cppfw/${{ matrix.os }} --distro ${{ matrix.codename }} --component main ../lib${PACKAGE_NAME}*_${PACKAGE_VERSION}_*.deb
+          myci-deploy-apt-ssh.sh --key repo_key_rsa --server gagis.hopto.org --repo cppfw/${{ matrix.os }} --distro ${{ matrix.codename }} --component main ../lib${PACKAGE_NAME}*_${PACKAGE_VERSION}_*.*deb
         if: matrix.package_type == 'deb' && startsWith(github.ref, 'refs/tags/')
 ##### macosx #####
   macosx:

debian/control.in

@@ -20,11 +20,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: OpenGL renderer for ruis.
  OpenGL renderer for ruis GUI library.
 
-Package: libruis-render-opengl$(soname)-dbg
+Package: libruis-render-opengl$(soname)-dbgsrc
 Section: debug
-Architecture: any
-Depends: libruis-render-opengl$(soname) (= ${binary:Version}), ${misc:Depends}
-Description: debugging symbols for libruis-render-opengl$(soname) package.
+Architecture: all
+Depends: libruis-render-opengl$(soname)-dbgsym (= ${binary:Version}), ${misc:Depends}
+Description: debugging sources for libruis-render-opengl$(soname) package.
 
 Package: libruis-render-opengl-dev
 Section: libdevel

debian/libruis-render-opengl$(soname)-dbgsrc.install.in

@@ -0,0 +1 @@
+usr/src/*

debian/rules

@@ -1,11 +1,16 @@
 #!/usr/bin/make -f
-%:
-	dh $@
 
-.PHONY: override_dh_strip
-override_dh_strip:
-	dh_strip --dbg-package=$(filter %-dbg, $(shell awk '/^Package: /{print $2}' debian/control))
+export PREFIX := /usr
+
+dbgsrc_pkg_name := $(filter %-dbgsrc, $(shell awk '/^Package: /{print $2}' debian/control))
+debug_prefix_map_arg := -fdebug-prefix-map=$(shell pwd)/src=$(PREFIX)/src/$(patsubst %-dbgsrc,%,$(dbgsrc_pkg_name))
+
+export PRORAB_INSTALL_DBGSRC := true
 
-.PHONY: override_dh_auto_install
-override_dh_auto_install:
-	PREFIX=/usr dh_auto_install
+export DEB_CFLAGS_MAINT_APPEND := $(debug_prefix_map_arg)
+export DEB_CXXFLAGS_MAINT_APPEND := $(debug_prefix_map_arg)
+export DEB_OBJCFLAGS_MAINT_APPEND := $(debug_prefix_map_arg)
+export DEB_OBJCXXFLAGS_MAINT_APPEND := $(debug_prefix_map_arg)
+
+%:
+	dh $@

src/makefile

@@ -1,6 +1,7 @@
 include prorab.mk
 include prorab-license.mk
 include prorab-clang-format.mk
+include prorab-install-dbgsrc.mk
 
 $(eval $(call prorab-config, ../config))
 
@@ -27,3 +28,5 @@ this_src_dir := ruis
 $(eval $(prorab-license))
 
 $(eval $(prorab-clang-format))
+
+$(eval $(prorab-install-dbgsrc))