Remove separate multimodal package

diff --git a/debian/control b/debian/control
index bc597affa8b0aad11923e84d988b424ade56b647..018c6ab1c1aa1b132190fe18a80d73eff7d07661 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libllama0,
+Depends: libllama0 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 # Explicitly conflict with Debian official
@@ -47,7 +47,7 @@ Description: Inference of large language models in pure C/C++ (multimodal librar
 Package: llama.cpp-tools
 Architecture: any
 Depends: libllama0 (= ${binary:Version}),
-         curl,
+         libmtmd0 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Inference of large language models in pure C/C++ (tools)
@@ -62,19 +62,10 @@ Description: Inference of large language models in pure C/C++ (tools)
  llama-bench: benchmarking of large language models or
  ggml backends.
 
-Package: llama.cpp-tools-multimodal
-Architecture: any
-Depends: libmtmd0 (= ${binary:Version}),
-         curl,
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: Inference of large language models in pure C/C++ (multimodal tools)
- llama-mtmd-cli: multimodal support.
-
 Package: llama.cpp-tools-server
 Architecture: any
-Depends: libmtmd0 (= ${binary:Version}),
-         curl,
+Depends: libllama0 (= ${binary:Version}),
+         libmtmd0 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Inference of large language models in pure C/C++ (server tools)

diff --git a/debian/llama.cpp-tools-multimodal.bash-completion b/debian/llama.cpp-tools-multimodal.bash-completion
deleted file mode 100644 (file)
index 3ae0a65..0000000
--- a/debian/llama.cpp-tools-multimodal.bash-completion
+++ /dev/null
@@ -1 +0,0 @@
-completions/llama-mtmd-cli

diff --git a/debian/llama.cpp-tools-multimodal.install b/debian/llama.cpp-tools-multimodal.install
deleted file mode 100644 (file)
index 5aae377..0000000
--- a/debian/llama.cpp-tools-multimodal.install
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/bin/llama-mtmd-cli
-/usr/libexec/*/ggml/llama-mtmd-cli

diff --git a/debian/llama.cpp-tools.install b/debian/llama.cpp-tools.install
index a028e9951559ba3c126c7866d6b885f28c61cd26..eaed1f25cffafebca689f8fcee6c0035a56ffc8c 100644 (file)
--- a/debian/llama.cpp-tools.install
+++ b/debian/llama.cpp-tools.install
@@ -6,3 +6,6 @@
 
 /usr/bin/llama-bench
 /usr/libexec/*/ggml/llama-bench
+
+/usr/bin/llama-mtmd-cli
+/usr/libexec/*/ggml/llama-mtmd-cli