[scotch] 03/12: use executable [pt]scotch.install

Drew Parsons dparsons at moszumanska.debian.org
Wed Dec 20 07:14:43 UTC 2017


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

dparsons pushed a commit to tag debian/6.0.4.dfsg1-8
in repository scotch.

commit ec6ae25526add9adad93d32c60a10933938c215b
Author: Drew Parsons <dparsons at debian.org>
Date:   Wed Dec 20 12:00:07 2017 +0800

    use executable [pt]scotch.install
    
    using objdump to distinguish scotch from ptscotch binaries at package
    build time.
---
 debian/changelog        |   2 +
 debian/control          |   1 +
 debian/ptscotch.install |  46 ++++----------
 debian/scotch.install   | 160 ++++--------------------------------------------
 4 files changed, 27 insertions(+), 182 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ceb3f2..5513473 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ scotch (6.0.4.dfsg1-8) UNRELEASED; urgency=medium
   * Create a fill-in man page scotch_binaries.1 to cover sundry
     binaries scotch_esmumps, scotch_gbase, acpl, amk_grf, mcv for which
     a man page is not available. Closes: #883824.
+  * Install with executable [pt]scotch.install to distinguish scotch
+    from ptscotch binaries at package build time.
 
  -- Drew Parsons <dparsons at debian.org>  Mon, 27 Nov 2017 22:48:30 +0800
 
diff --git a/debian/control b/debian/control
index 308cf11..3ed740f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: "Adam C. Powell, IV" <hazelsct at debian.org>,
  Andreas Tille <tille at debian.org>
 Build-Depends: debhelper (>= 10),
+    binutils,
     bison, flex,
     zlib1g-dev,
     chrpath,
diff --git a/debian/ptscotch.install b/debian/ptscotch.install
old mode 100644
new mode 100755
index aaba0c4..81d461d
--- a/debian/ptscotch.install
+++ b/debian/ptscotch.install
@@ -1,37 +1,15 @@
-int/bin/dgmap /usr/bin
-int/bin/dgord /usr/bin
-int/bin/dgscat /usr/bin
-int/bin/dgpart /usr/bin
-int/bin/dgtst /usr/bin
-int/bin/ptscotch_esmumps /usr/bin
+#!/bin/bash
 
-int32/bin/dgmap-int32 /usr/bin
-int32/bin/dgord-int32 /usr/bin
-int32/bin/dgscat-int32 /usr/bin
-int32/bin/dgpart-int32 /usr/bin
-int32/bin/dgtst-int32 /usr/bin
-int32/bin/ptscotch_esmumps-int32 /usr/bin
+# separate scotch from ptscotch binaries
+PTSCOTCH_BINARIES=$( for b in ../int/bin/*; do if objdump -p $b | grep -q ptscotch; then echo `basename $b`; fi; done )
 
-int64/bin/dgmap-int64 /usr/bin
-int64/bin/dgord-int64 /usr/bin
-int64/bin/dgscat-int64 /usr/bin
-int64/bin/dgpart-int64 /usr/bin
-int64/bin/dgtst-int64 /usr/bin
-int64/bin/ptscotch_esmumps-int64 /usr/bin
+for file in $PTSCOTCH_BINARIES; do
+  echo int/bin/${file} /usr/bin
+  echo int32/bin/${file}-int32 /usr/bin
+  echo int64/bin/${file}-int64 /usr/bin
+  echo long/bin/${file}-long /usr/bin
+  echo int/share/man/man1/${file}*.1.gz /usr/share/man/man1
+done
 
-long/bin/dgmap-long /usr/bin
-long/bin/dgord-long /usr/bin
-long/bin/dgscat-long /usr/bin
-long/bin/dgpart-long /usr/bin
-long/bin/dgtst-long /usr/bin
-long/bin/ptscotch_esmumps-long /usr/bin
-
-doc/CeCILL-C_V1-en.txt /usr/share/doc/ptscotch
-doc/CeCILL-C_V1-fr.txt /usr/share/doc/ptscotch
-
-int/share/man/man1/dgmap*.1.gz /usr/share/man/man1
-int/share/man/man1/dgord*.1.gz /usr/share/man/man1
-int/share/man/man1/dgscat*.1.gz /usr/share/man/man1
-int/share/man/man1/dgpart*.1.gz /usr/share/man/man1
-int/share/man/man1/dgtst*.1.gz /usr/share/man/man1
-int/share/man/man1/ptscotch_esmumps*.1.gz /usr/share/man/man1
+echo doc/CeCILL-C_V1-en.txt /usr/share/doc/ptscotch
+echo doc/CeCILL-C_V1-fr.txt /usr/share/doc/ptscotch
diff --git a/debian/scotch.install b/debian/scotch.install
old mode 100644
new mode 100755
index 4bf9419..ea407fc
--- a/debian/scotch.install
+++ b/debian/scotch.install
@@ -1,151 +1,15 @@
-int/bin/acpl /usr/bin
-int/bin/amk_ccc /usr/bin
-int/bin/amk_fft2 /usr/bin
-int/bin/amk_grf /usr/bin
-int/bin/amk_hy /usr/bin
-int/bin/amk_m2 /usr/bin
-int/bin/amk_p2 /usr/bin
-int/bin/atst /usr/bin
-int/bin/gcv /usr/bin
-int/bin/scotch_gbase /usr/bin
-int/bin/scotch_gmap /usr/bin
-int/bin/scotch_gpart /usr/bin
-int/bin/gmk_hy /usr/bin
-int/bin/gmk_m2 /usr/bin
-int/bin/gmk_m3 /usr/bin
-int/bin/gmk_msh /usr/bin
-int/bin/gmk_ub2 /usr/bin
-int/bin/gmtst /usr/bin
-int/bin/gord /usr/bin
-int/bin/gotst /usr/bin
-int/bin/gout /usr/bin
-int/bin/gtst /usr/bin
-int/bin/mcv /usr/bin
-int/bin/mmk_m2 /usr/bin
-int/bin/mmk_m3 /usr/bin
-int/bin/mord /usr/bin
-int/bin/mtst /usr/bin
-int/bin/scotch_esmumps /usr/bin
+#!/bin/bash
 
-int32/bin/acpl-int32 /usr/bin
-int32/bin/amk_ccc-int32 /usr/bin
-int32/bin/amk_fft2-int32 /usr/bin
-int32/bin/amk_grf-int32 /usr/bin
-int32/bin/amk_hy-int32 /usr/bin
-int32/bin/amk_m2-int32 /usr/bin
-int32/bin/amk_p2-int32 /usr/bin
-int32/bin/atst-int32 /usr/bin
-int32/bin/gcv-int32 /usr/bin
-int32/bin/scotch_gbase-int32 /usr/bin
-int32/bin/scotch_gmap-int32 /usr/bin
-int32/bin/scotch_gpart-int32 /usr/bin
-int32/bin/gmk_hy-int32 /usr/bin
-int32/bin/gmk_m2-int32 /usr/bin
-int32/bin/gmk_m3-int32 /usr/bin
-int32/bin/gmk_ub2-int32 /usr/bin
-int32/bin/gmk_msh-int32 /usr/bin
-int32/bin/gmk_ub2-int32 /usr/bin
-int32/bin/gmtst-int32 /usr/bin
-int32/bin/gord-int32 /usr/bin
-int32/bin/gotst-int32 /usr/bin
-int32/bin/gout-int32 /usr/bin
-int32/bin/gtst-int32 /usr/bin
-int32/bin/mcv-int32 /usr/bin
-int32/bin/mmk_m2-int32 /usr/bin
-int32/bin/mmk_m3-int32 /usr/bin
-int32/bin/mord-int32 /usr/bin
-int32/bin/mtst-int32 /usr/bin
-int32/bin/scotch_esmumps-int32 /usr/bin
+# separate scotch from ptscotch binaries
+SCOTCH_BINARIES=$( for b in ../int/bin/*; do if objdump -p $b | grep -q --invert-match ptscotch; then echo `basename $b`; fi; done )
 
-int64/bin/acpl-int64 /usr/bin
-int64/bin/amk_ccc-int64 /usr/bin
-int64/bin/amk_fft2-int64 /usr/bin
-int64/bin/amk_grf-int64 /usr/bin
-int64/bin/amk_hy-int64 /usr/bin
-int64/bin/amk_m2-int64 /usr/bin
-int64/bin/amk_p2-int64 /usr/bin
-int64/bin/atst-int64 /usr/bin
-int64/bin/gcv-int64 /usr/bin
-int64/bin/scotch_gbase-int64 /usr/bin
-int64/bin/scotch_gmap-int64 /usr/bin
-int64/bin/scotch_gpart-int64 /usr/bin
-int64/bin/gmk_hy-int64 /usr/bin
-int64/bin/gmk_m2-int64 /usr/bin
-int64/bin/gmk_m3-int64 /usr/bin
-int64/bin/gmk_ub2-int64 /usr/bin
-int64/bin/gmk_msh-int64 /usr/bin
-int64/bin/gmk_ub2-int64 /usr/bin
-int64/bin/gmtst-int64 /usr/bin
-int64/bin/gord-int64 /usr/bin
-int64/bin/gotst-int64 /usr/bin
-int64/bin/gout-int64 /usr/bin
-int64/bin/gtst-int64 /usr/bin
-int64/bin/mcv-int64 /usr/bin
-int64/bin/mmk_m2-int64 /usr/bin
-int64/bin/mmk_m3-int64 /usr/bin
-int64/bin/mord-int64 /usr/bin
-int64/bin/mtst-int64 /usr/bin
-int64/bin/scotch_esmumps-int64 /usr/bin
+for file in $SCOTCH_BINARIES; do
+  echo int/bin/${file} /usr/bin
+  echo int32/bin/${file}-int32 /usr/bin
+  echo int64/bin/${file}-int64 /usr/bin
+  echo long/bin/${file}-long /usr/bin
+  echo int/share/man/man1/${file}*.1.gz /usr/share/man/man1
+done
 
-long/bin/acpl-long /usr/bin
-long/bin/amk_ccc-long /usr/bin
-long/bin/amk_fft2-long /usr/bin
-long/bin/amk_grf-long /usr/bin
-long/bin/amk_hy-long /usr/bin
-long/bin/amk_m2-long /usr/bin
-long/bin/amk_p2-long /usr/bin
-long/bin/atst-long /usr/bin
-long/bin/gcv-long /usr/bin
-long/bin/scotch_gbase-long /usr/bin
-long/bin/scotch_gmap-long /usr/bin
-long/bin/scotch_gpart-long /usr/bin
-long/bin/gmk_hy-long /usr/bin
-long/bin/gmk_m2-long /usr/bin
-long/bin/gmk_m3-long /usr/bin
-long/bin/gmk_ub2-long /usr/bin
-long/bin/gmk_msh-long /usr/bin
-long/bin/gmk_ub2-long /usr/bin
-long/bin/gmtst-long /usr/bin
-long/bin/gord-long /usr/bin
-long/bin/gotst-long /usr/bin
-long/bin/gout-long /usr/bin
-long/bin/gtst-long /usr/bin
-long/bin/mcv-long /usr/bin
-long/bin/mmk_m2-long /usr/bin
-long/bin/mmk_m3-long /usr/bin
-long/bin/mord-long /usr/bin
-long/bin/mtst-long /usr/bin
-long/bin/scotch_esmumps-long /usr/bin
-
-doc/CeCILL-C_V1-en.txt /usr/share/doc/scotch
-doc/CeCILL-C_V1-fr.txt /usr/share/doc/scotch
-
-int/share/man/man1/acpl*.1.gz /usr/share/man/man1
-int/share/man/man1/amk_ccc*.1.gz /usr/share/man/man1
-int/share/man/man1/amk_fft2*.1.gz /usr/share/man/man1
-int/share/man/man1/amk_grf*.1.gz /usr/share/man/man1
-int/share/man/man1/amk_hy*.1.gz /usr/share/man/man1
-int/share/man/man1/amk_m2*.1.gz /usr/share/man/man1
-int/share/man/man1/amk_p2*.1.gz /usr/share/man/man1
-int/share/man/man1/atst*.1.gz /usr/share/man/man1
-int/share/man/man1/gcv*.1.gz /usr/share/man/man1
-int/share/man/man1/scotch_gbase*.1.gz /usr/share/man/man1
-int/share/man/man1/scotch_gmap*.1.gz /usr/share/man/man1
-int/share/man/man1/scotch_gpart*.1.gz /usr/share/man/man1
-int/share/man/man1/gmk_hy*.1.gz /usr/share/man/man1
-int/share/man/man1/gmk_m2*.1.gz /usr/share/man/man1
-int/share/man/man1/gmk_m3*.1.gz /usr/share/man/man1
-int/share/man/man1/gmk_msh*.1.gz /usr/share/man/man1
-int/share/man/man1/gmk_ub2*.1.gz /usr/share/man/man1
-int/share/man/man1/gmtst*.1.gz /usr/share/man/man1
-int/share/man/man1/gord*.1.gz /usr/share/man/man1
-int/share/man/man1/gotst*.1.gz /usr/share/man/man1
-int/share/man/man1/gout*.1.gz /usr/share/man/man1
-int/share/man/man1/gtst*.1.gz /usr/share/man/man1
-int/share/man/man1/mcv*.1.gz /usr/share/man/man1
-int/share/man/man1/mmk_m2*.1.gz /usr/share/man/man1
-int/share/man/man1/mmk_m3*.1.gz /usr/share/man/man1
-int/share/man/man1/mord*.1.gz /usr/share/man/man1
-int/share/man/man1/mtst*.1.gz /usr/share/man/man1
-int/share/man/man1/scotch_esmumps*.1.gz /usr/share/man/man1
-int/share/man/man1/scotch_binaries*.1.gz /usr/share/man/man1
+echo doc/CeCILL-C_V1-en.txt /usr/share/doc/scotch
+echo doc/CeCILL-C_V1-fr.txt /usr/share/doc/scotch

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



More information about the debian-science-commits mailing list