[atlas] 08/08: Install libs directly under /usr/lib.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository atlas.

commit 808fbd8b84dcdd49ff463e3620ae101d30b5ed6c
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sat Aug 5 17:00:17 2017 +0200

    Install libs directly under /usr/lib.
    
    Gbp-Dch: Ignore
---
 debian/libatlas-base-dev.install | 10 +++++-----
 debian/libatlas-base-dev.links   |  8 --------
 debian/libatlas3-base.install    |  8 ++++----
 debian/libatlas3-base.links      |  4 ----
 debian/rules                     |  7 +++----
 5 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/debian/libatlas-base-dev.install b/debian/libatlas-base-dev.install
index b05dffc..c3c8cac 100644
--- a/debian/libatlas-base-dev.install
+++ b/debian/libatlas-base-dev.install
@@ -1,11 +1,11 @@
-debian/tmp/usr/lib/atlas-base/*.a
+usr/lib/*.a
 debian/blas-atlas.pc /usr/lib/pkgconfig
 debian/lapack-atlas.pc /usr/lib/pkgconfig
 libblas.a          /usr/lib/atlas-base/atlas/
 libblas.so         /usr/lib/atlas-base/atlas/
 liblapack.a        /usr/lib/atlas-base/atlas/
 liblapack.so       /usr/lib/atlas-base/atlas/
-libatlas.so        /usr/lib/atlas-base/
-libcblas.so        /usr/lib/atlas-base/
-libf77blas.so      /usr/lib/atlas-base/
-liblapack_atlas.so /usr/lib/atlas-base/
\ No newline at end of file
+libatlas.so        /usr/lib/
+libcblas.so        /usr/lib/
+libf77blas.so      /usr/lib/
+liblapack_atlas.so /usr/lib/
\ No newline at end of file
diff --git a/debian/libatlas-base-dev.links b/debian/libatlas-base-dev.links
deleted file mode 100644
index 74d032e..0000000
--- a/debian/libatlas-base-dev.links
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/lib/atlas-base/libcblas.so        usr/lib/libcblas.so
-usr/lib/atlas-base/libcblas.a         usr/lib/libcblas.a
-usr/lib/atlas-base/libf77blas.so      usr/lib/libf77blas.so
-usr/lib/atlas-base/libf77blas.a       usr/lib/libf77blas.a
-usr/lib/atlas-base/libatlas.so        usr/lib/libatlas.so
-usr/lib/atlas-base/libatlas.a         usr/lib/libatlas.a
-usr/lib/atlas-base/liblapack_atlas.so usr/lib/liblapack_atlas.so
-usr/lib/atlas-base/liblapack_atlas.a  usr/lib/liblapack_atlas.a
diff --git a/debian/libatlas3-base.install b/debian/libatlas3-base.install
index 36bd992..d8757c5 100644
--- a/debian/libatlas3-base.install
+++ b/debian/libatlas3-base.install
@@ -1,6 +1,6 @@
 libblas.so.*         /usr/lib/atlas-base/atlas/
 liblapack.so.*       /usr/lib/atlas-base/atlas/
-libatlas.so.*        /usr/lib/atlas-base/
-libcblas.so.*        /usr/lib/atlas-base/
-libf77blas.so.*      /usr/lib/atlas-base/
-liblapack_atlas.so.* /usr/lib/atlas-base/
+libatlas.so.*        /usr/lib/
+libcblas.so.*        /usr/lib/
+libf77blas.so.*      /usr/lib/
+liblapack_atlas.so.* /usr/lib/
diff --git a/debian/libatlas3-base.links b/debian/libatlas3-base.links
deleted file mode 100644
index a668f1f..0000000
--- a/debian/libatlas3-base.links
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/atlas-base/libcblas.so.3        usr/lib/libcblas.so.3
-usr/lib/atlas-base/libf77blas.so.3      usr/lib/libf77blas.so.3
-usr/lib/atlas-base/libatlas.so.3        usr/lib/libatlas.so.3
-usr/lib/atlas-base/liblapack_atlas.so.3 usr/lib/liblapack_atlas.so.3
diff --git a/debian/rules b/debian/rules
index cbed840..ac8ee27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ GFORTRAN_LIB_PATH := $(shell $(CC) -print-search-dirs | grep ^install: | awk '{p
 # Flags common to both the generic and custom packages
 CONFIGURE_FLAGS := --prefix="$(CURDIR)/debian/tmp"			 	\
 	--incdir="$(CURDIR)/debian/tmp/usr/include/"				\
-	--libdir="$(CURDIR)/debian/tmp/usr/lib/atlas-base/"			\
+	--libdir="$(CURDIR)/debian/tmp/usr/lib/"				\
 	--shared								\
 	-D c -DWALL 								\
 	-Ss f77lib "-L$(GFORTRAN_LIB_PATH) -lgfortran -lgcc_s -lpthread"	\
@@ -112,7 +112,8 @@ override_dh_auto_configure:
 override_dh_auto_build:
 	make -C build
 
-	# Create shared versions of individual ATLAS libraries
+	# We do not ship the lib{s,t}atlas.so created by ATLAS build system, they have an awkward name and an incorrect SONAME
+	# Rather create our shared versions of individual ATLAS libraries
 	gfortran $(LDFLAGS) -shared -Wl,-soname=libatlas.so.3 -o libatlas.so.$(DEB_VERSION_UPSTREAM) \
 		-Wl,--whole-archive build/lib/libatlas.a -Wl,--no-whole-archive \
 		-lc -lm
@@ -187,8 +188,6 @@ override_dh_auto_test:
 override_dh_auto_install:
 	make -C build install # The build system does not support setting DESTDIR at install time
 	mv debian/tmp/usr/include/*.h debian/tmp/usr/include/atlas/
-	# Do not ship the *.so created by ATLAS build system, they have an incorrect SONAME
-	rm -f debian/tmp/usr/lib/atlas-base/libsatlas.so debian/tmp/usr/lib/atlas-base/libtatlas.so
 
 # We want packages using libblas/liblapack to depend on any BLAS/LAPACK
 # alternative, and we want packages depending on ATLAS-specific libraries

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/atlas.git