diff --git a/debian/changelog b/debian/changelog
index aacc6ab9..bc1012f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -301,11 +301,18 @@ llvm-toolchain-snapshot (1:15~++20220202093833+1a3137dc8451-1~exp1) experimental
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 13 Feb 2022 23:25:57 +0100
 
-llvm-toolchain-14 (1:14.0.6-10~exp6) UNRELEASED; urgency=medium
+llvm-toolchain-14 (1:14.0.6-10) unstable; urgency=medium
+
+  * Upload to unstable
+  * Add misisng epoch (Closes: #1027699)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 01 Jan 2023 15:42:15 +0100
+
+llvm-toolchain-14 (1:14.0.6-10~exp6) experimental; urgency=medium
 
   * Move libPolly in libpolly-X.Y-dev for real
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 01 Jan 2023 11:42:14 +0100
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 01 Jan 2023 15:42:04 +0100
 
 llvm-toolchain-14 (1:14.0.6-10~exp5) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index f90fbacf..fdb8bf2a 100644
--- a/debian/control
+++ b/debian/control
@@ -43,15 +43,9 @@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/15
 Package: clang-15
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
-<<<<<<< HEAD
- ${dep:devlibs-objc}, libclang-common-15-dev (= ${binary:Version}),
+ ${dep:devlibs-objc}, libclang-common-15-dev (= ${source:Version}),
  llvm-15-linker-tools (= ${binary:Version}),
  libclang1-15 (= ${binary:Version}), libc6-dev, binutils
-=======
- ${dep:devlibs-objc}, libclang-common-14-dev (= ${source:Version}),
- llvm-14-linker-tools (= ${binary:Version}),
- libclang1-14 (= ${binary:Version}), libc6-dev, binutils
->>>>>>> origin/14
 Provides: c-compiler, objc-compiler, c++-compiler
 Recommends: llvm-15-dev, python3
 # libomp-15-dev
@@ -108,11 +102,7 @@ Description: clang-based C++ linter tool
 Package: clangd-15
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-<<<<<<< HEAD
- libclang-common-15-dev (= ${binary:Version})
-=======
- libclang-common-14-dev (= ${source:Version})
->>>>>>> origin/14
+ libclang-common-15-dev (= ${source:Version})
 Description: Language server that provides IDE-like features to editors
  clangd understands your C++ code and adds smart features to your editor:
   - code completion
@@ -162,15 +152,8 @@ Package: libclang-15-dev
 Architecture: any
 Section: libdevel
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
-<<<<<<< HEAD
  ${dep:devlibs-objc}, libclang1-15 (= ${binary:Version}),
- libclang-common-15-dev (= ${binary:Version})
-=======
- ${dep:devlibs-objc}, libclang1-14 (= ${binary:Version}),
- libclang-common-14-dev (= ${source:Version})
-Breaks: llvm-14-dev (<< 1:14.0.4-2)
-Replaces: llvm-14-dev (<< 1:14.0.4-2)
->>>>>>> origin/14
+ libclang-common-15-dev (= ${source:Version})
 Description: Clang library - Development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -182,18 +165,11 @@ Description: Clang library - Development package
  This package contains the Clang headers to develop extensions over
  libclang1-15.
 
-<<<<<<< HEAD
 Package: libclang-common-15-dev
-Architecture: any
-Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm15 (= ${binary:Version})
-=======
-Package: libclang-common-14-dev
 Architecture: all
 Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm14 (>= ${source:Version})
-Recommends: libclang-rt-14-dev (>= 14.0.6-10~exp4)
->>>>>>> origin/14
+Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm15 (>= ${source:Version})
+Recommends: libclang-rt-15-dev (>= 14.0.6-10~exp4)
 Description: Clang library - Common development package
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -206,12 +182,12 @@ Description: Clang library - Common development package
 
 # ------------- compiler-rt -------------
 
-Package: libclang-rt-14-dev
+Package: libclang-rt-15-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Breaks: libclang-common-14-dev (<< 14.0.6-10~exp4)
-Replaces: libclang-common-14-dev (<< 14.0.6-10~exp4)
+Breaks: libclang-common-15-dev (<< 1:15.0.6-5)
+Replaces: libclang-common-15-dev (<< 1:15.0.6-5)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Compiler-rt - development package
  This package provides various libraries:
@@ -224,36 +200,36 @@ Description: Compiler-rt - development package
      DataFlowSanitizer, etc
    * profile - Library which is used to collect coverage information.
 
-Package: libclang-rt-14-dev-wasm32
+Package: libclang-rt-15-dev-wasm32
 Architecture: all
 Multi-Arch: foreign
 Section: libdevel
-Breaks: libclang-common-14-dev (<< 14.0.6-10~exp4)
-Replaces: libclang-common-14-dev (<< 14.0.6-10~exp4)
+Breaks: libclang-common-15-dev (<< 1:15.0.6-5)
+Replaces: libclang-common-15-dev (<< 1:15.0.6-5)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libclang-common-14-dev (>= 14.0.6-10~exp4)
+Recommends: libclang-common-15-dev (>= 15.0.6-5)
 Description: Compiler-rt - wasm32 builtins
  Provides the compiler-rt builtins for WebAssembly 32 bits
 
-Package: libclang-rt-14-dev-wasm64
+Package: libclang-rt-15-dev-wasm64
 Architecture: all
 Multi-Arch: foreign
 Section: libdevel
-Breaks: libclang-common-14-dev (<< 14.0.6-10~exp4)
-Replaces: libclang-common-14-dev (<< 14.0.6-10~exp4)
+Breaks: libclang-common-15-dev (<< 1:15.0.6-5)
+Replaces: libclang-common-15-dev (<< 1:15.0.6-5)
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libclang-common-14-dev (>= 14.0.6-10~exp4)
+Recommends: libclang-common-15-dev (>= 15.0.6-5)
 Description: Compiler-rt - wasm64 builtins
  Provides the compiler-rt builtins for WebAssembly 64 bits
 
 # ------------- polly -------------
 
-Package: libpolly-14-dev
+Package: libpolly-15-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Breaks: libclang-rt-14-dev (<< 14.0.6-10~exp6), libclang-common-14-dev (<< 14.0.6-10~exp6)
-Replaces: libclang-rt-14-dev (<< 14.0.6-10~exp6), libclang-common-14-dev (<< 14.0.6-10~exp6)
+Breaks: libclang-common-15-dev (<< 1:15.0.6-5)
+Replaces: libclang-common-15-dev (<< 1:15.0.6-5)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: High-level loop and data-locality optimizer
  Uses an abstract mathematical representation based on integer polyhedra
@@ -729,11 +705,11 @@ Description: LLVM C++ Standard library (development files)
      as exception objects, rtti and memory allocation.
    * Extensive unit tests.
 
-Package: libc++-14-dev-wasm32
+Package: libc++-15-dev-wasm32
 Section: libdevel
 Architecture: all
 Multi-Arch: foreign
-Depends: wasi-libc, libc++abi-14-dev-wasm32, ${misc:Depends}
+Depends: wasi-libc, libc++abi-15-dev-wasm32, ${misc:Depends}
 Provides: libc++-x.y-dev-wasm32
 Conflicts: libc++-x.y-dev-wasm32
 Replaces: libc++-x.y-dev-wasm32
@@ -791,7 +767,7 @@ Description: LLVM low level support for a standard C++ library (development file
    * Correctness as defined by the C++ standards.
    * Provide a portable sublayer to ease the porting of libc++
 
-Package: libc++abi-14-dev-wasm32
+Package: libc++abi-15-dev-wasm32
 Section: libdevel
 Architecture: all
 Multi-Arch: foreign
@@ -931,6 +907,7 @@ Description: Multi-Level Intermediate Representation library
  specific compilers, and aid in connecting existing compilers together.
 
 
+
 # ------------- bolt -------------
 
 Package: bolt-15
diff --git a/debian/control.in b/debian/control.in
index c3f2f9af..d531532d 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -22,7 +22,8 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build,
     libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
     dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
     libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
-    llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
+    llvm-spirv-15 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> |
+    llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] <!stage1> | hello [!i386],
     spirv-tools [ linux-any ] | hello [ !i386],
     wasi-libc | hello [ !i386],
     libcurl4-dev,
@@ -185,8 +186,8 @@ Package: libclang-rt-@LLVM_VERSION@-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Breaks: libclang-common-@LLVM_VERSION@-dev (<< 15.0.6-5)
-Replaces: libclang-common-@LLVM_VERSION@-dev (<< 15.0.6-5)
+Breaks: libclang-common-@LLVM_VERSION@-dev (<< 1:15.0.6-5)
+Replaces: libclang-common-@LLVM_VERSION@-dev (<< 1:15.0.6-5)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Compiler-rt - development package
  This package provides various libraries:
@@ -203,8 +204,8 @@ Package: libclang-rt-@LLVM_VERSION@-dev-wasm32
 Architecture: all
 Multi-Arch: foreign
 Section: libdevel
-Breaks: libclang-common-@LLVM_VERSION@-dev (<< 15.0.6-5)
-Replaces: libclang-common-@LLVM_VERSION@-dev (<< 15.0.6-5)
+Breaks: libclang-common-@LLVM_VERSION@-dev (<< 1:15.0.6-5)
+Replaces: libclang-common-@LLVM_VERSION@-dev (<< 1:15.0.6-5)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: libclang-common-@LLVM_VERSION@-dev (>= 15.0.6-5)
 Description: Compiler-rt - wasm32 builtins
@@ -214,8 +215,8 @@ Package: libclang-rt-@LLVM_VERSION@-dev-wasm64
 Architecture: all
 Multi-Arch: foreign
 Section: libdevel
-Breaks: libclang-common-@LLVM_VERSION@-dev (<< 15.0.6-5)
-Replaces: libclang-common-@LLVM_VERSION@-dev (<< 15.0.6-5)
+Breaks: libclang-common-@LLVM_VERSION@-dev (<< 1:15.0.6-5)
+Replaces: libclang-common-@LLVM_VERSION@-dev (<< 1:15.0.6-5)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: libclang-common-@LLVM_VERSION@-dev (>= 15.0.6-5)
 Description: Compiler-rt - wasm64 builtins
@@ -227,8 +228,8 @@ Package: libpolly-@LLVM_VERSION@-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Breaks: libclang-common-@LLVM_VERSION@-dev (<< 15.0.6-5)
-Replaces: libclang-common-@LLVM_VERSION@-dev (<< 15.0.6-5)
+Breaks: libclang-common-@LLVM_VERSION@-dev (<< 1:15.0.6-5)
+Replaces: libclang-common-@LLVM_VERSION@-dev (<< 1:15.0.6-5)
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: High-level loop and data-locality optimizer
  Uses an abstract mathematical representation based on integer polyhedra