Adapt to changes in ggml

diff --git a/debian/changelog b/debian/changelog
index 3ab60cb5c8a4a46bd010e6ffdf5be1eec419d72a..ffca047de17661d7f94a6fc59a4a3be1d0444212 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ whisper-cpp (1.7.6-1) unstable; urgency=medium
 
   * Update upstream
 
 
   * Update upstream
 

- -- Mathieu Baudier <mbaudier@argeo.org>  Tue, 24 Jun 2025 05:58:07 +0000
+ -- Mathieu Baudier <mbaudier@argeo.org>  Fri, 15 Aug 2025 18:33:41 +0000

diff --git a/debian/control b/debian/control
index 6a9470628a44c9f157000a4fb87c62570beb638c..11993456f89dcc10327521e165b7497075f35fef 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,41 +2,46 @@ Source: whisper-cpp
 Section: science
 Priority: optional
 Maintainer: Mathieu Baudier <mbaudier@argeo.org>
 Section: science
 Priority: optional
 Maintainer: Mathieu Baudier <mbaudier@argeo.org>

-Build-Depends: debhelper-compat (= 13), pkgconf,
-       cmake-data, cmake,
-       libsdl2-dev,
-       ggml-dev,
-       libllama0-dev,
-Standards-Version: 4.7.0
-Vcs-Git: https://git.djapps.eu/pkg/ggml/sources/whisper.cpp
+Standards-Version: 4.7.2

 Vcs-Browser: https://git.djapps.eu/?p=pkg/ggml/sources/whisper.cpp;a=summary
 Vcs-Browser: https://git.djapps.eu/?p=pkg/ggml/sources/whisper.cpp;a=summary

-Homepage: https://github.com/ggerganov/whisper.cpp
-Rules-Requires-Root: binary-targets
+Vcs-Git: https://git.djapps.eu/pkg/ggml/sources/whisper.cpp
+Homepage: https://github.com/ggml-org/whisper.cpp
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               libsdl2-dev,
+               libggml-dev,
+               libllama-dev,
+               pkgconf,
+Rules-Requires-Root: no

 
 Package: libwhisper1
 Section: libs
 Architecture: any
 Multi-Arch: same
 
 Package: libwhisper1
 Section: libs
 Architecture: any
 Multi-Arch: same

-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends},
- libggml0
+Depends: libggml0
+         ${misc:Depends},
+         ${shlibs:Depends}

 Description: Inference of Whisper in pure C/C++ (shared library)
  The shared library provides the core of whisper.cpp
  speech-to-text capabilities using a Whisper model.
 
 Package: whisper-cpp-cli
 Architecture: any
 Description: Inference of Whisper in pure C/C++ (shared library)
  The shared library provides the core of whisper.cpp
  speech-to-text capabilities using a Whisper model.
 
 Package: whisper-cpp-cli
 Architecture: any

-Depends: ${misc:Depends}, ${shlibs:Depends},
- libwhisper1
+Multi-Arch: same
+Depends: libwhisper1,
+         ${misc:Depends},
+         ${shlibs:Depends}

 Description: Inference of Whisper in pure C/C++ (CLI)
  A versatile tool giving command line access to most
  whisper-cpp capabilities.
 
 Package: whisper-cpp-stream
 Architecture: any
 Description: Inference of Whisper in pure C/C++ (CLI)
  A versatile tool giving command line access to most
  whisper-cpp capabilities.
 
 Package: whisper-cpp-stream
 Architecture: any

-Depends: ${misc:Depends}, ${shlibs:Depends},
- libwhisper1,
- libsdl2-2.0-0
+Multi-Arch: same
+Depends: libwhisper1,
+         libsdl2-2.0-0,
+         ${misc:Depends},
+         ${shlibs:Depends}

 Description: Inference of Whisper in pure C/C++ (stream)
  Real-time speech-to-text of SDL sound input.
  The SDL sound input (typically a microphone) is
 Description: Inference of Whisper in pure C/C++ (stream)
  Real-time speech-to-text of SDL sound input.
  The SDL sound input (typically a microphone) is


@@ -44,23 +49,29 @@ Description: Inference of Whisper in pure C/C++ (stream)
 
 Package: whisper-cpp-talk-llama
 Architecture: any
 
 Package: whisper-cpp-talk-llama
 Architecture: any

-Depends: ${misc:Depends}, ${shlibs:Depends},
- libwhisper1, libllama0,
- espeak-ng,
- libswresample4, libavcodec59, libavformat59,
- libsdl2-2.0-0
+Multi-Arch: same
+Depends: libwhisper1,
+         libllama0,
+         espeak-ng,
+         libswresample4,
+         libavcodec59,
+         libavformat59,
+         libsdl2-2.0-0,
+         ${misc:Depends},
+         ${shlibs:Depends}

 Description: Inference of Whisper in pure C/C++ (talk-llama)
  A tool allowing one to "talk" with a large language model,
  using llama.cpp.
  The SDL input (typically from a microphone) is translated
  into text by whisper.cpp and sent to llama.cpp for processing.
 
 Description: Inference of Whisper in pure C/C++ (talk-llama)
  A tool allowing one to "talk" with a large language model,
  using llama.cpp.
  The SDL input (typically from a microphone) is translated
  into text by whisper.cpp and sent to llama.cpp for processing.
 

-Package: libwhisper1-dev
+Package: libwhisper-dev

 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Section: libdevel
 Architecture: any
 Multi-Arch: same

-Depends: ${misc:Depends},
- ggml-dev, libwhisper1 (= ${binary:Version})
+Depends: libwhisper1 (= ${binary:Version}),
+         libggml-dev,
+         ${misc:Depends}

 Description: Inference of Whisper in pure C/C++ (development files)
  Development files for using whisper.cpp as a shared library
  in applications.
 Description: Inference of Whisper in pure C/C++ (development files)
  Development files for using whisper.cpp as a shared library
  in applications.

diff --git a/debian/libwhisper-dev.install b/debian/libwhisper-dev.install
new file mode 100644 (file)
index 0000000..f447e60
--- /dev/null
+++ b/debian/libwhisper-dev.install
@@ -0,0 +1,7 @@
+/usr/include/whisper*.h
+# unversioned symbolic link
+/usr/lib/*/libwhisper.so
+
+/usr/lib/*/pkgconfig/whisper.pc
+
+/usr/lib/*/cmake/whisper/whisper-*.cmake

diff --git a/debian/libwhisper1-dev.install b/debian/libwhisper1-dev.install
deleted file mode 100644 (file)
index f447e60..0000000
--- a/debian/libwhisper1-dev.install
+++ /dev/null
@@ -1,7 +0,0 @@
-/usr/include/whisper*.h
-# unversioned symbolic link
-/usr/lib/*/libwhisper.so
-
-/usr/lib/*/pkgconfig/whisper.pc
-
-/usr/lib/*/cmake/whisper/whisper-*.cmake