[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/gnome-calls][debian/master] 6 commits: d/rules: Run dh_auto_test instead of ninja test directly

[Evangelos Ribeiro Tzaras (@devrtz)]

Evangelos Ribeiro Tzaras pushed to branch debian/master at Debian On Mobile / gnome-calls


Commits:
7808aec4 by Jeremy Bicha at 2021-09-22T20:51:10-04:00
d/rules: Run dh_auto_test instead of ninja test directly

- - - - -
310cdefc by Jeremy Bicha at 2021-09-22T21:02:46-04:00
d/rules: Drop nocheck check since dh13's dh_auto_test handles this

debhelper 13 respects nocheck in dh_auto_test

- - - - -
49b30653 by Jeremy Bicha at 2021-09-22T21:04:44-04:00
d/rules: Use dh_auto_build instead of calling ninja build directly

- - - - -
ce1fb69d by Jeremy Bicha at 2021-09-22T22:06:58-04:00
d/control: Mark xauth & xvfb as only needed for build tests

- - - - -
d1926421 by Jeremy Bicha at 2021-09-24T06:49:18-04:00
d/rules: Workaround Ubuntu issue by building without symbolic-functions

- - - - -
57f2885c by Evangelos Ribeiro Tzaras at 2021-09-24T21:20:42+00:00
Merge branch 'rules-cleanup' into 'debian/master'

Clean up debian/rules

See merge request DebianOnMobile-team/gnome-calls!8
- - - - -


2 changed files:

- debian/control
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -30,8 +30,8 @@ Build-Depends:
  modemmanager-dev,
  pkg-config,
  valac,
- xauth,
- xvfb,
+ xauth <!nocheck>,
+ xvfb <!nocheck>,
 Standards-Version: 4.6.0
 Homepage: https://gitlab.gnome.org/GNOME/calls
 Vcs-Browser: https://salsa.debian.org/DebianOnMobile-team/gnome-calls


=====================================
debian/rules
=====================================
@@ -2,6 +2,10 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+# Ubuntu builds with symbolic-functions by default which causes plugin issues
+# https://gitlab.gnome.org/GNOME/calls/-/issues/334
+export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions
+
 ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
   CONFIGURE_OPTS+=-Dgtk_doc=true
 else
@@ -18,13 +22,11 @@ override_dh_auto_build:
 	dh_auto_build
 ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),)
 	# https://github.com/mesonbuild/meson/pull/2862
-	ninja -C _build/ calls-doc
+	dh_auto_build -- calls-doc
 endif
 
 override_dh_auto_test:
-ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
-	xvfb-run ninja -C _build test
-endif
+	xvfb-run dh_auto_test
 
 # generate the manpages from the scripts using help2man
 execute_before_dh_installman:



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/gnome-calls/-/compare/0482ba472a62caf509834ec4a4396c0e3bfbaee8...57f2885c13c6bc55645e81454af310f6e09d93f5

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/gnome-calls/-/compare/0482ba472a62caf509834ec4a4396c0e3bfbaee8...57f2885c13c6bc55645e81454af310f6e09d93f5
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20210924/33f94588/attachment-0001.htm>