Improve debian build based on lintian

diff --git a/debian/control b/debian/control
index b18e3eccbd553ddf5a018c8fd63c1683b0faa1b1..ad38d857f165e190d51799e0fbf69121958f703a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: science
 Priority: optional
 Maintainer: Mathieu Baudier <mbaudier@argeo.org>
 Build-Depends: debhelper-compat (= 13), pkg-config, cmake-data, cmake, cpio, git, patchelf,
-       libopenblas-openmp-dev, libopenblas64-openmp-dev [amd64 arm64], libvulkan-dev, glslc
+       libopenblas-openmp-dev, libopenblas64-openmp-dev [amd64 arm64],
+       libvulkan-dev, glslc
 Standards-Version: 4.5.1
 Homepage: https://github.com/ggerganov
 Rules-Requires-Root: binary-targets
@@ -11,7 +12,8 @@ Rules-Requires-Root: binary-targets
 Package: ggml
 Priority: optional
 Architecture: any
-Depends: libggml, libggml-cpu
+Depends: ${misc:Depends},
+ libggml, libggml-cpu
 Description: Tensor library for machine learning (metapackage)
  GGML Tensor library for machine learning. (metapackage)
 
@@ -20,7 +22,7 @@ Priority: optional
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Tensor library for machine learning (base)
  GGML Tensor library for machine learning. (base)
 
@@ -29,7 +31,7 @@ Priority: optional
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends},
  libggml-base
 Description: Tensor library for machine learning (loader)
  GGML Tensor library for machine learning. (loader)
@@ -39,7 +41,7 @@ Priority: optional
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends},
  libggml
 Description: Tensor library for machine learning (CPU backend)
  GGML Tensor library for machine learning. (CPU backend)
@@ -49,7 +51,7 @@ Priority: optional
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends},
  libggml,
 # GGML shows warning that it uses OpenMP if default OpenBLAS (pthread) is used.
  libopenblas0-openmp, libopenblas64-0-openmp [amd64 arm64],
@@ -60,7 +62,7 @@ Package: libggml-rpc
 Priority: optional
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
+Pre-Depends: ${misc:Depends}, ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  libggml
 Description: Tensor library for machine learning (RPC backend)
@@ -71,7 +73,7 @@ Priority: optional
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends},
  libggml,
  libvulkan1
 Description: Tensor library for machine learning (Vulkan backend)
@@ -80,7 +82,7 @@ Description: Tensor library for machine learning (Vulkan backend)
 Package: ggml-dev
 Priority: optional
 Architecture: any
-Depends: ggml (= ${binary:Version})
+Depends: ${misc:Depends},
+ ggml (= ${binary:Version})
 Description: Tensor library for machine learning (development files)
  GGML Tensor library for machine learning. (development files)
- 
\ No newline at end of file

diff --git a/debian/copyright b/debian/copyright
index 8debe6135a2016e3829cacb10cbc4bdb4f21654f..3a76aec4f8bdbe0807017f7e92188d7d15204770 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -12,10 +12,10 @@ License: MIT
  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  copies of the Software, and to permit persons to whom the Software is
  furnished to do so, subject to the following conditions:
- 
+ .
  The above copyright notice and this permission notice shall be included in all
  copies or substantial portions of the Software.
- 
+ .
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

diff --git a/debian/libggml-cpu.lintian-overrides b/debian/libggml-cpu.lintian-overrides
new file mode 100644 (file)
index 0000000..18267db
--- /dev/null
+++ b/debian/libggml-cpu.lintian-overrides
@@ -0,0 +1 @@
+libggml-cpu: package-name-doesnt-match-sonames libggml-cpu-alderlake libggml-cpu-haswell libggml-cpu-icelake libggml-cpu-sandybridge libggml-cpu-sapphirerapids libggml-cpu-skylakex