From 51c7366db907c8099599849a9a23f1ffe2b30ac3 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 24 Oct 2023 12:24:48 +0200
Subject: [PATCH] Revert "Revert:"

This reverts commit 6241366525e76f8cc7c71db3a18ff30e976797ea.
---
 debian/changelog  | 10 +++++++++-
 debian/control    |  4 ++--
 debian/control.in |  4 ++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa3574b0..3ec71bbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,14 @@ llvm-toolchain-16 (1:16.0.6-17) unstable; urgency=medium
 
 llvm-toolchain-16 (1:16.0.6-16) unstable; urgency=medium
 
+  [ Gianfranco Costamagna ]
+  * Make libclang-common-16-dev arch:any (Closes: #1041455)
+    It was arch:all because all the code isn't arch dependant
+    However, it causes issues for cross build.
+    So, back to any and libclang-common-@LLVM_VERSION@-dev (= ${binary:Version})
+    instead of source
+
+  [ Sylvestre Ledru ]
   * Bring back old version of spirv - necessary for apt.llvm.org
 
   [ Alexandre Detiste ]
@@ -21,7 +29,7 @@ llvm-toolchain-16 (1:16.0.6-16) unstable; urgency=medium
   * Limit the parallel links to 2 on riscv64.
   * d/rules: Be less noisy when building without grpc.
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 14 Oct 2023 18:37:48 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 08 Oct 2023 09:11:38 +0200
 
 llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 33ceb190..5abd8387 100644
--- a/debian/control
+++ b/debian/control
@@ -45,7 +45,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/16
 Package: clang-16
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-16-dev (= ${source:Version}),
+ ${dep:devlibs-objc}, libclang-common-16-dev (= ${binary:Version}),
  llvm-16-linker-tools (= ${binary:Version}),
  libclang1-16 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -168,7 +168,7 @@ Description: Clang library - Development package
  libclang1-16.
 
 Package: libclang-common-16-dev
-Architecture: all
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (>= ${source:Version}),
  libllvm16 (<< ${source:Version}.1~)
diff --git a/debian/control.in b/debian/control.in
index 6802113a..3505c06d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -45,7 +45,7 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/@BRANCH_
 Package: clang-@LLVM_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
- ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${source:Version}),
+ ${dep:devlibs-objc}, libclang-common-@LLVM_VERSION@-dev (= ${binary:Version}),
  llvm-@LLVM_VERSION@-linker-tools (= ${binary:Version}),
  libclang1-@LLVM_VERSION@ (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
@@ -168,7 +168,7 @@ Description: Clang library - Development package
  libclang1-@LLVM_VERSION@.
 
 Package: libclang-common-@LLVM_VERSION@-dev
-Architecture: all
+Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (>= ${source:Version}),
  libllvm@LLVM_VERSION@ (<< ${source:Version}.1~)