r38224 - in /packages/atlas/trunk/debian: changelog rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sun Mar 20 10:38:37 2011
New Revision: 38224

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38224
Log:
fix some issues

Modified:
    packages/atlas/trunk/debian/changelog
    packages/atlas/trunk/debian/rules

Modified: packages/atlas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/changelog?rev=38224&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Sun Mar 20 10:38:37 2011
@@ -1,6 +1,5 @@
-atlas (3.8.4.0-1) unstable; urgency=low
-
-  * New upstream release (only bug fixes)
+atlas (3.8.3-30) unstable; urgency=low
+
   * Update of the README.Debian (typos, old stuff, etc)
   * Some clean up and simplification of debian/rules
     (removed rules to build preoptimized packages)

Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=38224&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Sun Mar 20 10:38:37 2011
@@ -86,22 +86,22 @@
 configure-stamp:
 		dh_testdir
 
-		set -e
-		targetName=`echo $(ARCHS)|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`
-		atlasArch=`echo $(ARCHS)|sed -e "s|.*_\(.*\)_.*|\1|g"`
-		atlasISA=`echo $(ARCHS)|sed -e "s|.*_.*_\(.*\)|\1|g"`
-		mkdir -p build/$$targetName
-		cd build/$$targetName
-		if test "$(ARCHS)" != "base__"; then
-		../../configure $(COMMON_CONFIG_PARAMS) -t 2
-		else
-		../../configure $(COMMON_CONFIG_PARAMS);
-		fi;
-		echo "Configure done. targetName = $$targetName / atlasArch = $$atlasArch / atlasISA = $$atlasISA";
-		if test ! -s Make.inc; then echo "Configure failed: Make.inc not found"; exit 1; fi;
-		cat Make.inc |grep ARCH|head -1|awk '{print $$3}';
-		echo "==============================================";
-		cd -;
+		set -e;											\
+		targetName=`echo $(ARCHS)|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`; \
+		atlasArch=`echo $(ARCHS)|sed -e "s|.*_\(.*\)_.*|\1|g"`; \
+		atlasISA=`echo $(ARCHS)|sed -e "s|.*_.*_\(.*\)|\1|g"`; \
+		mkdir -p build/$$targetName;					\
+		cd build/$$targetName; 							\
+		if test "$(ARCHS)" != "base__"; then 			\
+		../../configure $(COMMON_CONFIG_PARAMS) -t 2; 	\
+		else 											\
+		../../configure $(COMMON_CONFIG_PARAMS); 		\
+		fi;												\
+		echo "Configure done. targetName = $$targetName / atlasArch = $$atlasArch / atlasISA = $$atlasISA";								\
+		if test ! -s Make.inc; then echo "Configure failed: Make.inc not found"; exit 1; fi;											\
+		cat Make.inc |grep ARCH|head -1|awk '{print $$3}'; \
+		echo "=============================================="; \
+		cd -
 		touch $@
 
 
@@ -114,17 +114,17 @@
 build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp
 		dh_testdir
-		set -e
-		targetName=`echo $(ARCHS)|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`
-		cd build/$$targetName
-		$(MAKE) build
-		cd lib
-		$(MAKE) shared
-		$(MAKE) ptshared
-		cd ..
-		$(MAKE) check
-		$(MAKE) ptcheck
-		echo "=============================================="
+		set -e; 												\
+		targetName=`echo $(ARCHS)|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`; \
+		cd build/$$targetName;									\
+		$(MAKE) build;											\
+		cd lib;													\
+		$(MAKE) shared;											\
+		$(MAKE) ptshared;										\
+		cd ..;													\
+		$(MAKE) check;											\
+		$(MAKE) ptcheck;										\
+		echo "==============================================";	\
 		cd ../../../
 		# Do not build the help when building the custom package
 		if test "$(ARCHS)" != "base__"; then \
@@ -158,12 +158,12 @@
 		dh_testdir
 		dh_testroot
 
-		set -e
-		targetName=`echo $(ARCHS)|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`
-		cd build/$$targetName
-		echo "make install of $$targetName to $(DEB_DESTDIR)"
-		$(MAKE) DESTDIR=$(DEB_DESTDIR) install
-		echo "============================================="
+		set -e;													\
+		targetName=`echo $(ARCHS)|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`; \
+		cd build/$$targetName;									\
+		echo "make install of $$targetName to $(DEB_DESTDIR)";	\
+		$(MAKE) DESTDIR=$(DEB_DESTDIR) install;					\
+		echo "=============================================";	\
 		cd -
 
 install/libatlas-dev::