Fix debian build files.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e42fa9e824a493f9c0fb96b30c6d40fe7d3a945..fcb19df285a3dd4d9bb802dbd316dcc77b58d77f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,7 @@ OPTION(ENABLE_SQLITE       "Find and link with sqlite3 library [default: OFF]"
 OPTION(ENABLE_HIREDIS      "Find and link with external redis library [default: OFF]"  OFF)
 OPTION(NO_SHARED           "Build internal libs static [default: OFF]"          OFF)
 OPTION(FORCE_GMIME24       "Link with gmime2.4 [default: OFF]"                  OFF)
+OPTION(INSTALL_EXAMPLES    "Install examples [default: OFF]"                    OFF)
 
 # Build optimized code for following CPU (default i386)
 #SET(CPU_TUNE               "i686")
@@ -1125,6 +1126,9 @@ FOREACH(CONF_IDX RANGE ${CONFLIST_MAX})
        ELSE(BUILD_PORT)
                INSTALL_IF_NOT_EXISTS(${CONF_FILE} ${CONFDIR} "")
        ENDIF(BUILD_PORT)
+       IF(INSTALL_EXAMPLES MATCHES "ON")
+               INSTALL(FILES ${CONF_FILE} DESTINATION ${EXAMPLESDIR})
+       ENDIF(INSTALL_EXAMPLES MATCHES "ON")
 ENDFOREACH(CONF_IDX RANGE ${CONFLIST_MAX})
 
 # Lua plugins

diff --git a/debian/changelog b/debian/changelog
index 60f8eddfc4dcc24bf508a853e3ab32e06cfe3a71..7a074b5bfcee902f593b840259c8d0f277160242 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rspamd (0.6.2-1) unstable; urgency=low
+
+  * Upgrade to 0.6.2
+
+ -- Vsevolod Stakhov <vsevolod@highsecure.ru>  Wed, 4 Dec 2013 16:43:00 +0000
+
 rspamd (0.6.1-1) unstable; urgency=low
 
   * Upgrade to 0.6.1

diff --git a/debian/rules b/debian/rules
index 2a50cc64b384e05c990a27f93ba862e908bc40ae..ae90afc21f6c57ba5de4c1fea750638db2c7a447 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,16 +6,20 @@ include /usr/share/dpkg/buildflags.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 
-DEB_CMAKE_NORMAL_ARGS+=                        -DCONFDIR=/etc/rspamd \
+DEB_CMAKE_NORMAL_ARGS+= \                      
+                                               -DCONFDIR=/etc/rspamd \
                                                -DMANDIR=/usr/share/man \
                                                -DRUNDIR=/var/lib/rspamd \
                                                -DDBDIR=/var/lib/rspamd \
                                                -DLOGDIR=/var/log/rspamd \
                                                -DPLUGINSDIR=/usr/share/rspamd \
+                                               -DEXAMPLESDIR=/usr/share/examples/rspamd \
                                                -DLIBDIR=/usr/lib \
                                                -DINCLUDEDIR=/usr/include \
                                                -DNO_SHARED=ON \
                                                -DDEBIAN_BUILD=1 \
+                                               -DINSTALL_EXAMPLES=ON \
+                                               -DFORCE_GMIME24=ON \
                                                -DRSPAMD_GROUP=rspamd \
                                                -DRSPAMD_USER=rspamd
 clean::