Adapt to changes in ggml

diff --git a/debian/control b/debian/control
index a7742d633063b3ed553dab9338ac044f49657a01..3d580627a7a83fca9e81c3e620e4d83fe8d5ba9f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: dh-sequence-bash-completion,
                cmake,
                debhelper-compat (= 13),
                libcurl4-openssl-dev,
-               ggml-dev,
+               libggml-dev,
                pkgconf,
 Rules-Requires-Root: no
 
@@ -20,6 +20,7 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: libggml0,
+         libggml-backend-cpu,
          ${misc:Depends},
          ${shlibs:Depends},
 # Explicitly conflict with Debian official
@@ -45,7 +46,6 @@ Description: Inference of large language models in pure C/C++ (multimodal librar
 Package: llama-cpp-tools
 Architecture: any
 Depends: libllama0 (= ${binary:Version}),
-         ggml,
          curl,
          ${misc:Depends},
          ${shlibs:Depends},
@@ -64,30 +64,29 @@ Description: Inference of large language models in pure C/C++ (tools)
 Package: llama-cpp-tools-multimodal
 Architecture: any
 Depends: libmtmd0 (= ${binary:Version}),
-         ggml,
          curl,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Inference of large language models in pure C/C++ (multimodal tools)
  llama-mtmd-cli: multimodal support.
 
-Package: libllama0-dev
+Package: libllama-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libllama0 (= ${binary:Version}),
-         ggml-dev,
+         libggml-dev,
          ${misc:Depends},
 Description: Inference of large language models in pure C/C++ (development files)
  Development files required for building software based on the
  stable and documented llama.cpp API.
 
-Package: libmtmd0-dev
+Package: libmtmd-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: libmtmd0 (= ${binary:Version}),
-         libllama0-dev (= ${binary:Version}),
+         libllama-dev (= ${binary:Version}),
          ${misc:Depends},
 Description: Inference of large language models in pure C/C++ (multimodal development files)
  Development files required for building software based on the

diff --git a/debian/libllama-dev.install b/debian/libllama-dev.install
new file mode 100644 (file)
index 0000000..133993d
--- /dev/null
+++ b/debian/libllama-dev.install
@@ -0,0 +1,8 @@
+/usr/include/llama*.h
+include/llama-cpp.h /usr/include/
+
+# Symbolic links
+/usr/lib/*/libllama.so
+
+/usr/lib/*/pkgconfig/*.pc
+/usr/lib/*/cmake/llama/llama-*.cmake

diff --git a/debian/libllama0-dev.install b/debian/libllama0-dev.install
deleted file mode 100644 (file)
index 133993d..0000000
--- a/debian/libllama0-dev.install
+++ /dev/null
@@ -1,8 +0,0 @@
-/usr/include/llama*.h
-include/llama-cpp.h /usr/include/
-
-# Symbolic links
-/usr/lib/*/libllama.so
-
-/usr/lib/*/pkgconfig/*.pc
-/usr/lib/*/cmake/llama/llama-*.cmake

diff --git a/debian/libmtmd-dev.install b/debian/libmtmd-dev.install
new file mode 100644 (file)
index 0000000..f482f6d
--- /dev/null
+++ b/debian/libmtmd-dev.install
@@ -0,0 +1,4 @@
+/usr/include/mtmd*.h
+
+# Symbolic links
+/usr/lib/*/libmtmd.so

diff --git a/debian/libmtmd0-dev.install b/debian/libmtmd0-dev.install
deleted file mode 100644 (file)
index f482f6d..0000000
--- a/debian/libmtmd0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/include/mtmd*.h
-
-# Symbolic links
-/usr/lib/*/libmtmd.so