gtk-broadway-run.sh is now used in all headless builds

* It's already used on home:rhaberkorn:sciteco:UNSTABLE (OBS).
  We cannot introduce it in STABLE though until the next stable release
  which will contain the gtk-broadway-run.sh script.
* The FreeBSD packaging is actually not tested yet.
  The package version had been dumped to 2.6.0 since it definitely
  won't work with v2.5.2 tarballs.
  The v2.5.2_1 patches have consequently also been removed.
  You can still find them in the bugzilla ticket (not merged into ports yet).

1 files changed, 8 insertions, 5 deletions

diff --git a/debian/rules b/debian/rules
index cd684aa..f601cc5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,13 +63,16 @@ build-gtk-stamp: autoreconf-stamp
 	                  --with-scitecodatadir=../share/sciteco
 # NOTE: Since the Gtk+ version of SciTECO is called during the build,
 # we need an XServer which may be missing on the build server.
-# That's why we use xvfb.
-	xvfb-run -a dh_auto_build -Bbuild-gtk
-	xvfb-run -a dh_auto_test -Bbuild-gtk --no-parallel
+# That's why we use the GTK broadway backend.
+	./gtk-broadway-run.sh dh_auto_build -Bbuild-gtk
+	./gtk-broadway-run.sh dh_auto_test -Bbuild-gtk --no-parallel
 	touch $@
 
-install:
-	xvfb-run -a dh install -Bbuild-gtk -psciteco-gtk
+install: build-gtk-stamp
+	# Workaround for debian/sciteco-gtk.install loosing the executable flag.
+	# debtransform (OBS) doesn't preserve it.
+	chmod +x debian/sciteco-gtk.install
+	./gtk-broadway-run.sh 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`