r38217 - in /packages/atlas/trunk/debian: TODO changelog generate.sh libatlas-base-dev.postinst libatlas-template-dev.postinst libatlas-template-dev.prerm libatlas3gf-base.postinst libatlas3gf-template.postinst libatlas3gf-template.prerm rules
sylvestre at users.alioth.debian.org
sylvestre at users.alioth.debian.org
Sat Mar 19 15:19:24 UTC 2011
Author: sylvestre
Date: Sat Mar 19 15:19:23 2011
New Revision: 38217
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38217
Log:
* New upstream release (only bug fixes)
* Update of the README.Debian (typos, old stuff, etc)
* Some clean up and simplification of debian/rules
(removed rules to build preoptimized packages)
* Remove Recommends on libblas3gf when installing libatlas
* Drop control.in (was used when we were build pre-optimized packages)
Removed:
packages/atlas/trunk/debian/generate.sh
packages/atlas/trunk/debian/libatlas-template-dev.postinst
packages/atlas/trunk/debian/libatlas-template-dev.prerm
packages/atlas/trunk/debian/libatlas3gf-template.postinst
packages/atlas/trunk/debian/libatlas3gf-template.prerm
Modified:
packages/atlas/trunk/debian/TODO
packages/atlas/trunk/debian/changelog
packages/atlas/trunk/debian/libatlas-base-dev.postinst
packages/atlas/trunk/debian/libatlas3gf-base.postinst
packages/atlas/trunk/debian/rules
Modified: packages/atlas/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/TODO?rev=38217&op=diff
==============================================================================
--- packages/atlas/trunk/debian/TODO (original)
+++ packages/atlas/trunk/debian/TODO Sat Mar 19 15:19:23 2011
@@ -1,1 +1,2 @@
+* syncro des packages de dev et pas de dev
* Provide -dbg packages
Modified: packages/atlas/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/changelog?rev=38217&op=diff
==============================================================================
--- packages/atlas/trunk/debian/changelog (original)
+++ packages/atlas/trunk/debian/changelog Sat Mar 19 15:19:23 2011
@@ -1,10 +1,13 @@
-atlas (3.8.3-30) UNRELEASED; urgency=low
-
- * Update of the README.Debian & TODO (typos, old stuff, etc)
- * Some clean up of debian/rules (removed rules to build preoptimized packages)
+atlas (3.8.4.0-1) unstable; urgency=low
+
+ * New upstream release (only bug fixes)
+ * Update of the README.Debian (typos, old stuff, etc)
+ * Some clean up and simplification of debian/rules
+ (removed rules to build preoptimized packages)
* Remove Recommends on libblas3gf when installing libatlas
-
- -- Sylvestre Ledru <sylvestre at debian.org> Thu, 17 Feb 2011 17:39:52 +0100
+ * Drop control.in (was used when we were build pre-optimized packages)
+
+ -- Sylvestre Ledru <sylvestre at debian.org> Sat, 19 Mar 2011 09:47:02 +0100
atlas (3.8.3-29) unstable; urgency=low
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=38217&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas-base-dev.postinst (original)
+++ packages/atlas/trunk/debian/libatlas-base-dev.postinst Sat Mar 19 15:19:23 2011
@@ -3,23 +3,23 @@
set -e
update-alternatives --install /usr/lib/libblas.so libblas.so \
- /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 \
- /usr/lib/atlas-base/liblapack_atlas.so \
- --slave /usr/lib/libatlas.so libatlas.so \
- /usr/lib/atlas-base/libatlas.so \
- --slave /usr/lib/libcblas.a libcblas.a \
- /usr/lib/atlas-base/libcblas.a \
- --slave /usr/lib/libf77blas.so libf77blas.so \
- /usr/lib/atlas-base/libf77blas.so \
- --slave /usr/lib/liblapack_atlas.a liblapack_atlas.a \
+ /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 \
+ /usr/lib/atlas-base/liblapack_atlas.so \
+ --slave /usr/lib/libatlas.so libatlas.so \
+ /usr/lib/atlas-base/libatlas.so \
+ --slave /usr/lib/libcblas.a libcblas.a \
+ /usr/lib/atlas-base/libcblas.a \
+ --slave /usr/lib/libf77blas.so libf77blas.so \
+ /usr/lib/atlas-base/libf77blas.so \
+ --slave /usr/lib/liblapack_atlas.a liblapack_atlas.a \
/usr/lib/atlas-base/liblapack_atlas.a
update-alternatives --install /usr/lib/liblapack.so liblapack.so \
- /usr/lib/atlas-base/atlas/liblapack.so 35 \
- --slave /usr/lib/liblapack.a liblapack.a \
+ /usr/lib/atlas-base/atlas/liblapack.so 35 \
+ --slave /usr/lib/liblapack.a liblapack.a \
/usr/lib/atlas-base/atlas/liblapack.a
# 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=38217&op=diff
==============================================================================
--- packages/atlas/trunk/debian/libatlas3gf-base.postinst (original)
+++ packages/atlas/trunk/debian/libatlas3gf-base.postinst Sat Mar 19 15:19:23 2011
@@ -3,15 +3,15 @@
set -e
update-alternatives --install /usr/lib/libblas.so.3gf libblas.so.3gf \
- /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 \
- /usr/lib/atlas-base/libf77blas.so.3gf \
- --slave /usr/lib/libatlas.so.3gf libatlas.so.3gf \
- /usr/lib/atlas-base/libatlas.so.3gf \
- --slave /usr/lib/liblapack_atlas.so.3gf liblapack_atlas.so.3gf \
- /usr/lib/atlas-base/liblapack_atlas.so.3gf
+ /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 \
+ /usr/lib/atlas-base/libf77blas.so.3gf \
+ --slave /usr/lib/libatlas.so.3gf libatlas.so.3gf \
+ /usr/lib/atlas-base/libatlas.so.3gf \
+ --slave /usr/lib/liblapack_atlas.so.3gf liblapack_atlas.so.3gf \
+ /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 35
Modified: packages/atlas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/atlas/trunk/debian/rules?rev=38217&op=diff
==============================================================================
--- packages/atlas/trunk/debian/rules (original)
+++ packages/atlas/trunk/debian/rules Sat Mar 19 15:19:23 2011
@@ -6,8 +6,6 @@
DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-CHECK_EXTENSIONS=""
# Pointer bitwidth (default value)
MODE_BITWIDTH = 32
@@ -86,33 +84,24 @@
touch $@
configure-stamp:
- if test -n "$(CHECK_EXTENSIONS)"; then \
- if test -f /proc/cpuinfo; then \
- if ! grep ^flags /proc/cpuinfo | grep -q $(CHECK_EXTENSIONS); then \
- echo "Warning: In order to build Atlas under $(DEB_HOST_ARCH_CPU), you need the CPU extension $(CHECK_EXTENSIONS) available on your CPU"; \
- exit 1; \
- fi \
- fi \
- fi
- dh_testdir
-
- set -e; for ext in $(ARCHS); do \
- targetName=`echo $$ext|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`; \
- atlasArch=`echo $$ext|sed -e "s|.*_\(.*\)_.*|\1|g"`; \
- atlasISA=`echo $$ext|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 -; \
- done
+ 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 -;
touch $@
@@ -125,27 +114,22 @@
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
dh_testdir
- set -e; for ext in $(ARCHS); do \
- targetName=`echo $$ext|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`; \
- cd build/$$targetName; \
- $(MAKE) build; \
- cd lib; \
- $(MAKE) shared; \
- $(MAKE) ptshared; \
- cd ..; \
- $(MAKE) check; \
- $(MAKE) ptcheck; \
- 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
- make -C TexDoc atlas_contrib.pdf atlas_devel.pdf atlas_install.pdf cblasqref.pdf f77blasqref.pdf lapackqref.pdf
+ 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 \
+ make -C TexDoc atlas_contrib.pdf atlas_devel.pdf atlas_install.pdf cblasqref.pdf f77blasqref.pdf lapackqref.pdf; \
+ fi
touch $@
clean:: clean-work #unpatch
@@ -174,14 +158,13 @@
dh_testdir
dh_testroot
- set -e; for ext in $(ARCHS); do \
- targetName=`echo $$ext|sed -e "s|\(.*\)_.*_.*|atlas-\1|g"`; \
- cd build/$$targetName; \
- echo "make install of $$targetName to $(DEB_DESTDIR)"; \
- $(MAKE) DESTDIR=$(DEB_DESTDIR) install; \
- echo "============================================="; \
- cd -; \
- done
+ 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::
if test -d $(CURDIR)/debian/libatlas-dev/usr/include/; then \
More information about the debian-science-commits
mailing list