[lapack] 02/06: Library alternatives now produce a separate set for each arch

Sébastien Villemot sebastien at debian.org
Wed May 24 14:45:44 UTC 2017


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

sebastien pushed a commit to branch multiarch
in repository lapack.

commit 5de52c97295503ee1fb479cfcc6e299d911e92fd
Author: Dima Kogan <dkogan at debian.org>
Date:   Mon Mar 13 13:26:19 2017 -0700

    Library alternatives now produce a separate set for each arch
---
 debian/libblas-dev.install       |  2 +-
 debian/libblas-dev.postinst      | 16 ----------------
 debian/libblas-dev.postinst.in   | 16 ++++++++++++++++
 debian/libblas-dev.prerm         | 12 ------------
 debian/libblas-dev.prerm.in      | 12 ++++++++++++
 debian/libblas3.postinst         | 14 --------------
 debian/libblas3.postinst.in      | 14 ++++++++++++++
 debian/libblas3.prerm            | 12 ------------
 debian/libblas3.prerm.in         | 12 ++++++++++++
 debian/liblapack-dev.postinst    | 16 ----------------
 debian/liblapack-dev.postinst.in | 16 ++++++++++++++++
 debian/liblapack-dev.prerm       | 12 ------------
 debian/liblapack-dev.prerm.in    | 12 ++++++++++++
 debian/liblapack-pic.postinst    | 14 --------------
 debian/liblapack-pic.postinst.in | 14 ++++++++++++++
 debian/liblapack-pic.prerm       | 12 ------------
 debian/liblapack-pic.prerm.in    | 12 ++++++++++++
 debian/liblapack3.postinst       | 15 ---------------
 debian/liblapack3.postinst.in    | 15 +++++++++++++++
 debian/liblapack3.prerm          | 12 ------------
 debian/liblapack3.prerm.in       | 12 ++++++++++++
 debian/rules                     | 13 +++++++++++++
 22 files changed, 149 insertions(+), 136 deletions(-)

diff --git a/debian/libblas-dev.install b/debian/libblas-dev.install
index e817416..6ec80b5 100755
--- a/debian/libblas-dev.install
+++ b/debian/libblas-dev.install
@@ -5,4 +5,4 @@ libblas.a usr/lib/${DEB_HOST_MULTIARCH}/libblas/
 CBLAS/include/cblas.h usr/include/
 CBLAS/include/cblas_mangling.h usr/include/
 CBLAS/include/cblas_f77.h usr/include/
-BLAS/blas-netlib.pc usr/lib/pkgconfig
+BLAS/blas-netlib.pc usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libblas-dev.postinst b/debian/libblas-dev.postinst
deleted file mode 100644
index bac876b..0000000
--- a/debian/libblas-dev.postinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-set -e
-
-update-alternatives --install /usr/lib/libblas.so libblas.so /usr/lib/libblas/libblas.so 10 \
-     --slave /usr/lib/libblas.a libblas.a /usr/lib/libblas/libblas.a \
-     --slave /usr/lib/pkgconfig/blas.pc blas.pc /usr/lib/pkgconfig/blas-netlib.pc
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/libblas-dev.postinst.in b/debian/libblas-dev.postinst.in
new file mode 100644
index 0000000..1b349c1
--- /dev/null
+++ b/debian/libblas-dev.postinst.in
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+set -e
+
+update-alternatives --install /usr/lib/__DEB_HOST_MULTIARCH__/libblas.so libblas.so-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/libblas/libblas.so 10 \
+     --slave /usr/lib/__DEB_HOST_MULTIARCH__/libblas.a libblas.a-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/libblas/libblas.a \
+     --slave /usr/lib/__DEB_HOST_MULTIARCH__/pkgconfig/blas.pc blas.pc-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/pkgconfig/blas-netlib.pc
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/libblas-dev.prerm b/debian/libblas-dev.prerm
deleted file mode 100644
index a6cc0b3..0000000
--- a/debian/libblas-dev.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" != "upgrade" ]
-then
-    update-alternatives --remove libblas.so /usr/lib/libblas/libblas.so
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libblas-dev.prerm.in b/debian/libblas-dev.prerm.in
new file mode 100644
index 0000000..d0b2d93
--- /dev/null
+++ b/debian/libblas-dev.prerm.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ]
+then
+    update-alternatives --remove libblas.so-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/libblas/libblas.so
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libblas3.postinst b/debian/libblas3.postinst
deleted file mode 100644
index 89028f6..0000000
--- a/debian/libblas3.postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-set -e
-
-update-alternatives --install /usr/lib/libblas.so.3 libblas.so.3 /usr/lib/libblas/libblas.so.3 10
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/libblas3.postinst.in b/debian/libblas3.postinst.in
new file mode 100644
index 0000000..69b0ba4
--- /dev/null
+++ b/debian/libblas3.postinst.in
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+set -e
+
+update-alternatives --install /usr/lib/__DEB_HOST_MULTIARCH__/libblas.so.3 libblas.so.3-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/libblas/libblas.so.3 10
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/libblas3.prerm b/debian/libblas3.prerm
deleted file mode 100644
index ea30455..0000000
--- a/debian/libblas3.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" != "upgrade" ]
-then
-    update-alternatives --remove libblas.so.3 /usr/lib/libblas/libblas.so.3
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libblas3.prerm.in b/debian/libblas3.prerm.in
new file mode 100644
index 0000000..f627d72
--- /dev/null
+++ b/debian/libblas3.prerm.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ]
+then
+    update-alternatives --remove libblas.so.3-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/libblas/libblas.so.3
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/liblapack-dev.postinst b/debian/liblapack-dev.postinst
deleted file mode 100644
index 1efcd42..0000000
--- a/debian/liblapack-dev.postinst
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-
-set -e
-
-update-alternatives --install /usr/lib/liblapack.so liblapack.so /usr/lib/lapack/liblapack.so 20 \
-     --slave /usr/lib/liblapack.a liblapack.a /usr/lib/lapack/liblapack.a \
-     --slave /usr/lib/pkgconfig/lapack.pc lapack.pc /usr/lib/pkgconfig/lapack-netlib.pc
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/liblapack-dev.postinst.in b/debian/liblapack-dev.postinst.in
new file mode 100644
index 0000000..f887fe7
--- /dev/null
+++ b/debian/liblapack-dev.postinst.in
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+set -e
+
+update-alternatives --install /usr/lib/__DEB_HOST_MULTIARCH__/liblapack.so liblapack.so-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/lapack/liblapack.so 20 \
+     --slave /usr/lib/__DEB_HOST_MULTIARCH__/liblapack.a liblapack.a-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/lapack/liblapack.a \
+     --slave /usr/lib/__DEB_HOST_MULTIARCH__/pkgconfig/lapack.pc lapack.pc-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/pkgconfig/lapack-netlib.pc
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/liblapack-dev.prerm b/debian/liblapack-dev.prerm
deleted file mode 100644
index 8bc639b..0000000
--- a/debian/liblapack-dev.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" != "upgrade" ]
-then
-    update-alternatives --remove liblapack.so /usr/lib/lapack/liblapack.so
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/liblapack-dev.prerm.in b/debian/liblapack-dev.prerm.in
new file mode 100644
index 0000000..ce6d9f6
--- /dev/null
+++ b/debian/liblapack-dev.prerm.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ]
+then
+    update-alternatives --remove liblapack.so-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/lapack/liblapack.so
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/liblapack-pic.postinst b/debian/liblapack-pic.postinst
deleted file mode 100644
index e5e6f55..0000000
--- a/debian/liblapack-pic.postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/sh
-
-set -e
-
-update-alternatives --install /usr/lib/liblapack_pic.a liblapack_pic.a /usr/lib/lapack/liblapack_pic.a 20
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/liblapack-pic.postinst.in b/debian/liblapack-pic.postinst.in
new file mode 100644
index 0000000..3cc842b
--- /dev/null
+++ b/debian/liblapack-pic.postinst.in
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+set -e
+
+update-alternatives --install /usr/lib/__DEB_HOST_MULTIARCH__/liblapack_pic.a liblapack_pic.a-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/lapack/liblapack_pic.a 20
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/liblapack-pic.prerm b/debian/liblapack-pic.prerm
deleted file mode 100644
index 7ef791f..0000000
--- a/debian/liblapack-pic.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" != "upgrade" ]
-then
-    update-alternatives --remove liblapack_pic.a /usr/lib/lapack/liblapack_pic.a
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/liblapack-pic.prerm.in b/debian/liblapack-pic.prerm.in
new file mode 100644
index 0000000..8d86fe2
--- /dev/null
+++ b/debian/liblapack-pic.prerm.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ]
+then
+    update-alternatives --remove liblapack_pic.a-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/lapack/liblapack_pic.a
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/liblapack3.postinst b/debian/liblapack3.postinst
deleted file mode 100644
index 9804f84..0000000
--- a/debian/liblapack3.postinst
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-
-set -e
-
-update-alternatives --install /usr/lib/liblapack.so.3 liblapack.so.3 \
-	/usr/lib/lapack/liblapack.so.3 10
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/liblapack3.postinst.in b/debian/liblapack3.postinst.in
new file mode 100644
index 0000000..65e51be
--- /dev/null
+++ b/debian/liblapack3.postinst.in
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+set -e
+
+update-alternatives --install /usr/lib/__DEB_HOST_MULTIARCH__/liblapack.so.3 liblapack.so.3-__DEB_HOST_MULTIARCH__ \
+	/usr/lib/__DEB_HOST_MULTIARCH__/lapack/liblapack.so.3 10
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/liblapack3.prerm b/debian/liblapack3.prerm
deleted file mode 100644
index 3d3605d..0000000
--- a/debian/liblapack3.prerm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" != "upgrade" ]
-then
-    update-alternatives --remove liblapack.so.3 /usr/lib/lapack/liblapack.so.3
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/liblapack3.prerm.in b/debian/liblapack3.prerm.in
new file mode 100644
index 0000000..3354838
--- /dev/null
+++ b/debian/liblapack3.prerm.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" != "upgrade" ]
+then
+    update-alternatives --remove liblapack.so.3-__DEB_HOST_MULTIARCH__ /usr/lib/__DEB_HOST_MULTIARCH__/lapack/liblapack.so.3
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 6b78d81..5538ece 100755
--- a/debian/rules
+++ b/debian/rules
@@ -191,3 +191,16 @@ override_dh_shlibdeps:
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='liblapack-dbg (<< 3.6.0-1~)'
+
+MAINTAINER_SCRIPTS_TEMPLATES := $(patsubst %.in,%,$(wildcard debian/*.postinst.in debian/*.prerm.in))
+ifeq ($(DEB_HOST_MULTIARCH),)
+  DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+endif
+$(MAINTAINER_SCRIPTS_TEMPLATES): %: %.in
+	< $< sed 's/__DEB_HOST_MULTIARCH__/$(DEB_HOST_MULTIARCH)/g' > $@
+override_dh_install: $(MAINTAINER_SCRIPTS_TEMPLATES)
+	dh_install
+
+override_dh_clean:
+	dh_clean
+	$(if $(MAINTAINER_SCRIPTS_TEMPLATES),rm -f $(MAINTAINER_SCRIPTS_TEMPLATES:%.in=%))

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



More information about the debian-science-commits mailing list