Remove separate server package

diff --git a/debian/control b/debian/control
index 018c6ab1c1aa1b132190fe18a80d73eff7d07661..e85df17f372fd671a2b68ac72aa78f2d70f8f095 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -61,14 +61,7 @@ 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-server
-Architecture: any
-Depends: libllama0 (= ${binary:Version}),
-         libmtmd0 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: Inference of large language models in pure C/C++ (server tools)
+ .
  llama-server: HTTP server support.
 
 Package: libllama-dev

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

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

diff --git a/debian/llama.cpp-tools.bash-completion b/debian/llama.cpp-tools.bash-completion
index 96e8acf0c0cb4a7df1b61fee29d71247bbb6d19c..cf7d2de640ebb2773300d56406e3a2758e9397af 100644 (file)
--- a/debian/llama.cpp-tools.bash-completion
+++ b/debian/llama.cpp-tools.bash-completion
@@ -2,3 +2,4 @@ completions/llama-completion
 # completions/llama-quantize does not actually use these options
 completions/llama-bench
 completions/llama-mtmd-cli
+completions/llama-server

diff --git a/debian/llama.cpp-tools.install b/debian/llama.cpp-tools.install
index 076331045bd4bf754ed35414fa87bafd0ad8c489..1bffbe15922ecd4749cf531028d93adbdb069fe7 100644 (file)
--- a/debian/llama.cpp-tools.install
+++ b/debian/llama.cpp-tools.install
@@ -12,3 +12,6 @@
 
 /usr/bin/llama-mtmd-cli
 /usr/libexec/*/ggml/llama-mtmd-cli
+
+/usr/bin/llama-server
+/usr/libexec/*/ggml/llama-server