[vim] 04/20: rules: Always include /usr/share/dpkg/default.mk

[James McCoy]

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

jamessan pushed a commit to branch debian/sid
in repository vim.

commit af7ddc457f125b1f1681e736e8f70d0c87a98d03
Author: James McCoy <jamessan at debian.org>
Date:   Sun Aug 13 09:00:00 2017 -0400

    rules: Always include /usr/share/dpkg/default.mk
    
    This support code has been around long enough that the fallback code
    isn't required anymore.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/rules | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/debian/rules b/debian/rules
index c3cca80..42d3eb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,24 +5,7 @@ export DH_OPTIONS
 # Upstream handles the _FORTIFY_SOURCE flag on their own
 DEB_BUILD_MAINT_OPTIONS=hardening=+all,-fortify
 
-ifneq (,$(wildcard /usr/share/dpkg/default.mk))
-  include /usr/share/dpkg/default.mk
-else
-  DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-  DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-  DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-  DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-  DEB_VENDOR := $(shell dpkg-vendor --query vendor)
-
-  CFLAGS := -Wall -g
-  ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-  else
-    CFLAGS += -O2
-  endif
-
-  DEB_VERSION_UPSTREAM := $(shell dpkg-parsechangelog -SVersion)
-endif
+include /usr/share/dpkg/default.mk
 
 BUILDER := pkg-vim-maintainers at lists.alioth.debian.org
 

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