diff options
| author | Anton Adamansky <adamansky@gmail.com> | 2015-03-22 23:32:41 +0600 |
|---|---|---|
| committer | Anton Adamansky <adamansky@gmail.com> | 2015-03-22 23:32:41 +0600 |
| commit | f3761b712f7e606c7e24e72975afc0dceb2ad554 (patch) | |
| tree | f5651a98ee3dd35f3974266a77e5164c05915c3f /installer | |
| parent | f2727399e99a5f36b5b4e113e4c53d4e60d52406 (diff) | |
| download | ejdb-f3761b712f7e606c7e24e72975afc0dceb2ad554.tar.gz ejdb-f3761b712f7e606c7e24e72975afc0dceb2ad554.tar.bz2 ejdb-f3761b712f7e606c7e24e72975afc0dceb2ad554.zip | |
* rt lib depenedency on MacOS
* fixed incorrect static libejdb linkage options
* minor fixes in project build scripts
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | installer/debian/dput.cf.in | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/installer/CMakeLists.txt b/installer/CMakeLists.txt index 344f484..21ab97f 100644 --- a/installer/CMakeLists.txt +++ b/installer/CMakeLists.txt @@ -33,7 +33,7 @@ if (PACKAGE_DEB) set(CPACK_DEBIAN_PACKAGE_PRIORITY optional) set(CPACK_DEBIAN_PACKAGE_DEPENDS zlib1g) set(CPACK_DEBIAN_PACKAGE_BUILD_DEPENDS pkg-config git devscripts dh-make zlib1g-dev) - set(PPA_DEBIAN_VERSION ppa1) + set(PPA_DEBIAN_VERSION ppa3) if (PROJECT_PPA) set(DPUT_HOST ${PROJECT_PPA}) endif() @@ -45,5 +45,9 @@ endif(PACKAGE_DEB) include(CPack) if (ENABLE_PPA) + if (NOT PROJECT_PPA_DISTRIB_TARGET) + set(PROJECT_PPA_DISTRIB_TARGET vivid utopic trusty precise) + endif() + set(DPUT_CONFIG_IN ${CMAKE_CURRENT_SOURCE_DIR}/debian/dput.cf.in) include(UploadPPA) endif() diff --git a/installer/debian/dput.cf.in b/installer/debian/dput.cf.in new file mode 100644 index 0000000..c78437b --- /dev/null +++ b/installer/debian/dput.cf.in @@ -0,0 +1,5 @@ +[ppa] +fqdn = ppa.launchpad.net +method = sftp +login = @PROJECT_PPA_USER@ +incoming = ~%(ppa)s/ubuntu/@DPUT_DIST@ |