[Pkg-voip-commits] [sipsak] 09/19: Switch to use the dpkg makefile fragments in debian/rules

[Victor Seva]

This is an automated email from the git hooks/post-receive script.

vseva pushed a commit to branch master
in repository sipsak.

commit 8f26b9e4546c8d6e81aaa8f726709acb54036ee9
Author: Guillem Jover <gjover at sipwise.com>
Date:   Mon Jul 4 13:01:35 2016 +0200

    Switch to use the dpkg makefile fragments in debian/rules
---
 debian/changelog |  1 +
 debian/rules     | 13 ++-----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d75fc7..5f67b24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ sipsak (0.9.6-3) UNRELEASED; urgency=medium
   * Switch to source format 3.0 (quilt).
   * Add build-indep and build-arch targets to debian/rules, and stop using a
     stamp file.
+  * Switch to use the dpkg makefile fragments in debian/rules.
 
  -- Guillem Jover <gjover at sipwise.com>  Mon, 04 Jul 2016 12:19:42 +0200
 
diff --git a/debian/rules b/debian/rules
index 94d735e..6b10793 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,18 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_CFLAGS_MAINT_PREPEND = -Wall -std=gnu89
 
-CFLAGS = -Wall -g -std=gnu89
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+include /usr/share/dpkg/default.mk
 
 config.status: configure
 	dh_testdir

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/sipsak.git