From 47fed45700b0351bc90cd444cf3790b80516193f Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Sun, 11 Oct 2020 16:23:50 +0200 Subject: [PATCH] Improve Linux packages --- pkgs/build.sh | 2 ++ pkgs/debian/changelog | 12 ++++++++++++ pkgs/debian/control | 10 +++++----- pkgs/debian/patches/python3.diff | 10 ++++++++++ pkgs/debian/patches/series | 1 + 5 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 pkgs/debian/patches/python3.diff diff --git a/pkgs/build.sh b/pkgs/build.sh index 06146d47..109d2a0e 100755 --- a/pkgs/build.sh +++ b/pkgs/build.sh @@ -68,6 +68,7 @@ overrides: - bash-completion - python3-requests - python3-pygments + - mime-support scripts: postinstall: ../scripts/deb/postinstall.sh preremove: ../scripts/deb/preremove.sh @@ -75,6 +76,7 @@ overrides: rpm: recommends: - bash-completion + - mailcap # centos 8 has python3-requests, centos 6/7 python-requests scripts: postinstall: ../scripts/rpm/postinstall diff --git a/pkgs/debian/changelog b/pkgs/debian/changelog index 31902b6a..0b5f0198 100644 --- a/pkgs/debian/changelog +++ b/pkgs/debian/changelog @@ -1,3 +1,15 @@ +sftpgo (1.1.0-1ppa3) bionic; urgency=medium + + * Fix packaging errors + + -- Nicola Murino Sun, 11 Oct 2020 15:13:41 +0200 + +sftpgo (1.1.0-1ppa2) bionic; urgency=medium + + * Add mime-support to recommends + + -- Nicola Murino Sun, 11 Oct 2020 12:18:14 +0200 + sftpgo (1.1.0-1ppa1) bionic; urgency=medium * New upstream release. diff --git a/pkgs/debian/control b/pkgs/debian/control index fff1ee6e..bbf00661 100644 --- a/pkgs/debian/control +++ b/pkgs/debian/control @@ -1,16 +1,16 @@ Source: sftpgo -Section: net +Section: net Priority: optional Maintainer: Nicola Murino Build-Depends: debhelper (>= 10) Standards-Version: 4.1.2 -Homepage: https://github.com/drakkan/sftpgo -Vcs-Git: https://github.com/drakkan/sftpgo.git +Homepage: https://github.com/drakkan/sftpgo +Vcs-Git: https://github.com/drakkan/sftpgo.git Package: sftpgo -Architecture: amd64 +Architecture: amd64 Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: bash-completion, python3-requests, python3-pygments +Recommends: bash-completion, python3-requests, python3-pygments, mime-support Description: Fully featured and highly configurable SFTP server SFTPGo has optional FTP/S and WebDAV support. It can serve local filesystem, S3 (Compatible) Object Storages diff --git a/pkgs/debian/patches/python3.diff b/pkgs/debian/patches/python3.diff new file mode 100644 index 00000000..c3eca933 --- /dev/null +++ b/pkgs/debian/patches/python3.diff @@ -0,0 +1,10 @@ +Index: sftpgo/examples/rest-api-cli/sftpgo_api_cli +=================================================================== +--- sftpgo.orig/examples/rest-api-cli/sftpgo_api_cli ++++ sftpgo/examples/rest-api-cli/sftpgo_api_cli +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + import argparse + import base64 + from datetime import datetime diff --git a/pkgs/debian/patches/series b/pkgs/debian/patches/series index 8d319f27..7f85e75b 100644 --- a/pkgs/debian/patches/series +++ b/pkgs/debian/patches/series @@ -1 +1,2 @@ config.diff +python3.diff