diff options
author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2023-06-20 06:07:03 +0300 |
---|---|---|
committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2023-06-20 17:40:54 +0300 |
commit | b709f27a4cdbb60ed99f09f8a66c1541bd6c888a (patch) | |
tree | 45feb532cda6704fa1000d7ac57054fa3048ba6f /debian | |
parent | fe9e438e3302b4078e18f1591eb81296da104d1a (diff) | |
download | sciteco-b709f27a4cdbb60ed99f09f8a66c1541bd6c888a.tar.gz |
Debian: fixed rules (build and binary targets)
* dh_testdir would sometimes cause problems on the PPA servers,
so we replaced it with an empty rule.
* We need to define the binary-arch and binary-indep targets
in order to recurse into the correct subdirectories.
I do not understand why this always worked on the Github runner
and sometimes even on the PPA servers.
Unfortunately, we cannot just call `dh binary-arch -B... -p...`
since that would call `dh_install -a` which overrides any `-p` (package),
thus trying to install the curses binaries from the Gtk build directory
and vice versa.
Diffstat (limited to 'debian')
-rwxr-xr-x | debian/rules | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index a8a0368..77936a9 100755 --- a/debian/rules +++ b/debian/rules @@ -29,8 +29,7 @@ endif %: dh $@ -build build-arch build-indep: build-curses-stamp build-gtk-stamp - dh_testdir +build build-arch build-indep: build-curses-stamp build-gtk-stamp; build-curses-stamp: dh_testdir @@ -66,6 +65,38 @@ install: xvfb-run -a dh install -Bbuild-gtk -psciteco-gtk dh install -Bbuild-curses -psciteco-curses -psciteco-common +# NOTE: This skips the dh_install* commands of `dh binary-arch` +# which would ignore `-p...`. +define custom_binary_arch + dh_testroot -a $(1) + dh_prep -a $(1) + dh_bugfiles -a $(1) + dh_ucf -a $(1) + dh_lintian -a $(1) + dh_icons -a $(1) + dh_perl -a $(1) + dh_usrlocal -a $(1) + dh_link -a $(1) + dh_strip_nondeterminism -a $(1) + dh_compress -a $(1) + dh_fixperms -a $(1) + dh_missing -a $(1) + dh_strip -a $(1) + dh_makeshlibs -a $(1) + dh_shlibdeps -a $(1) + dh_installdeb -a $(1) + dh_gencontrol -a $(1) + dh_md5sums -a $(1) + dh_builddeb -a $(1) +endef + +binary-arch: + $(call custom_binary_arch,-O-Bbuild-gtk -O-psciteco-gtk) + $(call custom_binary_arch,-O-Bbuild-curses -O-psciteco-curses) + +binary-indep: + dh binary-indep -Bbuild-curses + clean: dh clean -Bbuild-gtk dh clean -Bbuild-curses |