[libvigraimpex] 04/30: deb/rules: removed some old obsolete stuff

[Daniel Stender]

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

danstender-guest pushed a commit to branch master
in repository libvigraimpex.

commit 1fb104a639b073086b4bba282bd71da546ef0d1f
Author: Daniel Stender <debian at danielstender.com>
Date:   Sat Feb 13 18:36:48 2016 +0100

    deb/rules: removed some old obsolete stuff
---
 debian/changelog |  4 ++--
 debian/rules     | 11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d0a210e..7b92869 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,11 @@ libvigraimpex (1.10.0+git20160120.803d5d4-2) UNRELEASED; urgency=medium
     + added Breaks to libvigraimpex6 [thanks to Andreas Metzler].
   * deb/rules:
     + added DH_VERBOSE export line.
-    + cleaned up.
+    + removed old and obsolete stuff.
   * deb/README.Debian: corrected typo.
   * Dropped deb/libvigraimpex5v5.lintian-overrides.
 
- -- Daniel Stender <debian at danielstender.com>  Sat, 13 Feb 2016 18:34:34 +0100
+ -- Daniel Stender <debian at danielstender.com>  Sat, 13 Feb 2016 18:36:06 +0100
 
 libvigraimpex (1.10.0+git20160120.803d5d4-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 30d2b06..c9398b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,6 @@ CFLAGS := $(shell env DEB_CFLAGS_MAINT_APPEND=-pipe dpkg-buildflags --get CFLAGS
 CXXFLAGS := $(shell env DEB_CXXFLAGS_MAINT_APPEND=-pipe dpkg-buildflags --get CXXFLAGS; dpkg-buildflags --get CPPFLAGS)
 LDFLAGS := $(shell env DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed dpkg-buildflags --get LDFLAGS)
 
-# These don't need to be exported and if they are we'll get the flags
-# duplicated in the command line.
-unexport CFLAGS
-unexport CXXFLAGS
-unexport LDFLAGS
-
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 ifeq ($(DEB_HOST_ARCH),i386)
@@ -22,11 +16,6 @@ ifneq (,$(filter $(DEB_BUILD_ARCH),mips mipsel))
   CXXFLAGS += --param ggc-min-expand=20
 endif
 
-space = $() $()
-here = $(dir $(firstword $(MAKEFILE_LIST)))/..
-current_version = $(shell cd $(here) && dpkg-parsechangelog | sed -n -r -e "/Version: (.*)/ { s//\1/p; q; }")
-upstream_version = $(firstword $(subst -,$(space),$(current_version)))
-
 ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
   export CMAKE_INCLUDE_PATH=/usr/include/hdf5/serial
   export CMAKE_LIBRARY_PATH=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libvigraimpex.git