Better align with official Debian packages

diff --git a/debian/changelog b/debian/changelog
index 2e5f2c36d1d4cc5dc979d3f76d57318ef4b555e8..89ab60f29da079fb48dc68cb2cf8f5c8d5b2092a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ggml (0.9.7-1) unstable; urgency=medium
 
   * Upstream release
+  * Better align with official Debian packages
 
  -- Mathieu Baudier <mbaudier@argeo.org>  Mon, 16 Feb 2026 05:14:00 +0000
 

diff --git a/debian/control b/debian/control
index 41d1758258b0a97db692fea240e40887c65e59e6..e141b852ad1dfcb61f8965cead785e12c3d985a6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,9 +10,9 @@ Build-Depends: cmake,
                lsb-release,
                debhelper-compat (= 13),
                pkgconf,
-               libvulkan-dev            [amd64] <!pkg.ggml.novulkan>,
-               glslc                    [amd64] <!pkg.ggml.novulkan>,
-               nvidia-cuda-toolkit-gcc  [amd64] <!pkg.ggml.nocuda>,
+               libvulkan-dev            <!pkg.ggml.novulkan>,
+               glslc                    <!pkg.ggml.novulkan>,
+               nvidia-cuda-toolkit-gcc  <!pkg.ggml.nocuda>,
 Rules-Requires-Root: no
 
 Package: libggml-base0
@@ -46,7 +46,7 @@ Description: Tensor library for machine learning (development files)
  This developments package provides the files required to build
  software based on ggml.
 
-Package: libggml-backend-cpu
+Package: libggml0-backend-cpu
 Architecture: any
 Multi-Arch: same
 Depends: libggml-base0 (= ${binary:Version}),
@@ -61,7 +61,7 @@ Description: Tensor library for machine learning (CPU backend)
  allowing one to run computations on older CPU while still benefiting from
  the capabilities of recent ones.
 
-Package: libggml-backend-rpc
+Package: libggml0-backend-rpc
 Architecture: any
 Multi-Arch: same
 Depends: libggml-base0 (= ${binary:Version}),
@@ -71,7 +71,7 @@ Description: Tensor library for machine learning (RPC backend)
  The ggml RPC backend allows one to distribute computations over
  the network on remote ggml backends.
 
-Package: libggml-backend-vulkan
+Package: libggml0-backend-vulkan
 Architecture: amd64
 Multi-Arch: same
 Depends: libggml-base0 (= ${binary:Version}),
@@ -83,7 +83,7 @@ Description: Tensor library for machine learning (Vulkan backend)
  computations based on the Vulkan API. This is typically used
  to leverage GPU parallel computations capabilities.
 
-Package: libggml-backend-cuda
+Package: libggml0-backend-cuda
 Architecture: amd64
 Multi-Arch: same
 Depends: libggml-base0 (= ${binary:Version}),

diff --git a/debian/libggml-backend-cpu.install b/debian/libggml-backend-cpu.install
deleted file mode 100644 (file)
index dc3268d..0000000
--- a/debian/libggml-backend-cpu.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/ggml/backends0/libggml-cpu*.so

diff --git a/debian/libggml-backend-cuda.install b/debian/libggml-backend-cuda.install
deleted file mode 100644 (file)
index 6cba077..0000000
--- a/debian/libggml-backend-cuda.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/ggml/backends0/libggml-cuda.so

diff --git a/debian/libggml-backend-rpc.install b/debian/libggml-backend-rpc.install
deleted file mode 100644 (file)
index ff6c47d..0000000
--- a/debian/libggml-backend-rpc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/ggml/backends0/libggml-rpc.so

diff --git a/debian/libggml-backend-vulkan.install b/debian/libggml-backend-vulkan.install
deleted file mode 100644 (file)
index a3e2675..0000000
--- a/debian/libggml-backend-vulkan.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/ggml/backends0/libggml-vulkan.so

diff --git a/debian/libggml-dev.install b/debian/libggml-dev.install
index 4e97f18b50d1687a310c63f6a8ed0aeecaf60533..dd2709066f9b6f1ecf0e5e3952969182e8ab84b7 100644 (file)
--- a/debian/libggml-dev.install
+++ b/debian/libggml-dev.install
@@ -1,9 +1,6 @@
-/usr/include/*
-/usr/share/pkgconfig/*.pc
-/usr/lib/*/cmake/ggml/*.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libggml.so
+usr/lib/${DEB_HOST_MULTIARCH}/libggml-base.so
+usr/include
 
-# Symbolic links
-/usr/lib/*/libggml.so
-/usr/lib/*/libggml-base.so
-
-include/ggml-cpp.h usr/include/
+/usr/share/pkgconfig/ggml.pc        usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake

diff --git a/debian/libggml0-backend-cpu.install b/debian/libggml0-backend-cpu.install
new file mode 100644 (file)
index 0000000..dc3268d
--- /dev/null
+++ b/debian/libggml0-backend-cpu.install
@@ -0,0 +1 @@
+usr/lib/*/ggml/backends0/libggml-cpu*.so

diff --git a/debian/libggml0-backend-cuda.install b/debian/libggml0-backend-cuda.install
new file mode 100644 (file)
index 0000000..6cba077
--- /dev/null
+++ b/debian/libggml0-backend-cuda.install
@@ -0,0 +1 @@
+usr/lib/*/ggml/backends0/libggml-cuda.so

diff --git a/debian/libggml0-backend-rpc.install b/debian/libggml0-backend-rpc.install
new file mode 100644 (file)
index 0000000..ff6c47d
--- /dev/null
+++ b/debian/libggml0-backend-rpc.install
@@ -0,0 +1 @@
+usr/lib/*/ggml/backends0/libggml-rpc.so

diff --git a/debian/libggml0-backend-vulkan.install b/debian/libggml0-backend-vulkan.install
new file mode 100644 (file)
index 0000000..a3e2675
--- /dev/null
+++ b/debian/libggml0-backend-vulkan.install
@@ -0,0 +1 @@
+usr/lib/*/ggml/backends0/libggml-vulkan.so

diff --git a/debian/rules b/debian/rules
index cd8c085544c3834716a3e9aba40508252e72f779..e7a64deee4488a0946fc46387d898cfacf8d8f4c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -30,21 +30,6 @@ CMAKE_OPTS  = -DCMAKE_BUILD_TYPE=RelWithDebInfo \
 # Common backends
 CMAKE_OPTS += -DGGML_RPC=ON \
 
-ifeq ($(DEB_TARGET_ARCH),arm64)
-FLAGS_ARGEO=-O3 -g -DNDEBUG
-
-CMAKE_OPTS += -DGGML_CPU_ALL_VARIANTS=OFF
-
-ifeq ($(distribution),Ubuntu)
-# Optimize for Raspberry Pi 5 on Ubuntu
-#FLAGS_ARGEO+= -mcpu=cortex-a76+crc+crypto
-CMAKE_OPTS += -DGGML_CPU_ARM_ARCH=armv8-a
-#CMAKE_OPTS += -DGGML_NATIVE=ON
-else
-CMAKE_OPTS += -DGGML_CPU_ARM_ARCH=armv8-a
-endif
-
-else # amd64
 FLAGS_ARGEO=-O3 -g -DNDEBUG
 
 CMAKE_OPTS += -DGGML_CPU_ALL_VARIANTS=ON
@@ -59,8 +44,6 @@ CMAKE_OPTS += -DGGML_CUDA=ON \
               -DCUDAToolkit_ROOT=/usr
 endif
 
-endif # arm64
-
 CMAKE_OPTS += -DCMAKE_C_FLAGS_RELWITHDEBINFO="$(FLAGS_ARGEO)" \
               -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(FLAGS_ARGEO)" \