Source: protobuf
Version: 3.21.12-8
Tags: patch
dh-elpa is only used to build an Architecture: all package. Therefore,
it is more correct to use Build-Depends-Indep instead of specifying
specific architectures.
We can Build-Depend on dh-sequence-elpa (dh-elpa Provides it) to
automatically run --with elpa.
Finally, dh-autoreconf has been run by default since debhelper compat 10.
I am attaching a patch to implement these changes. It assumes that the
patch from https://bugs.debian.org/1062840 has been applied first.
Thank you,
Jeremy Bícha
From: Jeremy Bicha <jeremy.bi...@canonical.com>
Date: Sat, 3 Feb 2024 15:10:23 -0500
Subject: [PATCH] Use dh-sequence-elpa in Build-Depends-Indep
---
debian/control | 4 ++--
debian/rules | 6 +-----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/debian/control b/debian/control
index d536081..86b7da4 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Laszlo Boszormenyi (GCS) <g...@debian.org>
Build-Depends:
# Debian build system
debhelper-compat (= 13)
- , dh-elpa [amd64 arm64 armel armhf i386 loong64 mips64el mipsel ppc64el s390x hppa ppc64 riscv64 sh4 sparc64 x32]
# C/C++
, zlib1g-dev
, libgmock-dev <!nocheck>
@@ -24,8 +23,9 @@ Build-Depends:
, rake-compiler <!noruby>
, gem2deb <!noruby>
Build-Depends-Indep:
+ dh-sequence-elpa
# Java
- ant
+ , ant
, default-jdk
, javahelper
, maven-repo-helper
diff --git a/debian/rules b/debian/rules
index ee54fe3..c3d897a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,11 +19,7 @@ SONAME=32
API_VERSION=$(SONAME)-0
%:
-ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armel armhf i386 loong64 mips64el mipsel ppc64el s390x hppa ppc64 riscv64 sh4 sparc64 x32))
- dh $@ --with autoreconf,elpa
-else
- dh $@ --with autoreconf -Nelpa-protobuf-mode
-endif
+ dh $@
ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
override_dh_auto_configure:
--
2.43.0
