[atlas] 01/03: Multi-archify the package.

Sébastien Villemot sebastien at debian.org
Sat Sep 9 08:57:53 UTC 2017


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

sebastien pushed a commit to branch master
in repository atlas.

commit fda319c6baf32c8ca7dd605a8e3b3fded325fdea
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Sep 7 22:53:57 2017 +0200

    Multi-archify the package.
    
    Incidentally, drop the dependency of libatlas-base-dev on libblas-dev, since
    cblas.h is now managed by the alternative.
    
    Gbp-Dch: Full
---
 debian/README.Debian                 |  9 ++++++---
 debian/blas-atlas.pc.in              |  4 ++--
 debian/control                       | 22 +++++++++++++++-------
 debian/lapack-atlas.pc.in            |  4 ++--
 debian/libatlas-base-dev.install     | 26 ++++++++++++++------------
 debian/libatlas-base-dev.postinst    | 24 ------------------------
 debian/libatlas-base-dev.postinst.in | 25 +++++++++++++++++++++++++
 debian/libatlas-base-dev.preinst     | 20 +++++---------------
 debian/libatlas-base-dev.prerm       | 17 -----------------
 debian/libatlas-base-dev.prerm.in    | 16 ++++++++++++++++
 debian/libatlas-test.install         | 20 +++++++++++---------
 debian/libatlas3-base.install        | 14 ++++++++------
 debian/libatlas3-base.postinst       | 17 -----------------
 debian/libatlas3-base.postinst.in    | 15 +++++++++++++++
 debian/libatlas3-base.preinst        | 11 ++++-------
 debian/libatlas3-base.prerm          | 16 ----------------
 debian/libatlas3-base.prerm.in       | 16 ++++++++++++++++
 debian/rules                         | 28 ++++++++++++++++++++--------
 18 files changed, 159 insertions(+), 145 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index a9de675..d50021a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -23,11 +23,14 @@ It is trivial to switch between the various BLAS/LAPACK implementations.
 
 - BLAS:
 
- $ sudo update-alternatives --config libblas.so.3
+ $ sudo update-alternatives --config libblas.so.3-<multiarch>
 
 - LAPACK:
 
- $ sudo update-alternatives --config liblapack.so.3
+ $ sudo update-alternatives --config liblapack.so.3-<multiarch>
+
+where <multiarch> is the multiarch path for you architecture (e.g.
+x86_64-linux-gnu for amd64).
 
 More information is available here:
 
@@ -106,5 +109,5 @@ Thanks to David Cournapeau for providing all the patches for the shared
 libraries managements.
 
 
- -- Sébastien Villemot <sebastien at debian.org>, Wed,  2 Aug 2017 14:38:47 +0200
+ -- Sébastien Villemot <sebastien at debian.org>, Thu,  7 Sep 2017 21:50:00 +0200
  -- Sylvestre Ledru <sylvestre at debian.org>, Tue, 15 May 2012 18:05:34 +0200
diff --git a/debian/blas-atlas.pc.in b/debian/blas-atlas.pc.in
index 6292a33..7ca9098 100644
--- a/debian/blas-atlas.pc.in
+++ b/debian/blas-atlas.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
-libdir=${prefix}/lib/atlas-base/atlas
-includedir=${prefix}/include
+libdir=${prefix}/lib/@DEB_HOST_MULTIARCH@/atlas
+includedir=${prefix}/include/@DEB_HOST_MULTIARCH@
 Name: atlas-blas
 Description: Automatically Tuned Linear Algebra Software, BLAS
 Version: @DEB_VERSION_UPSTREAM@
diff --git a/debian/control b/debian/control
index 943c5bd..147c5da 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,9 @@ Uploaders: Sébastien Villemot <sebastien at debian.org>
 Section: devel
 Priority: optional
 Build-Depends: debhelper (>= 10),
+               dh-exec,
                gfortran,
-               liblapack-pic,
+               liblapack-pic (>= 3.7.1-2~),
                texlive-latex-base,
                ghostscript
 Standards-Version: 4.0.1
@@ -15,10 +16,14 @@ Homepage: http://math-atlas.sourceforge.net/
 
 Package: libatlas3-base
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         libblas-common
+         ${misc:Depends}
+Breaks: libblas3 (<< 3.7.1-2~),
+        liblapack3 (<< 3.7.1-2~),
+        libopenblas-base (<< 0.2.20+ds-3~),
+        libatlas-base-dev (<< 3.10.3-4~)
 Provides: libblas.so.3,
           liblapack.so.3
 Built-Using: ${Built-Using}
@@ -38,17 +43,19 @@ Description: Automatically Tuned Linear Algebra Software, generic shared
 
 Package: libatlas-base-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libatlas3-base (= ${binary:Version}),
-         libblas-dev,
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: libatlas-doc,
-          liblapack-doc,
-          liblapack-dev
+          liblapack-doc
 Provides: libblas.so,
           liblapack.so
-Breaks: libatlas-dev (<< 3.10.3-2)
+Breaks: libblas-dev (<< 3.7.1-2~),
+        liblapack-dev (<< 3.7.1-2~),
+        libopenblas-dev (<< 0.2.20+ds-3~),
+        libatlas-dev (<< 3.10.3-2)
 Replaces: libatlas-dev (<< 3.10.3-2)
 Built-Using: ${Built-Using}
 Description: Automatically Tuned Linear Algebra Software, generic static
@@ -63,6 +70,7 @@ Description: Automatically Tuned Linear Algebra Software, generic static
 
 Package: libatlas-test
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: Automatically Tuned Linear Algebra Software, test programs
diff --git a/debian/lapack-atlas.pc.in b/debian/lapack-atlas.pc.in
index 89aa47b..63220bb 100644
--- a/debian/lapack-atlas.pc.in
+++ b/debian/lapack-atlas.pc.in
@@ -1,6 +1,6 @@
 prefix=/usr
-libdir=${prefix}/lib/atlas-base/atlas
-includedir=${prefix}/include
+libdir=${prefix}/lib/@DEB_HOST_MULTIARCH@/atlas
+includedir=${prefix}/include/@DEB_HOST_MULTIARCH@
 Name: atlas-lapack
 Description: Automatically Tuned Linear Algebra Software, LAPACK
 Version: @DEB_VERSION_UPSTREAM@
diff --git a/debian/libatlas-base-dev.install b/debian/libatlas-base-dev.install
old mode 100644
new mode 100755
index 1e5f930..f3d24fa
--- a/debian/libatlas-base-dev.install
+++ b/debian/libatlas-base-dev.install
@@ -1,12 +1,14 @@
-usr/include/atlas/
-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/
-lib*cblas.so       /usr/lib/
-lib*f77blas.so     /usr/lib/
-liblapack_atlas.so /usr/lib/
\ No newline at end of file
+#!/usr/bin/dh-exec
+
+usr/include/
+usr/lib/*/*.a
+debian/blas-atlas.pc /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+debian/lapack-atlas.pc /usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+libblas.a          /usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+libblas.so         /usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+liblapack.a        /usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+liblapack.so       /usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+libatlas.so        /usr/lib/${DEB_HOST_MULTIARCH}/
+lib*cblas.so       /usr/lib/${DEB_HOST_MULTIARCH}/
+lib*f77blas.so     /usr/lib/${DEB_HOST_MULTIARCH}/
+liblapack_atlas.so /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/libatlas-base-dev.postinst b/debian/libatlas-base-dev.postinst
deleted file mode 100644
index 5c1d211..0000000
--- a/debian/libatlas-base-dev.postinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-
-set -e
-
-update-alternatives --install /usr/lib/libblas.so libblas.so \
-    /usr/lib/atlas-base/atlas/libblas.so 35                  \
-    --slave /usr/lib/libblas.a libblas.a                     \
-    /usr/lib/atlas-base/atlas/libblas.a                      \
-    --slave /usr/lib/pkgconfig/blas.pc blas.pc               \
-    /usr/lib/pkgconfig/blas-atlas.pc
-
-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.a                        \
-    --slave /usr/lib/pkgconfig/lapack.pc lapack.pc               \
-    /usr/lib/pkgconfig/lapack-atlas.pc
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libatlas-base-dev.postinst.in b/debian/libatlas-base-dev.postinst.in
new file mode 100644
index 0000000..c57267b
--- /dev/null
+++ b/debian/libatlas-base-dev.postinst.in
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install /usr/lib/@DEB_HOST_MULTIARCH@/libblas.so libblas.so- at DEB_HOST_MULTIARCH@ \
+                    /usr/lib/@DEB_HOST_MULTIARCH@/atlas/libblas.so 35 \
+                    --slave /usr/lib/@DEB_HOST_MULTIARCH@/libblas.a libblas.a- at DEB_HOST_MULTIARCH@ \
+                    /usr/lib/@DEB_HOST_MULTIARCH@/atlas/libblas.a \
+                    --slave /usr/include/@DEB_HOST_MULTIARCH@/cblas.h cblas.h- at DEB_HOST_MULTIARCH@ \
+                    /usr/include/@DEB_HOST_MULTIARCH@/cblas-atlas.h \
+                    --slave /usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/blas.pc \
+                    blas.pc- at DEB_HOST_MULTIARCH@ /usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/blas-atlas.pc
+
+update-alternatives --install /usr/lib/@DEB_HOST_MULTIARCH@/liblapack.so \
+                    liblapack.so- at DEB_HOST_MULTIARCH@ \
+                    /usr/lib/@DEB_HOST_MULTIARCH@/atlas/liblapack.so 35 \
+                    --slave /usr/lib/@DEB_HOST_MULTIARCH@/liblapack.a liblapack.a- at DEB_HOST_MULTIARCH@ \
+                    /usr/lib/@DEB_HOST_MULTIARCH@/atlas/liblapack.a \
+                    --slave /usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/lapack.pc \
+                    lapack.pc- at DEB_HOST_MULTIARCH@ \
+                    /usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/lapack-atlas.pc
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libatlas-base-dev.preinst b/debian/libatlas-base-dev.preinst
index 014dd61..3ddd9ef 100644
--- a/debian/libatlas-base-dev.preinst
+++ b/debian/libatlas-base-dev.preinst
@@ -1,24 +1,14 @@
-#! /bin/sh
+#!/bin/sh
 
 set -e
 
-# In 3.10.1-1, some symlinks were moved out of the alternatives system
-# The following ensures that they are freed by the alternatives system before unpacking
-if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" ge 3.8.4-4~exp1 && dpkg --compare-versions "$2" lt 3.10.1-1
+# Cleanup pre-multiarch alternative
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 3.10.3-4~
 then
-    update-alternatives --remove libblas.so	/usr/lib/atlas-base/atlas/libblas.so
+    update-alternatives --remove libblas.so /usr/lib/atlas-base/atlas/libblas.so
+    update-alternatives --remove liblapack.so /usr/lib/atlas-base/atlas/liblapack.so
 fi
 
-# Cleanup obsolete alternatives dating back to lenny
-if [ "$1" = "install" ] || [ "$1" = "upgrade" ]
-then
-    update-alternatives --remove libblas-3.so /usr/lib/atlas/libblas.so
-    update-alternatives --remove liblapack-3.so /usr/lib/atlas/liblapack.so
-fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/libatlas-base-dev.prerm b/debian/libatlas-base-dev.prerm
deleted file mode 100644
index 105a765..0000000
--- a/debian/libatlas-base-dev.prerm
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" != "upgrade" ]
-then
-    update-alternatives --remove libblas.so \
-	/usr/lib/atlas-base/atlas/libblas.so
-
-	update-alternatives --remove liblapack.so \
-        /usr/lib/atlas-base/atlas/liblapack.so
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libatlas-base-dev.prerm.in b/debian/libatlas-base-dev.prerm.in
new file mode 100644
index 0000000..5b7d39a
--- /dev/null
+++ b/debian/libatlas-base-dev.prerm.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ]
+then
+    update-alternatives --remove libblas.so- at DEB_HOST_MULTIARCH@ \
+	                /usr/lib/@DEB_HOST_MULTIARCH@/atlas/libblas.so
+
+    update-alternatives --remove liblapack.so- at DEB_HOST_MULTIARCH@ \
+                        /usr/lib/@DEB_HOST_MULTIARCH@/atlas/liblapack.so
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libatlas-test.install b/debian/libatlas-test.install
old mode 100644
new mode 100755
index e111959..b32a8c0
--- a/debian/libatlas-test.install
+++ b/debian/libatlas-test.install
@@ -1,9 +1,11 @@
-build/bin/*tst usr/lib/libatlas-test
-build/tune/blas/level1/x* usr/lib/libatlas-test
-build/tune/blas/gemv/x* usr/lib/libatlas-test
-build/tune/blas/gemm/x* usr/lib/libatlas-test
-build/tune/blas/ger/x* usr/lib/libatlas-test
-build/interfaces/blas/C/testing/x* usr/lib/libatlas-test
-build/interfaces/blas/F77/testing/x* usr/lib/libatlas-test
-interfaces/blas/C/testing/*.dat usr/lib/libatlas-test
-interfaces/blas/F77/testing/*.dat usr/lib/libatlas-test
+#!/usr/bin/dh-exec
+
+build/bin/*tst usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+build/tune/blas/level1/x* usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+build/tune/blas/gemv/x* usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+build/tune/blas/gemm/x* usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+build/tune/blas/ger/x* usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+build/interfaces/blas/C/testing/x* usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+build/interfaces/blas/F77/testing/x* usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+interfaces/blas/C/testing/*.dat usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+interfaces/blas/F77/testing/*.dat usr/lib/${DEB_HOST_MULTIARCH}/atlas/
diff --git a/debian/libatlas3-base.install b/debian/libatlas3-base.install
old mode 100644
new mode 100755
index f416d14..a691c92
--- a/debian/libatlas3-base.install
+++ b/debian/libatlas3-base.install
@@ -1,6 +1,8 @@
-libblas.so.*         /usr/lib/atlas-base/atlas/
-liblapack.so.*       /usr/lib/atlas-base/atlas/
-libatlas.so.*        /usr/lib/
-lib*cblas.so.*        /usr/lib/
-lib*f77blas.so.*      /usr/lib/
-liblapack_atlas.so.* /usr/lib/
+#!/usr/bin/dh-exec
+
+libblas.so.*         /usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+liblapack.so.*       /usr/lib/${DEB_HOST_MULTIARCH}/atlas/
+libatlas.so.*        /usr/lib/${DEB_HOST_MULTIARCH}/
+lib*cblas.so.*       /usr/lib/${DEB_HOST_MULTIARCH}/
+lib*f77blas.so.*     /usr/lib/${DEB_HOST_MULTIARCH}/
+liblapack_atlas.so.* /usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/libatlas3-base.postinst b/debian/libatlas3-base.postinst
deleted file mode 100644
index 0714a94..0000000
--- a/debian/libatlas3-base.postinst
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-
-set -e
-
-
-update-alternatives --install /usr/lib/libblas.so.3 libblas.so.3     \
-    /usr/lib/atlas-base/atlas/libblas.so.3 35
-
-update-alternatives --install /usr/lib/liblapack.so.3 liblapack.so.3 \
-        /usr/lib/atlas-base/atlas/liblapack.so.3 35
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libatlas3-base.postinst.in b/debian/libatlas3-base.postinst.in
new file mode 100644
index 0000000..a3de457
--- /dev/null
+++ b/debian/libatlas3-base.postinst.in
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+update-alternatives --install /usr/lib/@DEB_HOST_MULTIARCH@/libblas.so.3 \
+                    libblas.so.3- at DEB_HOST_MULTIARCH@ \
+                    /usr/lib/@DEB_HOST_MULTIARCH@/atlas/libblas.so.3 35
+
+update-alternatives --install /usr/lib/@DEB_HOST_MULTIARCH@/liblapack.so.3 \
+                    liblapack.so.3- at DEB_HOST_MULTIARCH@ \
+                    /usr/lib/@DEB_HOST_MULTIARCH@/atlas/liblapack.so.3 35
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libatlas3-base.preinst b/debian/libatlas3-base.preinst
index 8a862e4..8e5f1e2 100644
--- a/debian/libatlas3-base.preinst
+++ b/debian/libatlas3-base.preinst
@@ -1,17 +1,14 @@
-#! /bin/sh
+#!/bin/sh
 
 set -e
 
-# In 3.10.1-1, some symlinks were moved out of the alternatives system
-# The following ensures that they are freed by the alternatives system before unpacking
-if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" ge 3.8.4-4~exp1 && dpkg --compare-versions "$2" lt 3.10.1-1
+# Cleanup pre-multiarch alternative
+if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 3.10.3-4~
 then
     update-alternatives --remove libblas.so.3 /usr/lib/atlas-base/atlas/libblas.so.3
+    update-alternatives --remove liblapack.so.3 /usr/lib/atlas-base/atlas/liblapack.so.3
 fi
 
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
 #DEBHELPER#
 
 exit 0
diff --git a/debian/libatlas3-base.prerm b/debian/libatlas3-base.prerm
deleted file mode 100644
index eb8f305..0000000
--- a/debian/libatlas3-base.prerm
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" != "upgrade" ]
-then
-    update-alternatives --remove libblas.so.3 \
-	/usr/lib/atlas-base/atlas/libblas.so.3
-
-    update-alternatives --remove liblapack.so.3 \
-        /usr/lib/atlas-base/atlas/liblapack.so.3
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libatlas3-base.prerm.in b/debian/libatlas3-base.prerm.in
new file mode 100644
index 0000000..f01deaf
--- /dev/null
+++ b/debian/libatlas3-base.prerm.in
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ]
+then
+    update-alternatives --remove libblas.so.3- at DEB_HOST_MULTIARCH@ \
+	                /usr/lib/@DEB_HOST_MULTIARCH@/atlas/libblas.so.3
+
+    update-alternatives --remove liblapack.so.3- at DEB_HOST_MULTIARCH@ \
+                        /usr/lib/@DEB_HOST_MULTIARCH@/atlas/liblapack.so.3
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 11a303f..5dfe7af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,8 +15,8 @@ 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/"				\
+	--incdir="$(CURDIR)/debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/"	\
+	--libdir="$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/"		\
 	--shared								\
 	-D c -DWALL 								\
 	-Ss f77lib "-L$(GFORTRAN_LIB_PATH) -lgfortran -lgcc_s -lpthread"	\
@@ -106,10 +106,6 @@ override_dh_auto_configure:
 	@grep ARCH < build/Make.inc | head -1 | awk '{print $$3}'
 	@echo "=============================================="
 
-	# Create pkgconfig files
-	sed -e "s%@DEB_VERSION_UPSTREAM@%$(DEB_VERSION_UPSTREAM)%" < debian/blas-atlas.pc.in > debian/blas-atlas.pc
-	sed -e "s%@DEB_VERSION_UPSTREAM@%$(DEB_VERSION_UPSTREAM)%" < debian/lapack-atlas.pc.in > debian/lapack-atlas.pc
-
 override_dh_auto_build:
 	make -C build
 
@@ -183,7 +179,7 @@ override_dh_auto_build:
 	# Note that we unpack liblapack_atlas.a after liblapack_pic.a, in order to overwrite routines in the latter
 	mkdir tmp
 	cd tmp && \
-		ar x /usr/lib/liblapack_pic.a && \
+		ar x /usr/lib/$(DEB_HOST_MULTIARCH)/liblapack_pic.a && \
 		ar x ../build/lib/liblapack_atlas.a
 	ar r liblapack.a tmp/*.o
 	rm -rf tmp
@@ -204,7 +200,7 @@ 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/
+	mv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/cblas.h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/cblas-atlas.h
 
 # We want packages using libblas/liblapack to depend on any BLAS/LAPACK
 # alternative, and we want packages depending on ATLAS-specific libraries
@@ -218,6 +214,9 @@ override_dh_makeshlibs:
 	if test -f libptcblas.so; then echo "libptcblas 3 libatlas3-base" >> debian/libatlas3-base/DEBIAN/shlibs; fi
 	if test -f libptf77blas.so; then echo "libptf77blas 3 libatlas3-base" >> debian/libatlas3-base/DEBIAN/shlibs; fi
 
+override_dh_shlibdeps:
+	dh_shlibdeps -a -l $$(pwd)
+
 override_dh_gencontrol:
 	dh_gencontrol -- -VBuilt-Using="`dpkg-query -W -f='$${source:Package} (= $${source:Version})' liblapack-pic`"
 
@@ -227,5 +226,18 @@ override_dh_auto_clean:
 	rm -f debian/blas-atlas.pc debian/lapack-atlas.pc
 	rm -f *.a *.so *.so.*
 
+GENERATED_DEBIAN_FILES := $(patsubst %.in,%,$(wildcard debian/*.pc.in debian/*.postinst.in debian/*.prerm.in))
+
+$(GENERATED_DEBIAN_FILES): %: %.in
+	sed -e "s/@DEB_VERSION_UPSTREAM@/$(DEB_VERSION_UPSTREAM)/g" \
+	    -e "s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" < $< > $@
+
+override_dh_install: $(GENERATED_DEBIAN_FILES)
+	dh_install
+
+override_dh_clean:
+	dh_clean
+	rm -f $(GENERATED_DEBIAN_FILES)
+
 get-orig-source:
 	-uscan --upstream-version 0

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



More information about the debian-science-commits mailing list