[med-svn] [freecontact] 02/04: simplify d/rules

[Andreas Tille]

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

tille pushed a commit to branch master
in repository freecontact.

commit 6ec33cfb7cbd69f425f2bfc487979a5a2165424c
Author: Andreas Tille <tille at debian.org>
Date:   Sun Aug 16 18:12:45 2015 +0200

    simplify d/rules
---
 debian/changelog |  3 ++-
 debian/rules     | 26 +++++---------------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ebc145..3d467ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-freecontact (1.0.21-5) UNRELEASED; urgency=medium
+freecontact (1.0.21-4) UNRELEASED; urgency=medium
 
   * cme fix dpkg-control
+  * simplify debian/rules
 
  -- Andreas Tille <tille at debian.org>  Sun, 16 Aug 2015 13:22:32 +0200
 
diff --git a/debian/rules b/debian/rules
index 8412254..54e38a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,50 +2,34 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-export CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-export CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-export FCLAGS:=$(shell dpkg-buildflags --get FCLAGS)
-export FFLAGS:=$(shell dpkg-buildflags --get FFLAGS)
-export LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
 Description := $(shell sed -e ':a; N; s/\n/$${Newline}/; ta' < debian/Description)
 
-build-indep-stamp:
+%:
+	dh $@ --parallel --with bash-completion --with autoreconf
+
+override_dh_auto_configure-indep:
 	dh_auto_configure -- --with-blas=blas --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH) && $(MAKE) -C lib doxygen-doc && touch $@
 
-.PHONY: override_dh_auto_configure
-override_dh_auto_configure:
+override_dh_auto_configure-arch:
 	dh_auto_configure -- --with-boost-libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
-.PHONY: build-indep
-build-indep: build-indep-stamp
-
-.PHONY: override_dh_strip
 override_dh_strip:
 	dh_strip --dbg-package=libfreecontact0-dbg
 
-.PHONY: override_dh_compress
 override_dh_compress:
 	dh_compress -Xlibfreecontact.tag -Xdemo_1000.aln -XPF00071_v25_999.fa -XPF00071_v25_999.xml
 
-.PHONY: override_dh_gencontrol
 override_dh_gencontrol:
 	dh_gencontrol -- '-VDescription=$(Description)'
 
-.PHONY:
 get-orig-source:
 	mkdir -p ../tarballs
 	uscan --verbose --force-download
 
-.PHONY: override_dh_auto_clean
 override_dh_auto_clean:
 	rm -f build-indep-stamp
 	dh_auto_clean
 
-%:
-	dh $@ --parallel --with bash-completion --with autoreconf
-

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