Improve Debian packaging based on lintian feedback

diff --git a/debian/control b/debian/control
index f17ab4c1306858117d3d1e6f3992f23018904951..a175168acfb862be54ca01adeb885624ba557a7d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Description: Inference of Whisper in pure C/C++ (development files)
 Package: whisper-cpp-cli
 Architecture: any
 Priority: optional
-Depends: ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends},
  libwhisper,
  libswresample4, libavcodec59, libavformat59
 Description: Inference of Whisper in pure C/C++ (CLI)
@@ -41,7 +41,7 @@ Description: Inference of Whisper in pure C/C++ (CLI)
 Package: whisper-cpp-stream
 Architecture: any
 Priority: optional
-Depends: ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends},
  libwhisper,
  libswresample4, libavcodec59, libavformat59,
  libsdl2-2.0-0
@@ -51,7 +51,7 @@ Description: Inference of Whisper in pure C/C++ (stream)
 Package: whisper-cpp-talk-llama
 Architecture: any
 Priority: optional
-Depends: ${shlibs:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends},
  libwhisper, libllama,
  espeak-ng,
  libswresample4, libavcodec59, libavformat59,
@@ -62,6 +62,7 @@ Description: Inference of Whisper in pure C/C++ (talk-llama)
 Package: whisper-cpp-dev
 Architecture: any
 Priority: optional
-Depends: libwhisper-dev
+Depends: ${misc:Depends},
+ libwhisper-dev
 Description: Inference of Whisper in pure C/C++ (common static library)
  Whisper.cpp inference of Whisper in pure C/C++ (common static library).

diff --git a/debian/libwhisper-dev.install b/debian/libwhisper-dev.install
index ec8c45999774fd3969eb119120935a1e47c9cb31..2606539b5d7085b2b324a1f988a9d1ff9bbc5bed 100644 (file)
--- a/debian/libwhisper-dev.install
+++ b/debian/libwhisper-dev.install
@@ -1,4 +1,6 @@
 /usr/include/whisper*.h
 
-/usr/lib/pkgconfig/*.pc
+/usr/lib/*/pkgconfig/whisper.pc
+
+/usr/lib/*/libwhisper.so
 /usr/lib/*/cmake/whisper/whisper-*.cmake

diff --git a/debian/libwhisper.install b/debian/libwhisper.install
index c9a9ccb7d21691f7fdddb2f575c8f1bec62f3687..df7eb36fb1317c04e36e056aba0862733b497472 100644 (file)
--- a/debian/libwhisper.install
+++ b/debian/libwhisper.install
@@ -1 +1 @@
-/usr/lib/*/libwhisper*
\ No newline at end of file
+/usr/lib/*/libwhisper.so.*

diff --git a/debian/rules b/debian/rules
index 9198ce7b3f92a9bd196fec72efd69d62395a6557..b87096633a92305be13ab73fde1914f53eb33cb1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,8 @@ include /usr/share/dpkg/architecture.mk
 
 build_multiarch=build/$(DEB_HOST_MULTIARCH)
 install_bin=debian/tmp/usr/bin
+install_lib=debian/tmp/usr/lib
+install_lib_multiarch=debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 install_libexec_multiarch=debian/tmp/usr/libexec/$(DEB_HOST_MULTIARCH)
 
 %:
@@ -34,6 +36,10 @@ override_dh_auto_install:
        mv $$file $(install_libexec_multiarch)/ggml/$$(basename "$$file"); \
                ln -s --relative -t $(install_bin) $(install_libexec_multiarch)/ggml/$$(basename "$$file"); \
        done
+       
+       # Multiarch pkgconfig
+       mkdir -p $(install_lib_multiarch)/pkgconfig
+       mv $(install_lib)/pkgconfig/*.pc $(install_lib_multiarch)/pkgconfig
 
 override_dh_auto_test:
        # tests which depends on remote location are failing