Merge ~maxgmr/ubuntu/+source/justbuild:merge-lp2134235-resolute into ubuntu/+source/justbuild:debian/sid

[Max Gilmour]

[Max Gilmour (maxgmr)]

This merge is ready for sponsorship.

Autopkgtests: https://autopkgtest.ubuntu.com/results/autopkgtest-resolute-maxgmr-resolute-merges/resolute/amd64/j/justbuild/20251208_171338_41011@/log.gz

PPA: https://launchpad.net/~maxgmr/+archive/ubuntu/resolute-merges/+builds?build_text=justbuild&build_state=built

There are no Lintian warnings or errors.

Unmerged commits

ec0db43... by Max Gilmour on 2025-12-05

Fix changelog

f14a850... by Max Gilmour on 2025-12-05

update-maintainer

3c7ef66... by Max Gilmour on 2025-12-05

reconstruct-changelog

0063b1e... by Max Gilmour on 2025-12-05

merge-changelogs

5db144b... by Max Gilmour on 2025-12-05

d/justbuild.makefile: Fix build by forcing GCC

diff --git a/debian/changelog b/debian/changelog
index 429a7c2..500bc07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+justbuild (1.6.3-1ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable (LP: #2134235). Remaining changes:
+    - d/justbuild.makefile: Fix build by forcing GCC
+
+ -- Max Gilmour <[e-mail]>  Fri, 05 Dec 2025 15:48:10 -0800
+
 justbuild (1.6.3-1) unstable; urgency=medium
 
   * New upstream version 1.6.3
@@ -19,6 +26,19 @@ justbuild (1.5.1-1+loong64) unstable; urgency=medium
 
  -- Dandan Zhang <[e-mail]>  Mon, 28 Apr 2025 14:53:17 +0800
 
+justbuild (1.5.1-1ubuntu2) questing; urgency=medium
+
+  * Rebuild against latest abseil
+
+ -- Jeremy Bícha <[e-mail]>  Sat, 03 May 2025 14:25:25 -0400
+
+justbuild (1.5.1-1ubuntu1) questing; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Fix build by forcing gcc compiler
+
+ -- Gianfranco Costamagna <[e-mail]>  Thu, 01 May 2025 09:23:19 +0200
+
 justbuild (1.5.1-1) unstable; urgency=medium
 
   * New upstream version 1.5.1
@@ -31,6 +51,19 @@ justbuild (1.5.0-1) unstable; urgency=medium
 
  -- Oliver Reiche <[e-mail]>  Thu, 06 Mar 2025 12:53:58 +0000
 
+justbuild (1.4.1-1ubuntu1) plucky; urgency=medium
+
+  [ Zixing Liu <[e-mail]> ]
+  * Fix build by forcing gcc compiler
+
+ -- Gianfranco Costamagna <[e-mail]>  Mon, 10 Mar 2025 22:48:40 +0100
+
+justbuild (1.4.1-1build1) plucky; urgency=medium
+
+  * No-change rebuild against libgit2 1.9.
+
+ -- Simon Quigley <[e-mail]>  Sat, 22 Feb 2025 00:07:15 -0600
+
 justbuild (1.4.1-1) unstable; urgency=medium
 
   * New upstream version 1.4.1
diff --git a/debian/control b/debian/control
index 1dcd4be..a72e0df 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: justbuild
 Section: devel
 Priority: optional
-Maintainer: Oliver Reiche <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Oliver Reiche <[e-mail]>
 Build-Depends: debhelper-compat (= 13),
   clang,
   protobuf-compiler,
diff --git a/debian/justbuild.makefile b/debian/justbuild.makefile
index 16535a5..aa3f4d2 100644
--- a/debian/justbuild.makefile
+++ b/debian/justbuild.makefile
@@ -30,27 +30,11 @@ export SOURCE_DATE_EPOCH = $(shell dpkg-parsechangelog -STimestamp)
 export INCLUDE_PATH = $(BUILDDIR)/include
 export PKG_CONFIG_PATH = $(BUILDDIR)/pkgconfig
 
-CCFAMILY = clang
-
-ifeq ($(DEB_HOST_ARCH),riscv64)
-  # force use of gcc as generated protobuf bindings do not compile with clang on
-  # riscv64 due to missing c_atomic extensions (see protobuf platform_macros.h).
-  CCFAMILY = gnu
-endif
-
-ifeq ($(CCFAMILY),clang)
-  # enable reproducible builds with clang.
-  # background: justbuild builds every source file in an isolated unique action
-  #             directory and clang can be instructed to strip that unique path.
-  CFLAGS += -fdebug-compilation-dir=. -gdwarf-4
-  CXXFLAGS += -fdebug-compilation-dir=. -gdwarf-4
-endif
-
 CFLAGS += -I$(INCLUDE_PATH)
 CXXFLAGS += -I$(INCLUDE_PATH)
 
 define JUST_BUILD_CONF
-{ "TOOLCHAIN_CONFIG": {"FAMILY": "$(CCFAMILY)"}
+{ "TOOLCHAIN_CONFIG": {"FAMILY": "gnu"}
 , "ARCH": "$(ARCH)"
 , "TARGET_ARCH": "$(TARGET_ARCH)"
 , "SOURCE_DATE_EPOCH": $(SOURCE_DATE_EPOCH)