From 97a97265fd801ffa18d289bb14eca84412a01755 Mon Sep 17 00:00:00 2001 From: crborga Date: Tue, 7 Apr 2020 21:35:28 -0400 Subject: [PATCH 1/6] Support Debian 10 Added support for building on Debian 10 without installing gcc7. --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index bd66c5f..b5fd7bc 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: grive2 Section: net Priority: optional Maintainer: Vitaliy Filippov -Build-Depends: debhelper, cmake, pkg-config, zlib1g-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libstdc++-7-dev |libstdc++-6-dev | libstdc++6-4.4-dev | libstdc++-4.9-dev | libstdc++-5-dev, libboost-filesystem-dev, libboost-program-options-dev, libboost-test-dev, libboost-regex-dev, libexpat1-dev, binutils-dev, libgcrypt-dev, libyajl-dev +Build-Depends: debhelper, cmake, pkg-config, zlib1g-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libstdc++-8-dev | libstdc++-7-dev | libstdc++-6-dev | libstdc++6-4.4-dev | libstdc++-4.9-dev | libstdc++-5-dev, libboost-filesystem-dev, libboost-program-options-dev, libboost-test-dev, libboost-regex-dev, libexpat1-dev, binutils-dev, libgcrypt-dev, libyajl-dev Standards-Version: 3.9.6 Homepage: https://yourcmc.ru/wiki/Grive2 From d7008b81c1d9ec8fa2249d038e96aac2b6adeab5 Mon Sep 17 00:00:00 2001 From: Jan Katins Date: Sun, 14 Mar 2021 22:55:36 +0100 Subject: [PATCH 2/6] Remove uneeded binutils-dev depency --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b5fd7bc..b9c9757 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: grive2 Section: net Priority: optional Maintainer: Vitaliy Filippov -Build-Depends: debhelper, cmake, pkg-config, zlib1g-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libstdc++-8-dev | libstdc++-7-dev | libstdc++-6-dev | libstdc++6-4.4-dev | libstdc++-4.9-dev | libstdc++-5-dev, libboost-filesystem-dev, libboost-program-options-dev, libboost-test-dev, libboost-regex-dev, libexpat1-dev, binutils-dev, libgcrypt-dev, libyajl-dev +Build-Depends: debhelper, cmake, pkg-config, zlib1g-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libstdc++-8-dev | libstdc++-7-dev | libstdc++-6-dev | libstdc++6-4.4-dev | libstdc++-4.9-dev | libstdc++-5-dev, libboost-filesystem-dev, libboost-program-options-dev, libboost-test-dev, libboost-regex-dev, libexpat1-dev, libgcrypt-dev, libyajl-dev Standards-Version: 3.9.6 Homepage: https://yourcmc.ru/wiki/Grive2 From 0b53b08f57f8cff6f9f029c13ca696bc0a88be77 Mon Sep 17 00:00:00 2001 From: Jan Schulz Date: Thu, 29 Nov 2018 15:25:00 +0100 Subject: [PATCH 3/6] Increment version for debian package and add some changes there * Updated debhelper compat level to latest stable one --- debian/changelog | 4 +++- debian/compat | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index db47f06..09ac290 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -grive2 (0.5.1+git20160731) unstable; urgency=medium +grive2 (0.5.2+git20210315) unstable; urgency=medium * Newer dev version + * Add systemd unit files and helper script for automatic syncs + * Add possibility to change client id and secret and save it between runs -- Vitaliy Filippov Wed, 31 Jul 2016 22:04:53 +0300 diff --git a/debian/compat b/debian/compat index 7f8f011..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +11 From e0965f7fb8ef5e99afdd851af9000318592d22c1 Mon Sep 17 00:00:00 2001 From: Jan Katins Date: Tue, 16 Mar 2021 21:36:26 +0100 Subject: [PATCH 4/6] Remove the libstdc++ dependency These are included in the right version via the suggested installation of build-essential, which which installs the right lib via dependencies: g++ -> g++- -> libstdc++- Adding it explicitly meant always adding new versions :-( --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index b9c9757..150f688 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: grive2 Section: net Priority: optional Maintainer: Vitaliy Filippov -Build-Depends: debhelper, cmake, pkg-config, zlib1g-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libstdc++-8-dev | libstdc++-7-dev | libstdc++-6-dev | libstdc++6-4.4-dev | libstdc++-4.9-dev | libstdc++-5-dev, libboost-filesystem-dev, libboost-program-options-dev, libboost-test-dev, libboost-regex-dev, libexpat1-dev, libgcrypt-dev, libyajl-dev +Build-Depends: debhelper, cmake, pkg-config, zlib1g-dev, libcurl4-openssl-dev | libcurl4-gnutls-dev, libboost-filesystem-dev, libboost-program-options-dev, libboost-test-dev, libboost-regex-dev, libexpat1-dev, libgcrypt-dev, libyajl-dev Standards-Version: 3.9.6 Homepage: https://yourcmc.ru/wiki/Grive2 From 27ca714e565da9f6959ceefd1bd657f96e245fc0 Mon Sep 17 00:00:00 2001 From: Jan Katins Date: Thu, 18 Mar 2021 10:34:15 +0100 Subject: [PATCH 5/6] Add .idea folder to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b33b2e2..de247d2 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ debian/grive/ debian/.debhelper obj-x86_64-linux-gnu/ + +.idea From 9076e3aed22400e408e4d0e9ecf2cb5d16719a85 Mon Sep 17 00:00:00 2001 From: Jan Katins Date: Tue, 23 Mar 2021 18:10:10 +0100 Subject: [PATCH 6/6] Ensure that the systemd files get installed in debian If you build in pbuilder, no systemd is installed and so the flag is set to false which means the files will not get installed. Adding the explicit flag will make sure they are included in the package. --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 6159692..6f9c7a7 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,7 @@ #!/usr/bin/make -f +override_dh_auto_configure: + dh_auto_configure -- -DHAVE_SYSTEMD=1 + %: dh $@ --buildsystem=cmake --parallel --builddirectory=build