r36439 - in /packages/atlas/trunk/debian: ./ changelog control patches/20_armel.diff rules

Thu Apr 29 14:41:26 UTC 2010

Author: sylvestre
Date: Thu Apr 29 14:41:22 2010
New Revision: 36439

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36439
Log:
+  * Maintainer changed to the Debian Science Team
+  * Simplification of the s390 detection
+  * armel detection added (Closes: #243447, #355355)

Added:
    packages/atlas/trunk/debian/patches/20_armel.diff
Modified:
    packages/atlas/trunk/debian/   (props changed)
    packages/atlas/trunk/debian/changelog
    packages/atlas/trunk/debian/control
    packages/atlas/trunk/debian/rules

Propchange: packages/atlas/trunk/debian/
------------------------------------------------------------------------------
    MergeWithUpstream = 1

Modified: packages/atlas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/changelog?rev=36439&op=diff
==============================================================================

--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Thu Apr 29 14:41:22 2010
@@ -1,3 +1,11 @@
+atlas (3.8.3-21) unstable; urgency=low
+
+  * Maintainer changed to the Debian Science Team
+  * Simplification of the s390 detection
+  * armel detection added (Closes: #243447, #355355)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 29 Apr 2010 16:36:21 +0200
+
 atlas (3.8.3-20) unstable; urgency=low
 
   * Fix a problem on the custom build (Closes: #576755)

Modified: packages/atlas/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/control?rev=36439&op=diff
==============================================================================
--- packages/atlas/trunk/debian/control (original)
+++ packages/atlas/trunk/debian/control Thu Apr 29 14:41:22 2010
@@ -1,7 +1,7 @@
 Source: atlas
 Section: devel
 Priority: optional
-Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
+Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Sylvestre Ledru <sylvestre at debian.org>
 Standards-Version: 3.8.4
 Build-Depends: debhelper (>= 7), patch, gfortran, libblas-dev, 

Added: packages/atlas/trunk/debian/patches/20_armel.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/patches/20_armel.diff?rev=36439&op=file
==============================================================================
--- packages/atlas/trunk/debian/patches/20_armel.diff (added)
+++ packages/atlas/trunk/debian/patches/20_armel.diff Thu Apr 29 14:41:22 2010
@@ -1,0 +1,45 @@
+Index: atlas-3.8.3/CONFIG/include/atlconf.h
+===================================================================
+--- atlas-3.8.3.orig/CONFIG/include/atlconf.h	2010-04-29 14:09:06.000000000 +0000
++++ atlas-3.8.3/CONFIG/include/atlconf.h	2010-04-29 14:09:39.000000000 +0000
+@@ -68,6 +68,14 @@
+ #define MachIsALPHA(mach_) \
+   ( 0 )
+ #endif
++#ifdef __ARMEL__
++#define MachIsARMEL(mach_) \
++  ( __ARMEL__ )
++#else
++#define MachIsARMEL(mach_) \
++  ( 0 )
++#endif
++
+ 
+ static char *f2c_namestr[5] = {"UNKNOWN","Add_", "Add__", "NoChange", "UpCase"};
+ static char *f2c_intstr[5] =
+Index: atlas-3.8.3/CONFIG/src/SpewMakeInc.c
+===================================================================
+--- atlas-3.8.3.orig/CONFIG/src/SpewMakeInc.c	2010-04-29 14:10:54.000000000 +0000
++++ atlas-3.8.3/CONFIG/src/SpewMakeInc.c	2010-04-29 14:11:20.000000000 +0000
+@@ -346,6 +346,8 @@
+      return(sp);
+    if (MachIsALPHA(arch))
+      return(sp);
++   if (MachIsARMEL(arch))
++     return(sp);
+    if (MachIsMIPS(arch))
+       return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+    if (!CompIsGcc(comp))
+Index: atlas-3.8.3/CONFIG/src/probe_comp.c
+===================================================================
+--- atlas-3.8.3.orig/CONFIG/src/probe_comp.c	2010-04-29 14:09:48.000000000 +0000
++++ atlas-3.8.3/CONFIG/src/probe_comp.c	2010-04-29 14:10:46.000000000 +0000
+@@ -516,6 +516,8 @@
+      return(sp);
+    if (MachIsALPHA(arch))
+      return(sp);
++   if (MachIsARMEL(arch))
++     return(sp);
+    if (MachIsMIPS(arch))
+       return((ptrbits == 64) ? "-mabi=64" : "-mabi=n32");
+    if (!CompIsGcc(comp))

Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=36439&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Thu Apr 29 14:41:22 2010
@@ -182,11 +182,14 @@
 			echo "==============================================";	\
 			cd ../../../;										\
 		done
+		-for ext in $(ARCHS); do	\
+			targetName=`echo $$ext|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`;	\
+			cd build/$$targetName;	\
+			$(MAKE) check ptcheck;		\
+			echo "=============================================="; \
+			cd ../../../; \
+		done
 		(cd TexDoc; make atlas_contrib.pdf atlas_devel.pdf atlas_install.pdf cblasqref.pdf  f77blasqref.pdf lapackqref.pdf)
-		touch $@
-
-check: build
-		-$(MAKE) check 
 		touch $@
 
 clean:: clean-work #unpatch


