Use dh instead of CDBS

diff --git a/debian/control b/debian/control
index fa5c4e3a3124d4bb016057c35f0059b7f7890be4..80065f32b6bc96190d2ba6c4933317c53d975189 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: rspamd
 Section: mail
 Priority: optional
 Maintainer: Mikhail Gusarov <dottedmag@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), cmake, libevent-dev (>= 1.3), libglib2.0-dev (>= 2.16.0), libgmime-2.6-dev, liblua5.2-dev | liblua5.1-dev | liblua5.1-0-dev, libpcre3-dev, cdbs, libssl-dev (>= 1.0), libcurl4-openssl-dev, libhiredis-dev
+Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), cmake, libevent-dev (>= 1.3), libglib2.0-dev (>= 2.16.0), libgmime-2.6-dev, liblua5.2-dev | liblua5.1-dev | liblua5.1-0-dev, libpcre3-dev, libssl-dev (>= 1.0), libcurl4-openssl-dev, libhiredis-dev
 Standards-Version: 3.9.5
 Homepage: https://rspamd.com
 Vcs-Git: git://github.com/vstakhov/rspamd.git

diff --git a/debian/rules b/debian/rules
index 3608758eab42968b1632fb8a8d51bdf3e8df4a26..1128635c2080f5ceea64691d7f74b369cdec16f2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,11 @@
 #!/usr/bin/make -f
+%:
+       dh $@
 
-#export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
-
-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 \
+override_dh_auto_configure:
+       dh_auto_configure -- -DCONFDIR=/etc/rspamd \
                                                -DMANDIR=/usr/share/man \
                                                -DRUNDIR=/run/rspamd \
                                                -DDBDIR=/var/lib/rspamd \
@@ -22,7 +19,10 @@ DEB_CMAKE_NORMAL_ARGS+= -DCONFDIR=/etc/rspamd \
                                                -DINSTALL_EXAMPLES=ON \
                                                -DFORCE_GMIME24=ON \
                                                -DRSPAMD_GROUP=rspamd \
-                                               -DRSPAMD_USER=rspamd \
-                                               -DENABLE_HIREDIS=ON
-clean::
+                                               -DRSPAMD_USER=_rspamd
+# \
+#                                              -DENABLE_HIREDIS=ON
+
+override_dh_auto_clean:
+       dh_auto_clean
        rm -f src/modules.c