summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2024-03-26 10:46:28 +0000
committerSimon McVittie <smcv@debian.org>2024-03-26 10:46:28 +0000
commitdd48ea9a202e38e13849cb725a7da0820a528290 (patch)
treeea6776bd43b3f4dec9c58b33c1733084f29a6d2f
parent939f3abe5a79b877cbb51a75e4e9b0e3fb380d8d (diff)
Revert "Temporarily disable valadoc on 32-bit non-x86"
This reverts commit f0bea366b6f3d7b04ddfe86f44eae6b63d4093b9.
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules6
2 files changed, 2 insertions, 6 deletions
diff --git a/debian/control b/debian/control
index 04c0fe31e..870c42884 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13),
gir1.2-glib-2.0-dev <!nocheck>,
gobject-introspection (>= 1.78.1-14~) <!nocheck>,
libglib2.0-dev (>= 2.48),
- libgraphviz-dev (>= 2.16) [!armel !armhf !hppa !m68k !powerpc !sh4] <!pkg.vala.nographviz>,
+ libgraphviz-dev (>= 2.16) <!pkg.vala.nographviz>,
bison (>= 2.3),
flex,
libdbus-1-dev <!nocheck>,
diff --git a/debian/rules b/debian/rules
index 31d69995e..0adfab587 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,19 +7,15 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
include /usr/share/dpkg/architecture.mk
configure_options :=
-dh_options :=
configure_options += GI_GIRDIR=/usr/lib/${DEB_HOST_MULTIARCH}/gir-1.0
ifneq (,$(filter pkg.vala.nographviz,$(DEB_BUILD_PROFILES)))
configure_options += --disable-valadoc
-else ifeq ($(DEB_HOST_ARCH_BITS)$(filter i386,$(DEB_HOST_ARCH_CPU)),32)
-configure_options += --disable-valadoc
-dh_options += -Nvaladoc -Nlibvaladoc-0.56-0 -Nlibvaladoc-0.56-dev -Nlibvaladoc-0.56-data
endif
%:
- dh $@ $(dh_options)
+ dh $@
execute_before_dh_clean:
rm -rf bootstrap