Browse Source

More debian fixes.

tags/0.5.1
Vsevolod Stakhov 12 years ago
parent
commit
93c3046ce8
3 changed files with 18 additions and 21 deletions
  1. 8
    20
      debian/copyright
  2. 8
    1
      lib/CMakeLists.txt
  3. 2
    0
      src/client/CMakeLists.txt

+ 8
- 20
debian/copyright View File

@@ -6,28 +6,16 @@ Files: contrib/lgpl/*
Copyright: 1999, 2000 Scott Wimer
Copyright: 2004, Matthias Clasen <mclasen@redhat.com>
Copyright: 2005 - 2007, Marco Barisione <marco@barisione.org>
License: LGPL-2+
License: LGPL

Files: src/json/*
Copyright: 2009 Petri Lehtinen <petri@digip.org>
License: Expat

Files: *
Copyright: 2008-2011 Vsevolod Stakhov <vsevolod@highsecure.ru>
License: BSD
Copyright: 2008-2012 Vsevolod Stakhov <vsevolod@highsecure.ru>
License: BSD-2-clause

Files: debian/*
Copyright: 2011 Vsevolod Stakhov <vsevolod@highsecure.ru>
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Copyright: 2011-2012 Vsevolod Stakhov <vsevolod@highsecure.ru>
License: GPL

+ 8
- 1
lib/CMakeLists.txt View File

@@ -86,7 +86,9 @@ ENDIF(NO_SHARED MATCHES "OFF")
# Rspamd client
ADD_LIBRARY(rspamdclient SHARED ${LIBRSPAMDCLIENTSRC})
ADD_LIBRARY(rspamdclient_static STATIC ${LIBRSPAMDCLIENTSRC})
IF(NOT DEBIAN_BUILD)
SET_TARGET_PROPERTIES(rspamdclient PROPERTIES PUBLIC_HEADER "client/librspamdclient.h")
ENDIF(NOT DEBIAN_BUILD)

IF(CMAKE_COMPILER_IS_GNUCC)
SET_TARGET_PROPERTIES(rspamdclient PROPERTIES COMPILE_FLAGS "-fno-strict-aliasing")
@@ -98,8 +100,8 @@ TARGET_LINK_LIBRARIES(rspamdclient rspamd-util)
TARGET_LINK_LIBRARIES(rspamdclient_static ${CMAKE_REQUIRED_LIBRARIES})
TARGET_LINK_LIBRARIES(rspamdclient_static ${GLIB2_LIBRARIES})

IF(NOT DEBIAN_BUILD)
SET_TARGET_PROPERTIES(rspamdclient PROPERTIES VERSION ${RSPAMD_VERSION})
IF(NOT DEBIAN_BUILD)
SET_TARGET_PROPERTIES(rspamdclient_static PROPERTIES VERSION ${RSPAMD_VERSION})
ENDIF(NOT DEBIAN_BUILD)

@@ -108,10 +110,15 @@ IF(GLIB_COMPAT)
TARGET_LINK_LIBRARIES(rspamdclient glibadditions)
ENDIF(GLIB_COMPAT)

IF(NOT DEBIAN_BUILD)
INSTALL(TARGETS rspamdclient rspamdclient_static LIBRARY PUBLIC_HEADER
LIBRARY DESTINATION ${LIBDIR}
PUBLIC_HEADER DESTINATION ${INCLUDEDIR}
ARCHIVE DESTINATION ${LIBDIR})
ELSE(NOT DEBIAN_BUILD)
INSTALL(TARGETS rspamdclient LIBRARY
LIBRARY DESTINATION ${LIBDIR})
ENDIF(NOT DEBIAN_BUILD)

# Librspamd-server

+ 2
- 0
src/client/CMakeLists.txt View File

@@ -12,6 +12,8 @@ ENDIF(GLIB_COMPAT)
TARGET_LINK_LIBRARIES(rspamc ${GLIB2_LIBRARIES})
TARGET_LINK_LIBRARIES(rspamc ${CMAKE_REQUIRED_LIBRARIES})
TARGET_LINK_LIBRARIES(rspamc m)
IF(NOT DEBIAN_BUILD)
SET_TARGET_PROPERTIES(rspamc PROPERTIES VERSION ${RSPAMD_VERSION})
ENDIF(NOT DEBIAN_BUILD)

INSTALL(TARGETS rspamc RUNTIME DESTINATION bin)

Loading…
Cancel
Save