Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update debian packaging #340

Merged
merged 6 commits into from May 14, 2021
Merged

Conversation

jankatins
Copy link

@jankatins jankatins commented Mar 15, 2021

Updates debian version and removes a unneeded dependency.

Includes #314 to clean up the merge conflict with it

crborga and others added 6 commits April 7, 2020 21:35
Added support for building on Debian 10 without installing gcc7.
* Updated debhelper compat level to latest stable one
These are included in the right version via the suggested installation of build-essential, which which installs the right lib via dependencies: g++ -> g++-<version> ->  libstdc++-<version>

Adding it explicitly meant always adding new versions  :-(
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.
@jankatins jankatins changed the title Update debian version Update debian packaging Mar 23, 2021
@@ -1,4 +1,7 @@
#!/usr/bin/make -f

override_dh_auto_configure:
dh_auto_configure -- -DHAVE_SYSTEMD=1
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I build the package in pbuilder and there systemd is not installed, so this needs to be passed in to install the systemd files

debian/control Outdated
@@ -2,7 +2,7 @@ Source: grive2
Section: net
Priority: optional
Maintainer: Vitaliy Filippov <vitalif@mail.ru>
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
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least on my system (debian unstable) it wasn't required

@jankatins jankatins mentioned this pull request Mar 24, 2021
@vitalif vitalif merged commit 3a28149 into vitalif:master May 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants