diff --git a/debian/changelog b/debian/changelog index c5811f8e1d8c0134f7fd7dd56ec2f562a2487cb6..8830b142049eb836296e88575ca77eff113430fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +tarantool (1.4.6+20120629+2112-1) unstable; urgency=low + + * Package is built by gcc-4.7. + + -- Dmitry E. Oboukhov <unera@debian.org> Fri, 29 Jun 2012 21:11:30 +0400 + +tarantool (1.4.6+20120629+2105-1) unstable; urgency=low + + * Really fixed FTBFS with BSD (#679317). + + -- Dmitry E. Oboukhov <unera@debian.org> Fri, 29 Jun 2012 21:05:21 +0400 + +tarantool (1.4.6+20120629-1) unstable; urgency=low + + * New upstream version: fixed FTBFS with Debian/kFreeBSD. closes: #679317. + + -- Dmitry E. Oboukhov <unera@debian.org> Fri, 29 Jun 2012 17:26:03 +0400 + tarantool (1.4.6+20120626-1) unstable; urgency=low * New upstream version. diff --git a/debian/control b/debian/control index e1b08f268959cd12cb495b4a3cc8e3670cb9b0a6..8f43d9295604fcd36b2e332c1cd3e9603b936f97 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: cdbs, debhelper (>= 8), binutils-dev, dpkg-dev (>= 1.16.1~) Section: database -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://tarantool.org/ VCS-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/tarantool.git;a=summary VCS-Git: git+ssh://git.debian.org/git/collab-maint/tarantool.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1c91b7f1e77036f14b469e75e410aa43805edfc6..50a510e95c115d79f2d4523433f3132ebb1fa55b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,12 +27,13 @@ endif() # # libev uses ceil and floor from the standard math library # -set (ev_libs m) # # libev depends on librt under kFreeBSD if (TARGET_OS_DEBIAN_FREEBSD) - set (ev_libs "${ev_libs} rt") + set (ev_libs m rt) +else() + set (ev_libs m) endif() target_link_libraries(ev ${ev_libs})