Merge pull request #402 from kiwix/legoktm-aria2

Move aria2 from a build dependency to runtime
This commit is contained in:
Kelson 2020-08-05 23:08:21 +02:00 committed by GitHub
commit 98a10d2ca1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -38,11 +38,13 @@ libraries need to be available:
* [ICU](https://site.icu-project.org/) (package `libicu-dev` on Ubuntu) * [ICU](https://site.icu-project.org/) (package `libicu-dev` on Ubuntu)
* [ZIM](https://openzim.org/) (package `libzim-dev` on Ubuntu) * [ZIM](https://openzim.org/) (package `libzim-dev` on Ubuntu)
* [Pugixml](https://pugixml.org/) (package `libpugixml-dev` on Ubuntu) * [Pugixml](https://pugixml.org/) (package `libpugixml-dev` on Ubuntu)
* [Aria2](https://aria2.github.io/) (package `aria2` on Ubuntu)
* [Mustache](https://github.com/kainjow/Mustache) (Just copy the * [Mustache](https://github.com/kainjow/Mustache) (Just copy the
header `mustache.hpp` somewhere it can be found by the compiler and/or header `mustache.hpp` somewhere it can be found by the compiler and/or
set CPPFLAGS with correct `-I` option). Use Mustache version 3 only. set CPPFLAGS with correct `-I` option). Use Mustache version 3 only.
The following dependency needs to be available at runtime:
* [Aria2](https://aria2.github.io/) (package `aria2` on Ubuntu)
These dependencies may or may not be packaged by your operating These dependencies may or may not be packaged by your operating
system. They may also be packaged but only in an older version. The system. They may also be packaged but only in an older version. The
compilation script will tell you if one of them is missing or too old. compilation script will tell you if one of them is missing or too old.

4
debian/control vendored
View File

@ -22,7 +22,7 @@ Package: libkiwix-dev
Section: libdevel Section: libdevel
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Depends: libkiwix9 (= ${binary:Version}), ${misc:Depends}, python3, aria2, Depends: libkiwix9 (= ${binary:Version}), ${misc:Depends}, python3,
libzim-dev (>= 6.0.0), libzim-dev (>= 6.0.0),
libicu-dev, libicu-dev,
libpugixml-dev, libpugixml-dev,
@ -37,7 +37,7 @@ Description: library of common code for Kiwix (development)
Package: libkiwix9 Package: libkiwix9
Architecture: any Architecture: any
Multi-Arch: same Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, aria2
Conflicts: libkiwix0, libkiwix3 Conflicts: libkiwix0, libkiwix3
Description: library of common code for Kiwix Description: library of common code for Kiwix
Kiwix is an offline Wikipedia reader. libkiwix provides the Kiwix is an offline Wikipedia reader. libkiwix provides the