r36248 - /packages/atlas/trunk/debian/
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Tue Mar 2 17:23:46 UTC 2010
Author: sylvestre
Date: Tue Mar 2 17:23:43 2010
New Revision: 36248
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36248
Log:
* change the priority of the package in update-alternatives
* update generate.sh to handle the priority
* handle other archs
Modified:
packages/atlas/trunk/debian/TODO
packages/atlas/trunk/debian/generate.sh
packages/atlas/trunk/debian/libatlas-amd64sse3-dev.postinst
packages/atlas/trunk/debian/libatlas-base-dev.postinst
packages/atlas/trunk/debian/libatlas-core2sse3-dev.postinst
packages/atlas/trunk/debian/libatlas-corei7sse3-dev.postinst
packages/atlas/trunk/debian/libatlas-sse-dev.postinst
packages/atlas/trunk/debian/libatlas-sse2-dev.postinst
packages/atlas/trunk/debian/libatlas-template-dev.postinst
packages/atlas/trunk/debian/libatlas3gf-amd64sse3.postinst
packages/atlas/trunk/debian/libatlas3gf-base.postinst
packages/atlas/trunk/debian/libatlas3gf-core2sse3.postinst
packages/atlas/trunk/debian/libatlas3gf-corei7sse3.postinst
packages/atlas/trunk/debian/libatlas3gf-sse.postinst
packages/atlas/trunk/debian/libatlas3gf-sse2.postinst
packages/atlas/trunk/debian/libatlas3gf-template.postinst
Modified: packages/atlas/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/TODO?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/TODO (original)
+++ packages/atlas/trunk/debian/TODO Tue Mar 2 17:23:43 2010
@@ -1,7 +1,3 @@
-Before upload 3.8.3-10:
-* change the priority of the package in update-alternatives
-* update generate.sh to handle the priority
-* handle other archs
* Check options on the different other archs
* See what will happen with AMD-optimized packages built under Intel CPU
Modified: packages/atlas/trunk/debian/generate.sh
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/generate.sh?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/generate.sh (original)
+++ packages/atlas/trunk/debian/generate.sh Tue Mar 2 17:23:43 2010
@@ -2,23 +2,32 @@
# This crappy script regenerates *.postinst & *.prerm from
# some templates
-LIST="amd64sse3 base core2sse3 corei7sse3 sse sse2 sse3 "
+
+# Generated by:
+# $(grep Package: control|grep -v -E "(dev|-test|-doc)"|cut -d- -f2)
+LIST="base sse sse2 sse3 core2sse3 amd64sse3 corei7sse3 altivec v9 ev6 2.0"
+
+# The list of priority:
+# http://wiki.debian.org/DebianScience/LinearAlgebraLibraries
+LIST_PRIORITY=(30 35 40 45 50 55 60 60 60 60 60)
+
+# Templates
POSTINST="libatlas3gf-template.postinst"
PRERM="libatlas3gf-template.prerm"
POSTINSTDEV="libatlas-template-dev.postinst"
PRERMDEV="libatlas-template-dev.prerm"
+i=1
+for pkg in $LIST; do
-for pkg in $LIST; do
target=$(echo $POSTINST|sed -e "s|template|$pkg|")
targetprerm=$(echo $PRERM|sed -e "s|template|$pkg|")
-
- sed -e "s|PACKAGE|$pkg|g" $POSTINST > $target
+ sed -e "s|PACKAGE|$pkg|g" -e "s|PRIORITY|${LIST_PRIORITY[${i}]}|g" $POSTINST > $target
sed -e "s|PACKAGE|$pkg|g" $PRERM > $targetprerm
- targetdev=$(echo $POSTINSTDEV|sed -e "s|template|$pkg|")
- targetprermdev=$(echo $PRERMDEV|sed -e "s|template|$pkg|")
-
- sed -e "s|PACKAGE|$pkg|g" $POSTINSTDEV > $targetdev
- sed -e "s|PACKAGE|$pkg|g" $PRERMDEV > $targetprermdev
-
+ targetdev=$(echo $POSTINSTDEV|sed -e "s|template|$pkg|")
+ targetprermdev=$(echo $PRERMDEV|sed -e "s|template|$pkg|")
+
+ sed -e "s|PACKAGE|$pkg|g" -e "s|PRIORITY|${LIST_PRIORITY[${i}]}|g" $POSTINSTDEV > $targetdev
+ sed -e "s|PACKAGE|$pkg|g" $PRERMDEV > $targetprermdev
+ i=$(($i + 1))
done
Modified: packages/atlas/trunk/debian/libatlas-amd64sse3-dev.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas-amd64sse3-dev.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas-amd64sse3-dev.postinst (original)
+++ packages/atlas/trunk/debian/libatlas-amd64sse3-dev.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so libblas.so \
- /usr/lib/atlas-amd64sse3/atlas/libblas.so 50 \
+ /usr/lib/atlas-amd64sse3/atlas/libblas.so 60 \
--slave /usr/lib/libcblas.so libcblas.so \
/usr/lib/atlas-amd64sse3/libcblas.so \
--slave /usr/lib/liblapack_atlas.so liblapack_atlas.so \
@@ -18,7 +18,7 @@
/usr/lib/atlas-amd64sse3/liblapack_atlas.a
update-alternatives --install /usr/lib/liblapack.so liblapack.so \
- /usr/lib/atlas-amd64sse3/atlas/liblapack.so 50 \
+ /usr/lib/atlas-amd64sse3/atlas/liblapack.so 60 \
--slave /usr/lib/liblapack.a liblapack.a \
/usr/lib/atlas-amd64sse3/atlas/liblapack.a
Modified: packages/atlas/trunk/debian/libatlas-base-dev.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas-base-dev.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas-base-dev.postinst (original)
+++ packages/atlas/trunk/debian/libatlas-base-dev.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so libblas.so \
- /usr/lib/atlas-base/atlas/libblas.so 50 \
+ /usr/lib/atlas-base/atlas/libblas.so 35 \
--slave /usr/lib/libcblas.so libcblas.so \
/usr/lib/atlas-base/libcblas.so \
--slave /usr/lib/liblapack_atlas.so liblapack_atlas.so \
@@ -18,7 +18,7 @@
/usr/lib/atlas-base/liblapack_atlas.a
update-alternatives --install /usr/lib/liblapack.so liblapack.so \
- /usr/lib/atlas-base/atlas/liblapack.so 50 \
+ /usr/lib/atlas-base/atlas/liblapack.so 35 \
--slave /usr/lib/liblapack.a liblapack.a \
/usr/lib/atlas-base/atlas/liblapack.a
Modified: packages/atlas/trunk/debian/libatlas-core2sse3-dev.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas-core2sse3-dev.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas-core2sse3-dev.postinst (original)
+++ packages/atlas/trunk/debian/libatlas-core2sse3-dev.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so libblas.so \
- /usr/lib/atlas-core2sse3/atlas/libblas.so 50 \
+ /usr/lib/atlas-core2sse3/atlas/libblas.so 55 \
--slave /usr/lib/libcblas.so libcblas.so \
/usr/lib/atlas-core2sse3/libcblas.so \
--slave /usr/lib/liblapack_atlas.so liblapack_atlas.so \
@@ -18,7 +18,7 @@
/usr/lib/atlas-core2sse3/liblapack_atlas.a
update-alternatives --install /usr/lib/liblapack.so liblapack.so \
- /usr/lib/atlas-core2sse3/atlas/liblapack.so 50 \
+ /usr/lib/atlas-core2sse3/atlas/liblapack.so 55 \
--slave /usr/lib/liblapack.a liblapack.a \
/usr/lib/atlas-core2sse3/atlas/liblapack.a
Modified: packages/atlas/trunk/debian/libatlas-corei7sse3-dev.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas-corei7sse3-dev.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas-corei7sse3-dev.postinst (original)
+++ packages/atlas/trunk/debian/libatlas-corei7sse3-dev.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so libblas.so \
- /usr/lib/atlas-corei7sse3/atlas/libblas.so 50 \
+ /usr/lib/atlas-corei7sse3/atlas/libblas.so 60 \
--slave /usr/lib/libcblas.so libcblas.so \
/usr/lib/atlas-corei7sse3/libcblas.so \
--slave /usr/lib/liblapack_atlas.so liblapack_atlas.so \
@@ -18,7 +18,7 @@
/usr/lib/atlas-corei7sse3/liblapack_atlas.a
update-alternatives --install /usr/lib/liblapack.so liblapack.so \
- /usr/lib/atlas-corei7sse3/atlas/liblapack.so 50 \
+ /usr/lib/atlas-corei7sse3/atlas/liblapack.so 60 \
--slave /usr/lib/liblapack.a liblapack.a \
/usr/lib/atlas-corei7sse3/atlas/liblapack.a
Modified: packages/atlas/trunk/debian/libatlas-sse-dev.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas-sse-dev.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas-sse-dev.postinst (original)
+++ packages/atlas/trunk/debian/libatlas-sse-dev.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so libblas.so \
- /usr/lib/atlas-sse/atlas/libblas.so 50 \
+ /usr/lib/atlas-sse/atlas/libblas.so 40 \
--slave /usr/lib/libcblas.so libcblas.so \
/usr/lib/atlas-sse/libcblas.so \
--slave /usr/lib/liblapack_atlas.so liblapack_atlas.so \
@@ -18,7 +18,7 @@
/usr/lib/atlas-sse/liblapack_atlas.a
update-alternatives --install /usr/lib/liblapack.so liblapack.so \
- /usr/lib/atlas-sse/atlas/liblapack.so 50 \
+ /usr/lib/atlas-sse/atlas/liblapack.so 40 \
--slave /usr/lib/liblapack.a liblapack.a \
/usr/lib/atlas-sse/atlas/liblapack.a
Modified: packages/atlas/trunk/debian/libatlas-sse2-dev.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas-sse2-dev.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas-sse2-dev.postinst (original)
+++ packages/atlas/trunk/debian/libatlas-sse2-dev.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so libblas.so \
- /usr/lib/atlas-sse2/atlas/libblas.so 50 \
+ /usr/lib/atlas-sse2/atlas/libblas.so 45 \
--slave /usr/lib/libcblas.so libcblas.so \
/usr/lib/atlas-sse2/libcblas.so \
--slave /usr/lib/liblapack_atlas.so liblapack_atlas.so \
@@ -18,7 +18,7 @@
/usr/lib/atlas-sse2/liblapack_atlas.a
update-alternatives --install /usr/lib/liblapack.so liblapack.so \
- /usr/lib/atlas-sse2/atlas/liblapack.so 50 \
+ /usr/lib/atlas-sse2/atlas/liblapack.so 45 \
--slave /usr/lib/liblapack.a liblapack.a \
/usr/lib/atlas-sse2/atlas/liblapack.a
Modified: packages/atlas/trunk/debian/libatlas-template-dev.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas-template-dev.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas-template-dev.postinst (original)
+++ packages/atlas/trunk/debian/libatlas-template-dev.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so libblas.so \
- /usr/lib/atlas-PACKAGE/atlas/libblas.so 50 \
+ /usr/lib/atlas-PACKAGE/atlas/libblas.so PRIORITY \
--slave /usr/lib/libcblas.so libcblas.so \
/usr/lib/atlas-PACKAGE/libcblas.so \
--slave /usr/lib/liblapack_atlas.so liblapack_atlas.so \
@@ -18,7 +18,7 @@
/usr/lib/atlas-PACKAGE/liblapack_atlas.a
update-alternatives --install /usr/lib/liblapack.so liblapack.so \
- /usr/lib/atlas-PACKAGE/atlas/liblapack.so 50 \
+ /usr/lib/atlas-PACKAGE/atlas/liblapack.so PRIORITY \
--slave /usr/lib/liblapack.a liblapack.a \
/usr/lib/atlas-PACKAGE/atlas/liblapack.a
Modified: packages/atlas/trunk/debian/libatlas3gf-amd64sse3.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas3gf-amd64sse3.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas3gf-amd64sse3.postinst (original)
+++ packages/atlas/trunk/debian/libatlas3gf-amd64sse3.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so.3gf libblas.so.3gf \
- /usr/lib/atlas-amd64sse3/atlas/libblas.so.3gf 50 \
+ /usr/lib/atlas-amd64sse3/atlas/libblas.so.3gf 60 \
--slave /usr/lib/libcblas.so.3gf libcblas.so.3gf \
/usr/lib/atlas-amd64sse3/libcblas.so.3gf \
--slave /usr/lib/libf77blas.so.3gf libf77blas.so.3gf \
@@ -14,7 +14,7 @@
/usr/lib/atlas-amd64sse3/liblapack_atlas.so.3gf
update-alternatives --install /usr/lib/liblapack.so.3gf liblapack.so.3gf \
- /usr/lib/atlas-amd64sse3/atlas/liblapack.so.3gf 50
+ /usr/lib/atlas-amd64sse3/atlas/liblapack.so.3gf 60
# dh_installdeb will replace this with shell code automatically
Modified: packages/atlas/trunk/debian/libatlas3gf-base.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas3gf-base.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas3gf-base.postinst (original)
+++ packages/atlas/trunk/debian/libatlas3gf-base.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so.3gf libblas.so.3gf \
- /usr/lib/atlas-base/atlas/libblas.so.3gf 50 \
+ /usr/lib/atlas-base/atlas/libblas.so.3gf 35 \
--slave /usr/lib/libcblas.so.3gf libcblas.so.3gf \
/usr/lib/atlas-base/libcblas.so.3gf \
--slave /usr/lib/libf77blas.so.3gf libf77blas.so.3gf \
@@ -14,7 +14,7 @@
/usr/lib/atlas-base/liblapack_atlas.so.3gf
update-alternatives --install /usr/lib/liblapack.so.3gf liblapack.so.3gf \
- /usr/lib/atlas-base/atlas/liblapack.so.3gf 50
+ /usr/lib/atlas-base/atlas/liblapack.so.3gf 35
# dh_installdeb will replace this with shell code automatically
Modified: packages/atlas/trunk/debian/libatlas3gf-core2sse3.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas3gf-core2sse3.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas3gf-core2sse3.postinst (original)
+++ packages/atlas/trunk/debian/libatlas3gf-core2sse3.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so.3gf libblas.so.3gf \
- /usr/lib/atlas-core2sse3/atlas/libblas.so.3gf 50 \
+ /usr/lib/atlas-core2sse3/atlas/libblas.so.3gf 55 \
--slave /usr/lib/libcblas.so.3gf libcblas.so.3gf \
/usr/lib/atlas-core2sse3/libcblas.so.3gf \
--slave /usr/lib/libf77blas.so.3gf libf77blas.so.3gf \
@@ -14,7 +14,7 @@
/usr/lib/atlas-core2sse3/liblapack_atlas.so.3gf
update-alternatives --install /usr/lib/liblapack.so.3gf liblapack.so.3gf \
- /usr/lib/atlas-core2sse3/atlas/liblapack.so.3gf 50
+ /usr/lib/atlas-core2sse3/atlas/liblapack.so.3gf 55
# dh_installdeb will replace this with shell code automatically
Modified: packages/atlas/trunk/debian/libatlas3gf-corei7sse3.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas3gf-corei7sse3.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas3gf-corei7sse3.postinst (original)
+++ packages/atlas/trunk/debian/libatlas3gf-corei7sse3.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so.3gf libblas.so.3gf \
- /usr/lib/atlas-corei7sse3/atlas/libblas.so.3gf 50 \
+ /usr/lib/atlas-corei7sse3/atlas/libblas.so.3gf 60 \
--slave /usr/lib/libcblas.so.3gf libcblas.so.3gf \
/usr/lib/atlas-corei7sse3/libcblas.so.3gf \
--slave /usr/lib/libf77blas.so.3gf libf77blas.so.3gf \
@@ -14,7 +14,7 @@
/usr/lib/atlas-corei7sse3/liblapack_atlas.so.3gf
update-alternatives --install /usr/lib/liblapack.so.3gf liblapack.so.3gf \
- /usr/lib/atlas-corei7sse3/atlas/liblapack.so.3gf 50
+ /usr/lib/atlas-corei7sse3/atlas/liblapack.so.3gf 60
# dh_installdeb will replace this with shell code automatically
Modified: packages/atlas/trunk/debian/libatlas3gf-sse.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas3gf-sse.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas3gf-sse.postinst (original)
+++ packages/atlas/trunk/debian/libatlas3gf-sse.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so.3gf libblas.so.3gf \
- /usr/lib/atlas-sse/atlas/libblas.so.3gf 50 \
+ /usr/lib/atlas-sse/atlas/libblas.so.3gf 40 \
--slave /usr/lib/libcblas.so.3gf libcblas.so.3gf \
/usr/lib/atlas-sse/libcblas.so.3gf \
--slave /usr/lib/libf77blas.so.3gf libf77blas.so.3gf \
@@ -14,7 +14,7 @@
/usr/lib/atlas-sse/liblapack_atlas.so.3gf
update-alternatives --install /usr/lib/liblapack.so.3gf liblapack.so.3gf \
- /usr/lib/atlas-sse/atlas/liblapack.so.3gf 50
+ /usr/lib/atlas-sse/atlas/liblapack.so.3gf 40
# dh_installdeb will replace this with shell code automatically
Modified: packages/atlas/trunk/debian/libatlas3gf-sse2.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas3gf-sse2.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas3gf-sse2.postinst (original)
+++ packages/atlas/trunk/debian/libatlas3gf-sse2.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so.3gf libblas.so.3gf \
- /usr/lib/atlas-sse2/atlas/libblas.so.3gf 50 \
+ /usr/lib/atlas-sse2/atlas/libblas.so.3gf 45 \
--slave /usr/lib/libcblas.so.3gf libcblas.so.3gf \
/usr/lib/atlas-sse2/libcblas.so.3gf \
--slave /usr/lib/libf77blas.so.3gf libf77blas.so.3gf \
@@ -14,7 +14,7 @@
/usr/lib/atlas-sse2/liblapack_atlas.so.3gf
update-alternatives --install /usr/lib/liblapack.so.3gf liblapack.so.3gf \
- /usr/lib/atlas-sse2/atlas/liblapack.so.3gf 50
+ /usr/lib/atlas-sse2/atlas/liblapack.so.3gf 45
# dh_installdeb will replace this with shell code automatically
Modified: packages/atlas/trunk/debian/libatlas3gf-template.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/libatlas3gf-template.postinst?rev=36248&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas3gf-template.postinst (original)
+++ packages/atlas/trunk/debian/libatlas3gf-template.postinst Tue Mar 2 17:23:43 2010
@@ -3,7 +3,7 @@
set -e
update-alternatives --install /usr/lib/libblas.so.3gf libblas.so.3gf \
- /usr/lib/atlas-PACKAGE/atlas/libblas.so.3gf 50 \
+ /usr/lib/atlas-PACKAGE/atlas/libblas.so.3gf PRIORITY \
--slave /usr/lib/libcblas.so.3gf libcblas.so.3gf \
/usr/lib/atlas-PACKAGE/libcblas.so.3gf \
--slave /usr/lib/libf77blas.so.3gf libf77blas.so.3gf \
@@ -14,7 +14,7 @@
/usr/lib/atlas-PACKAGE/liblapack_atlas.so.3gf
update-alternatives --install /usr/lib/liblapack.so.3gf liblapack.so.3gf \
- /usr/lib/atlas-PACKAGE/atlas/liblapack.so.3gf 50
+ /usr/lib/atlas-PACKAGE/atlas/liblapack.so.3gf PRIORITY
# dh_installdeb will replace this with shell code automatically
More information about the debian-science-commits
mailing list