[SCM] ATLAS packaging for Debian branch, master, updated. upstream/3.8.4-26-gc81c720

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 8f317ab2f89e23ab15013f95c1fc4ebba0202c92
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Jun 6 18:05:55 2013 +0200

    Simplify d/rules logic by making it more CDBS-minded

diff --git a/.gitignore b/.gitignore
index 9ac1ca6..b141f0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,7 @@
 .pc
 TexDoc/*.pdf
 build
-build-arch-stamp
-build-indep-stamp
+build-stamp
 configure-stamp
 debian/files
 debian/libatlas-base-dev/
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index f540d1d..0000000
--- a/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-TexDoc/*.pdf
diff --git a/debian/rules b/debian/rules
index 89b1cde..32ee7bb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ COMMON_CONFIG_PARAMS := --prefix="$(DEB_DESTDIR)" 	\
 
 # Build a custom package optimized for the current arch
 custom: custom-stamp
+.PHONY: custom
 custom-stamp:
 		rm -f configure-stamp
 
@@ -80,6 +81,7 @@ custom-stamp:
 		LANG=C debian/rules ARCHS=base__ binary
 		touch $@
 
+common-configure-arch common-configure-indep:: configure-stamp
 configure-stamp:
 		dh_testdir
 
@@ -101,15 +103,8 @@ configure-stamp:
 		cd -
 		touch $@
 
-
-build: build-arch build-indep
-
-build-indep: build-indep-stamp
-build-indep-stamp: configure-stamp
-		touch $@
-
-build-arch: build-arch-stamp
-build-arch-stamp: configure-stamp
+common-build-arch common-build-indep:: build-stamp
+build-stamp:
 		dh_testdir
 		set -e; 												\
 		targetName=`echo $(ARCHS)|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`; \
@@ -125,29 +120,17 @@ build-arch-stamp: configure-stamp
 		fi
 		touch $@
 
-clean:: clean-work #unpatch
+clean:: clean-work
 clean-work:
 		dh_testdir
 		dh_testroot
 		rm -rf build check 
-		rm -f build-arch-stamp build-indep-stamp
-		rm -f install-arch-stamp install-indep-stamp configure-stamp
-
+		rm -f configure-stamp build-stamp
+		rm -f TexDoc/*.pdf
 		[ ! -f Makefile ] || $(MAKE) distclean
-		# some additional cleanups
-		dh_clean 
-
+.PHONY: clean-work
 
-install: install-arch install-indep
-
-install-indep: configure build install-indep-stamp
-install-indep-stamp:
-		dh_testdir
-		dh_testroot
-		dh_installdirs -i
-
-install-arch: configure build  install-arch-stamp
-install-arch-stamp:
+common-install-arch common-install-indep::
 		dh_testdir
 		dh_testroot
 
@@ -173,38 +156,5 @@ install/libatlas-doc::
 		cp -R $(CURDIR)/doc/* $(CURDIR)/TexDoc/*.pdf $(CURDIR)/debian/libatlas-doc/usr/share/doc/libatlas-doc/; \
 	fi
 
-binary: binary-indep binary-arch
-
-binary-indep: build install
-		dh_testdir -i
-		dh_testroot -i
-		dh_installchangelogs  -i
-#		dh_installexamples -patlas-doc examples/*
-		dh_installman -i
-		dh_link -i
-		dh_strip -i
-		dh_compress  -i -X.pdf
-		dh_fixperms -i
-		dh_makeshlibs -i -n
-		dh_installdeb -i
-		dh_shlibdeps -i -l $$(pwd)
-#		dh_shlibdeps -i
-		dh_gencontrol -i
-		dh_md5sums -i
-		dh_builddeb -i
-
-binary-arch: build install
-		dh_testdir -a
-		dh_testroot -a
-		dh_installchangelogs  -a
-		dh_installexamples -a
-		dh_installman -a
-		dh_link -a
-		dh_compress  -a
-		dh_fixperms -a
-		dh_installdeb -a
-
-.PHONY: build build-indep build-arch clean binary binary-indep binary-arch configure custom
-
 get-orig-source:
 	-uscan --upstream-version 0

-- 
ATLAS packaging for Debian