r36261 - in /packages/atlas/trunk/debian: changelog control control.in rules

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Sat Mar 6 17:08:48 UTC 2010


Author: sylvestre
Date: Sat Mar  6 17:08:42 2010
New Revision: 36261

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36261
Log:
  * Explicit link against lgfortran & libgcc_s
  * Old useless / non sense conflicts removed

Modified:
    packages/atlas/trunk/debian/changelog
    packages/atlas/trunk/debian/control
    packages/atlas/trunk/debian/control.in
    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=36261&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Sat Mar  6 17:08:42 2010
@@ -1,3 +1,10 @@
+atlas (3.8.3-11) experimental; urgency=low
+
+  * Explicit link against lgfortran & libgcc_s
+  * Old useless / non sense conflicts removed
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sat, 06 Mar 2010 00:29:33 +0100
+
 atlas (3.8.3-10) experimental; urgency=low
 
   * postinst & prerm added for each packages to manage update-alternatives

Modified: packages/atlas/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/control?rev=36261&op=diff
==============================================================================
--- packages/atlas/trunk/debian/control (original)
+++ packages/atlas/trunk/debian/control Sat Mar  6 17:08:42 2010
@@ -37,14 +37,15 @@
  will obtain the best performance by installing the package with the
  most advanced instruction extension set your machine is capable of
  running.
+ . 
 
 Package: libatlas-base-dev
 Section: libdevel
 Architecture: any
 Depends: libatlas3gf-base (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-dev (<< 3.2.1-3), atlas2-base-dev, libatlas-3.so
-Replaces: atlas2-dev (<< 3.2.1-3), atlas2-base-dev, libatlas-3.so 
+Conflicts: atlas2-dev (<< 3.2.1-3), atlas2-base-dev
+Replaces: atlas2-dev (<< 3.2.1-3), atlas2-base-dev 
 Suggests: libblas-doc, liblapack-doc
 Description: Automatically Tuned Linear Algebra Software, generic static
  ATLAS is an approach for the automatic generation and optimization of
@@ -222,8 +223,8 @@
 Architecture: i386 kfreebsd-i386 hurd-i386
 Depends: libatlas3gf-sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
-Replaces: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
+Conflicts: atlas2-sse3-dev, atlas3-sse3-dev
+Replaces: atlas2-sse3-dev, atlas3-sse3-dev
 Suggests: libblas-doc, liblapack-doc
 Description: Automatically Tuned Linear Algebra Software, SSE3 static 
  ATLAS is an approach for the automatic generation and optimization of
@@ -267,8 +268,8 @@
 Architecture: i386 kfreebsd-i386 hurd-i386 amd64
 Depends: libatlas3gf-core2sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
-Replaces: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
+Conflicts: atlas2-sse2-dev, atlas3-sse2-dev
+Replaces: atlas2-sse2-dev, atlas3-sse2-dev
 Suggests: libblas-doc, liblapack-doc
 Description: Automatically Tuned Linear Algebra Software, CORE2SSE3 static 
  ATLAS is an approach for the automatic generation and optimization of
@@ -311,8 +312,8 @@
 Architecture: amd64
 Depends: libatlas3gf-amd64sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
-Replaces: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
+Conflicts: atlas2-sse2-dev, atlas3-sse2-dev
+Replaces: atlas2-sse2-dev, atlas3-sse2-dev
 Suggests: libblas-doc, liblapack-doc
 Description: Automatically Tuned Linear Algebra Software, AMD64SSE3 static 
  ATLAS is an approach for the automatic generation and optimization of
@@ -355,8 +356,8 @@
 Architecture: amd64
 Depends: libatlas3gf-corei7sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
-Replaces: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
+Conflicts: atlas2-sse2-dev, atlas3-sse2-dev
+Replaces: atlas2-sse2-dev, atlas3-sse2-dev
 Suggests: libblas-doc, liblapack-doc
 Description: Automatically Tuned Linear Algebra Software, COREI7SSE3 static 
  ATLAS is an approach for the automatic generation and optimization of
@@ -398,8 +399,8 @@
 Package: libatlas-altivec-dev
 Section: libdevel
 Architecture: powerpc
-Conflicts: atlas2-altivec-dev, atlas3-altivec-dev, libatlas-altivec-dev
-Replaces: atlas2-altivec-dev, atlas3-altivec-dev, libatlas-altivec-dev
+Conflicts: atlas2-altivec-dev, atlas3-altivec-dev
+Replaces: atlas2-altivec-dev, atlas3-altivec-dev
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
 Depends: libatlas3gf-altivec (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Suggests: libblas-doc, liblapack-doc
@@ -441,8 +442,8 @@
 Package: libatlas-v9-dev
 Section: libdevel
 Architecture: sparc
-Conflicts: atlas2-v9-dev, atlas3-v9-dev, libatlas-v9-dev
-Replaces: atlas2-v9-dev, atlas3-v9-dev, libatlas-v9-dev
+Conflicts: atlas2-v9-dev, atlas3-v9-dev
+Replaces: atlas2-v9-dev, atlas3-v9-dev
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
 Depends: libatlas3gf-v9 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Suggests: libblas-doc, liblapack-doc
@@ -486,8 +487,8 @@
 Package: libatlas-ev6-dev
 Section: libdevel
 Architecture: alpha
-Conflicts: atlas2-ev6-dev, atlas3-ev6-dev, libatlas-ev6-dev
-Replaces: atlas2-ev6-dev, atlas3-ev6-dev, libatlas-ev6-dev
+Conflicts: atlas2-ev6-dev, atlas3-ev6-dev
+Replaces: atlas2-ev6-dev, atlas3-ev6-dev
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
 Depends: libatlas3gf-ev6 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Suggests: libblas-doc, liblapack-doc
@@ -529,8 +530,8 @@
 Package: libatlas-2.0-dev
 Section: libdevel
 Architecture: hppa
-Conflicts: atlas2-2.0-dev, atlas3-2.0-dev, libatlas-2.0-dev
-Replaces: atlas2-2.0-dev, atlas3-2.0-dev, libatlas-2.0-dev
+Conflicts: atlas2-2.0-dev, atlas3-2.0-dev
+Replaces: atlas2-2.0-dev, atlas3-2.0-dev
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
 Depends: libatlas3gf-2.0 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Suggests: libblas-doc, liblapack-doc

Modified: packages/atlas/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/control.in?rev=36261&op=diff
==============================================================================
--- packages/atlas/trunk/debian/control.in (original)
+++ packages/atlas/trunk/debian/control.in Sat Mar  6 17:08:42 2010
@@ -43,8 +43,8 @@
 Architecture: any
 Depends: libatlas3gf-base (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-dev (<< 3.2.1-3), atlas2-base-dev, libatlas-3.so
-Replaces: atlas2-dev (<< 3.2.1-3), atlas2-base-dev, libatlas-3.so 
+Conflicts: atlas2-dev (<< 3.2.1-3), atlas2-base-dev
+Replaces: atlas2-dev (<< 3.2.1-3), atlas2-base-dev 
 Suggests: libblas-doc, liblapack-doc
 Description: Automatically Tuned Linear Algebra Software, generic static
  ATLAS is an approach for the automatic generation and optimization of
@@ -222,8 +222,8 @@
 Architecture: i386 kfreebsd-i386 hurd-i386
 Depends: libatlas3gf-sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
-Replaces: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
+Conflicts: atlas2-sse3-dev, atlas3-sse3-dev
+Replaces: atlas2-sse3-dev, atlas3-sse3-dev
 Suggests: libblas-doc, liblapack-doc
 Description: Automatically Tuned Linear Algebra Software, SSE3 static 
  ATLAS is an approach for the automatic generation and optimization of
@@ -267,8 +267,8 @@
 Architecture: i386 kfreebsd-i386 hurd-i386 amd64
 Depends: libatlas3gf-core2sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
-Replaces: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
+Conflicts: atlas2-sse2-dev, atlas3-sse2-dev
+Replaces: atlas2-sse2-dev, atlas3-sse2-dev
 Suggests: libblas-doc, liblapack-doc
 Description: Automatically Tuned Linear Algebra Software, CORE2SSE3 static 
  ATLAS is an approach for the automatic generation and optimization of
@@ -311,8 +311,8 @@
 Architecture: amd64
 Depends: libatlas3gf-amd64sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
-Replaces: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
+Conflicts: atlas2-sse2-dev, atlas3-sse2-dev
+Replaces: atlas2-sse2-dev, atlas3-sse2-dev
 Suggests: libblas-doc, liblapack-doc
 Description: Automatically Tuned Linear Algebra Software, AMD64SSE3 static 
  ATLAS is an approach for the automatic generation and optimization of
@@ -355,8 +355,8 @@
 Architecture: amd64
 Depends: libatlas3gf-corei7sse3 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
-Conflicts: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
-Replaces: atlas2-sse2-dev, atlas3-sse2-dev, libatlas-sse2-dev
+Conflicts: atlas2-sse2-dev, atlas3-sse2-dev
+Replaces: atlas2-sse2-dev, atlas3-sse2-dev
 Suggests: libblas-doc, liblapack-doc
 Description: Automatically Tuned Linear Algebra Software, COREI7SSE3 static 
  ATLAS is an approach for the automatic generation and optimization of
@@ -398,8 +398,8 @@
 Package: libatlas-altivec-dev
 Section: libdevel
 Architecture: powerpc
-Conflicts: atlas2-altivec-dev, atlas3-altivec-dev, libatlas-altivec-dev
-Replaces: atlas2-altivec-dev, atlas3-altivec-dev, libatlas-altivec-dev
+Conflicts: atlas2-altivec-dev, atlas3-altivec-dev
+Replaces: atlas2-altivec-dev, atlas3-altivec-dev
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
 Depends: libatlas3gf-altivec (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Suggests: libblas-doc, liblapack-doc
@@ -441,8 +441,8 @@
 Package: libatlas-v9-dev
 Section: libdevel
 Architecture: sparc
-Conflicts: atlas2-v9-dev, atlas3-v9-dev, libatlas-v9-dev
-Replaces: atlas2-v9-dev, atlas3-v9-dev, libatlas-v9-dev
+Conflicts: atlas2-v9-dev, atlas3-v9-dev
+Replaces: atlas2-v9-dev, atlas3-v9-dev
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
 Depends: libatlas3gf-v9 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Suggests: libblas-doc, liblapack-doc
@@ -486,8 +486,8 @@
 Package: libatlas-ev6-dev
 Section: libdevel
 Architecture: alpha
-Conflicts: atlas2-ev6-dev, atlas3-ev6-dev, libatlas-ev6-dev
-Replaces: atlas2-ev6-dev, atlas3-ev6-dev, libatlas-ev6-dev
+Conflicts: atlas2-ev6-dev, atlas3-ev6-dev
+Replaces: atlas2-ev6-dev, atlas3-ev6-dev
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
 Depends: libatlas3gf-ev6 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Suggests: libblas-doc, liblapack-doc
@@ -529,8 +529,8 @@
 Package: libatlas-2.0-dev
 Section: libdevel
 Architecture: hppa
-Conflicts: atlas2-2.0-dev, atlas3-2.0-dev, libatlas-2.0-dev
-Replaces: atlas2-2.0-dev, atlas3-2.0-dev, libatlas-2.0-dev
+Conflicts: atlas2-2.0-dev, atlas3-2.0-dev
+Replaces: atlas2-2.0-dev, atlas3-2.0-dev
 Provides: libatlas-3gf.so, libblas-3gf.so, liblapack-3gf.so
 Depends: libatlas3gf-2.0 (= ${binary:Version}), libatlas-dev, ${misc:Depends}, ${shlibs:Depends}
 Suggests: libblas-doc, liblapack-doc

Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=36261&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Sat Mar  6 17:08:42 2010
@@ -71,6 +71,8 @@
 
 # alpha ppc64
 
+GFORTRAN_LIB_PATH=`gcc -print-search-dirs|grep ^install:|awk '{print $$2}'`
+
 COMMON_CONFIG_PARAMS := --prefix="$(DEB_DESTDIR)" 	\
 	--incdir="$(DEB_DESTDIR)/usr/include/"			\
 	--libdir="$(DEB_DESTDIR)/usr/lib/$$targetName"		\
@@ -79,6 +81,7 @@
 	-D c -DWALL 									\
 	-b $(MODE_BITWIDTH) 							\
 	-Fa alg '-Wa,--noexecstack -fPIC' 				\
+	-Ss f77lib "-L$(GFORTRAN_LIB_PATH) -lgfortran -lgcc_s"  \
 	--with-netlib-lapack=/usr/lib/liblapack_pic.a 	\
 	-A $$atlasArch									\
 	-V $$atlasISA 									\




More information about the debian-science-commits mailing list