Merging debian version 3.0.0-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 19 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index b26bc19..579bc2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+haproxy (3.0.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * d/rules: use CFLAGS instead of DEBUG_CFLAGS.
+  * d/rules: let upstream Makefile decides for libatomic.
+  * d/patch: update patches.
+  * d/control: build-depends on pkgconf instead of pkg-config.
+
+ -- Vincent Bernat <bernat@debian.org>  Sat, 01 Jun 2024 12:25:32 +0200
+
 haproxy (2.9.7-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
@@ -34,7 +44,7 @@ haproxy (2.9.6-1) unstable; urgency=medium
   * d/install: don't ship halog both in usr/bin and usr/sbin.
     Closes: #1064788.
 
- -- Vincent Bernat <bernat@neo>  Fri, 01 Mar 2024 22:01:08 +0100
+ -- Vincent Bernat <bernat@debian.org>  Fri, 01 Mar 2024 22:01:08 +0100
 
 haproxy (2.9.5-1~progress7.99u1) graograman-backports; urgency=medium
 
diff --git a/debian/control b/debian/control
index c6eaa00..37d921f 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: debhelper-compat (= 12),
                libjemalloc-dev,
                python3-sphinx,
                libopentracing-c-wrapper-dev,
-               pkg-config,
+               pkgconf,
                systemd-dev [linux-any]
 Build-Depends-Indep: python3, python3-mako
 Homepage: http://www.haproxy.org/
diff --git a/debian/copyright b/debian/copyright
index e33a528..251a7dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -325,8 +325,6 @@ Files: include/haproxy/proto_udp.h
   include/haproxy/quic_frame.h
   include/haproxy/quic_loss-t.h
   include/haproxy/quic_loss.h
-  include/haproxy/xprt_quic-t.h
-  include/haproxy/xprt_quic.h
 Copyright: 2019, 2020, HAProxy Technologies, Frédéric Lécaille <flecaille@haproxy.com>
 License: LGPL-2.1
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 33ef1db..5b1f541 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,4 @@
 [DEFAULT]
 pristine-tar = True
-upstream-branch = upstream-2.9
+upstream-branch = upstream-3.0
+debian-branch = experimental-3.0
diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index a948190..9382459 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -3,8 +3,8 @@ index 566bdb26a3e7..8603dea25c21 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -975,7 +975,7 @@ src/haproxy.o:	src/haproxy.c $(DEP)
- 	      -DBUILD_ARCH='"$(strip $(ARCH))"' \
- 	      -DBUILD_CPU='"$(strip $(CPU))"' \
+ 	$(cmd_CC) $(COPTS) \
+ 	      -DBUILD_TARGET='"$(strip $(TARGET))"' \
  	      -DBUILD_CC='"$(strip $(CC))"' \
 -	      -DBUILD_CFLAGS='"$(strip $(VERBOSE_CFLAGS))"' \
 +	      -DBUILD_CFLAGS='"$(filter-out -ffile-prefix-map=%,$(strip $(VERBOSE_CFLAGS)))"' \
diff --git a/debian/rules b/debian/rules
index 8b8f78e..a768d82 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,13 +34,8 @@ else
 	MAKEARGS+= TARGET=generic
 endif
 
-ifneq ($(filter armel mips mipsel m68k powerpc powerpcspe sh4 riscv64,$(DEB_HOST_ARCH)),)
-	MAKEARGS+= ADDLIB="-latomic -Wl,-no-as-needed -ljemalloc -Wl,-as-needed"
-else
-	MAKEARGS+= ADDLIB="-Wl,-no-as-needed -ljemalloc -Wl,-as-needed"
-endif
-
-MAKEARGS += DEBUG_CFLAGS="$(CFLAGS) $(CPPFLAGS)"
+MAKEARGS += ADDLIB="-Wl,-no-as-needed -ljemalloc -Wl,-as-needed"
+MAKEARGS += CFLAGS="$(CFLAGS) $(CPPFLAGS)"
 MAKEARGS += LDFLAGS="$(LDFLAGS)"
 MAKEARGS += VERSION="$(DEB_VERSION_UPSTREAM)"
 MAKEARGS += SUBVERS="-$(lastword $(subst -, ,$(DEB_VERSION)))"
diff --git a/debian/watch b/debian/watch
index 84bba8a..beafc83 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-opts="uversionmangle=s/-(dev\d+)/~$1/" https://www.haproxy.org/download/2.9/src/ haproxy-(2\.9(?:\.|-dev)\d+)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz))
+opts="uversionmangle=s/-(dev\d+)/~$1/" https://www.haproxy.org/download/3.0/src/ haproxy-(3\.0(?:\.|-dev)\d+)\.(?:tgz|tbz2|tar\.(?:gz|bz2|xz))