[SCM] CERNLIB is a suite of data analysis tools and libraries created for use in physics experiments, but also with applications to other fields such as the biological sciences branch, master, updated. upstream/2006.dfsg.2-48-g2755c31

Lifeng Sun lifongsun at gmail.com
Thu Jul 5 15:43:26 UTC 2012 

The following commit has been merged in the master branch:
commit 2755c311932a561f7a2a3b1c29468325c4de7bb2
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Thu Jul 5 21:16:53 2012 +0800

    Support multiarch.

diff --git a/debian/add-ons/cernlib.mk b/debian/add-ons/cernlib.mk
index 1e51fec..13b4a79 100644
--- a/debian/add-ons/cernlib.mk
+++ b/debian/add-ons/cernlib.mk
@@ -1,11 +1,12 @@
 # Variables for installation directories, conforming to GNU standards
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 prefix		= /usr/local
 exec_prefix	= $(prefix)
 bindir		= $(exec_prefix)/bin
 sbindir		= $(exec_prefix)/sbin
 datadir		= $(prefix)/share
 sysconfdir	= $(prefix)/etc
-libdir		= $(exec_prefix)/lib
+libdir		= $(exec_prefix)/lib/$(DEB_HOST_MULTIARCH)
 includedir	= $(prefix)/include
 mandir		= $(prefix)/man
 man1dir		= $(mandir)/man1
@@ -100,6 +101,7 @@ stampdir/configure-stamp: stampdir/gunzip-stamp
 	# variable options
 	for patch in `ls -1 $(PATCHDIR)/*.dpatch.in 2> /dev/null`; do \
 		sed -e 's, at PREFIX@,$(prefix),g' -e 's, at DATADIR@,$(datadir),g' \
+			-e 's, at MULTIARCH@,$(DEB_HOST_MULTIARCH),g' \
 			$$patch > $${patch%.in} ; \
 		chmod a+x $${patch%.in} ; \
 	done
diff --git a/debian/cernlib-debian.mk b/debian/cernlib-debian.mk
index 95d082c..17507cd 100644
--- a/debian/cernlib-debian.mk
+++ b/debian/cernlib-debian.mk
@@ -1,6 +1,7 @@
 export DH_ALWAYS_EXCLUDE=CVS
 export LC_ALL=C
 export LC_COLLATE=C
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 export TEXMFVAR = $(CURDIR)/.texmf-var
 
diff --git a/debian/changelog b/debian/changelog
index 600a4be..4b606c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-cernlib (20061220+dfsg3-3) UNRELEASED; urgency=low
+cernlib (20061220+dfsg3-3) unstable; urgency=low
 
   * Manually apply patchset rather than using obsolete dpatch.
   * {cernlib-base-dev,libmathlib2,pawserv}: set priority to optional.
   * Set source format to 3.0 (quilt).
+  * Support multiarch.
 
- -- Lifeng Sun <lifongsun at gmail.com>  Thu, 05 Jul 2012 10:23:34 +0800
+ -- Lifeng Sun <lifongsun at gmail.com>  Thu, 05 Jul 2012 22:30:06 +0800
 
 cernlib (20061220+dfsg3-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 572b255..583cbb3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cernlib
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Lifeng Sun <lifongsun at gmail.com>
 DM-Upload-Allowed: yes
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Priority: optional
 Section: science
 Homepage: http://cernlib.web.cern.ch/cernlib/
@@ -32,6 +32,8 @@ Description: CERNLIB data analysis suite - dependencies checking script
 Package: cernlib-base
 Architecture: all
 Section: devel
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}
 Suggests: vim-addon-manager
 Description: CERNLIB data analysis suite - common files
@@ -177,6 +179,8 @@ Description: CERNLIB data analysis suite - graphical library (development files)
 Package: libgraflib1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CERNLIB data analysis suite - graphical library
  CERNLIB is a suite of data analysis tools and libraries created for
@@ -208,6 +212,8 @@ Description: CERNLIB data analysis suite - interface to X11 and PostScript (deve
 Package: libgrafx11-1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CERNLIB data analysis suite - interface to X11 and PostScript
  CERNLIB is a suite of data analysis tools and libraries created for
@@ -241,6 +247,8 @@ Description: CERNLIB data analysis suite - core library of basic functions (deve
 Package: libkernlib1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, cernlib-base, ${misc:Depends}
 Description: CERNLIB data analysis suite - core library of basic functions
  CERNLIB is a suite of data analysis tools and libraries created for
@@ -278,6 +286,8 @@ Description: CERNLIB data analysis suite - core mathematical library (developmen
 Package: libmathlib2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CERNLIB data analysis suite - core mathematical library
  CERNLIB is a suite of data analysis tools and libraries created for
@@ -325,6 +335,8 @@ Description: CERNLIB data analysis suite - core GUI library (development files)
 Package: libpacklib-lesstif1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: kxterm
 Description: CERNLIB data analysis suite - core GUI library
@@ -375,6 +387,8 @@ Description: CERNLIB data analysis suite - core library (development files)
 Package: libpacklib1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: xterm | x-terminal-emulator
 Replaces: paw-static (<= 2005.05.09-1), paw++-static (<= 2005.05.09-1)
diff --git a/debian/control.d/0base.control b/debian/control.d/0base.control
index 1d062da..e4fda17 100644
--- a/debian/control.d/0base.control
+++ b/debian/control.d/0base.control
@@ -2,7 +2,7 @@ Source: cernlib
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Lifeng Sun <lifongsun at gmail.com>
 DM-Upload-Allowed: yes
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Priority: optional
 Section: science
 Homepage: http://cernlib.web.cern.ch/cernlib/
diff --git a/debian/control.d/cernlib-base.control b/debian/control.d/cernlib-base.control
index 79bd5a0..41a4d65 100644
--- a/debian/control.d/cernlib-base.control
+++ b/debian/control.d/cernlib-base.control
@@ -1,6 +1,8 @@
 Package: cernlib-base
 Architecture: all
 Section: devel
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}
 Suggests: vim-addon-manager
 Description: CERNLIB data analysis suite - common files
diff --git a/debian/control.d/libgraflib1-gfortran.control b/debian/control.d/libgraflib1-gfortran.control
index e4957b0..872c9f5 100644
--- a/debian/control.d/libgraflib1-gfortran.control
+++ b/debian/control.d/libgraflib1-gfortran.control
@@ -1,6 +1,8 @@
 Package: libgraflib1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CERNLIB data analysis suite - graphical library
  CERNLIB is a suite of data analysis tools and libraries created for
diff --git a/debian/control.d/libgrafx11-1-gfortran.control b/debian/control.d/libgrafx11-1-gfortran.control
index f1545f2..32ad0e3 100644
--- a/debian/control.d/libgrafx11-1-gfortran.control
+++ b/debian/control.d/libgrafx11-1-gfortran.control
@@ -1,6 +1,8 @@
 Package: libgrafx11-1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CERNLIB data analysis suite - interface to X11 and PostScript
  CERNLIB is a suite of data analysis tools and libraries created for
diff --git a/debian/control.d/libkernlib1-gfortran.control b/debian/control.d/libkernlib1-gfortran.control
index 7d4fb5a..b60e74e 100644
--- a/debian/control.d/libkernlib1-gfortran.control
+++ b/debian/control.d/libkernlib1-gfortran.control
@@ -1,6 +1,8 @@
 Package: libkernlib1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, cernlib-base, ${misc:Depends}
 Description: CERNLIB data analysis suite - core library of basic functions
  CERNLIB is a suite of data analysis tools and libraries created for
diff --git a/debian/control.d/libmathlib2-gfortran.control b/debian/control.d/libmathlib2-gfortran.control
index bc9a774..2a06357 100644
--- a/debian/control.d/libmathlib2-gfortran.control
+++ b/debian/control.d/libmathlib2-gfortran.control
@@ -1,6 +1,8 @@
 Package: libmathlib2-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: CERNLIB data analysis suite - core mathematical library
  CERNLIB is a suite of data analysis tools and libraries created for
diff --git a/debian/control.d/libpacklib-lesstif1-gfortran.control b/debian/control.d/libpacklib-lesstif1-gfortran.control
index dfac6d1..28ee8bf 100644
--- a/debian/control.d/libpacklib-lesstif1-gfortran.control
+++ b/debian/control.d/libpacklib-lesstif1-gfortran.control
@@ -1,6 +1,8 @@
 Package: libpacklib-lesstif1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: kxterm
 Description: CERNLIB data analysis suite - core GUI library
diff --git a/debian/control.d/libpacklib1-gfortran.control b/debian/control.d/libpacklib1-gfortran.control
index 6282410..2e429cf 100644
--- a/debian/control.d/libpacklib1-gfortran.control
+++ b/debian/control.d/libpacklib1-gfortran.control
@@ -1,6 +1,8 @@
 Package: libpacklib1-gfortran
 Architecture: any
 Section: libs
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: xterm | x-terminal-emulator
 Replaces: paw-static (<= 2005.05.09-1), paw++-static (<= 2005.05.09-1)
diff --git a/debian/dh/libgraflib1-dev.dirs b/debian/dh/libgraflib1-dev.dirs
index 7a1ba37..6ce9db3 100644
--- a/debian/dh/libgraflib1-dev.dirs
+++ b/debian/dh/libgraflib1-dev.dirs
@@ -1,3 +1 @@
-usr/lib
-usr/include
 usr/include/cfortran
diff --git a/debian/dh/libgraflib1-dev.install b/debian/dh/libgraflib1-dev.install
index 5466981..b20a6c7 100644
--- a/debian/dh/libgraflib1-dev.install
+++ b/debian/dh/libgraflib1-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/libgraflib.a
-debian/tmp/usr/lib/libgraflib.so
+debian/tmp/usr/lib/*/libgraflib.a
+debian/tmp/usr/lib/*/libgraflib.so
 debian/tmp/usr/include/graflib.h
 debian/tmp/usr/include/hplot.h
 debian/tmp/usr/include/dzdoc/
diff --git a/debian/dh/libgraflib1-gfortran.install b/debian/dh/libgraflib1-gfortran.install
index 9bce578..fbb4200 100644
--- a/debian/dh/libgraflib1-gfortran.install
+++ b/debian/dh/libgraflib1-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libgraflib.so.1_gfortran.2006
-debian/tmp/usr/lib/libgraflib.so.1_gfortran
+debian/tmp/usr/lib/*/libgraflib.so.1_gfortran.2006
+debian/tmp/usr/lib/*/libgraflib.so.1_gfortran
diff --git a/debian/dh/libgrafx11-1-dev.dirs b/debian/dh/libgrafx11-1-dev.dirs
index 7a1ba37..6ce9db3 100644
--- a/debian/dh/libgrafx11-1-dev.dirs
+++ b/debian/dh/libgrafx11-1-dev.dirs
@@ -1,3 +1 @@
-usr/lib
-usr/include
 usr/include/cfortran
diff --git a/debian/dh/libgrafx11-1-dev.install b/debian/dh/libgrafx11-1-dev.install
index 2570143..7084f98 100644
--- a/debian/dh/libgrafx11-1-dev.install
+++ b/debian/dh/libgrafx11-1-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/libgrafX11.a
-debian/tmp/usr/lib/libgrafX11.so
+debian/tmp/usr/lib/*/libgrafX11.a
+debian/tmp/usr/lib/*/libgrafX11.so
 debian/tmp/usr/include/higz.h
 debian/tmp/usr/include/higz.car
 debian/tmp/usr/include/higz/
diff --git a/debian/dh/libgrafx11-1-gfortran.install b/debian/dh/libgrafx11-1-gfortran.install
index 4ae357f..544e6c4 100644
--- a/debian/dh/libgrafx11-1-gfortran.install
+++ b/debian/dh/libgrafx11-1-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libgrafX11.so.1_gfortran.2006
-debian/tmp/usr/lib/libgrafX11.so.1_gfortran
+debian/tmp/usr/lib/*/libgrafX11.so.1_gfortran.2006
+debian/tmp/usr/lib/*/libgrafX11.so.1_gfortran
diff --git a/debian/dh/libkernlib1-dev.dirs b/debian/dh/libkernlib1-dev.dirs
index 7a1ba37..6ce9db3 100644
--- a/debian/dh/libkernlib1-dev.dirs
+++ b/debian/dh/libkernlib1-dev.dirs
@@ -1,3 +1 @@
-usr/lib
-usr/include
 usr/include/cfortran
diff --git a/debian/dh/libkernlib1-dev.install b/debian/dh/libkernlib1-dev.install
index f6d1772..32f7e04 100644
--- a/debian/dh/libkernlib1-dev.install
+++ b/debian/dh/libkernlib1-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/libkernlib.a
-debian/tmp/usr/lib/libkernlib.so
+debian/tmp/usr/lib/*/libkernlib.a
+debian/tmp/usr/lib/*/libkernlib.so
 debian/tmp/usr/include/kernlib.h
 debian/tmp/usr/include/kernbit/
 debian/tmp/usr/include/kerngen/
diff --git a/debian/dh/libkernlib1-gfortran.install b/debian/dh/libkernlib1-gfortran.install
index 7a983cf..390517c 100644
--- a/debian/dh/libkernlib1-gfortran.install
+++ b/debian/dh/libkernlib1-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libkernlib.so.1_gfortran.2006
-debian/tmp/usr/lib/libkernlib.so.1_gfortran
+debian/tmp/usr/lib/*/libkernlib.so.1_gfortran.2006
+debian/tmp/usr/lib/*/libkernlib.so.1_gfortran
diff --git a/debian/dh/libmathlib2-dev.dirs b/debian/dh/libmathlib2-dev.dirs
index 7a1ba37..6ce9db3 100644
--- a/debian/dh/libmathlib2-dev.dirs
+++ b/debian/dh/libmathlib2-dev.dirs
@@ -1,3 +1 @@
-usr/lib
-usr/include
 usr/include/cfortran
diff --git a/debian/dh/libmathlib2-dev.install b/debian/dh/libmathlib2-dev.install
index df831d0..e806743 100644
--- a/debian/dh/libmathlib2-dev.install
+++ b/debian/dh/libmathlib2-dev.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libmathlib.a
-debian/tmp/usr/lib/libmathlib.so
+debian/tmp/usr/lib/*/libmathlib.a
+debian/tmp/usr/lib/*/libmathlib.so
 debian/tmp/usr/include/gen.h
 debian/tmp/usr/include/gen/
diff --git a/debian/dh/libmathlib2-gfortran.install b/debian/dh/libmathlib2-gfortran.install
index ebd7bd6..df8a9cc 100644
--- a/debian/dh/libmathlib2-gfortran.install
+++ b/debian/dh/libmathlib2-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libmathlib.so.2_gfortran.2006
-debian/tmp/usr/lib/libmathlib.so.2_gfortran
+debian/tmp/usr/lib/*/libmathlib.so.2_gfortran.2006
+debian/tmp/usr/lib/*/libmathlib.so.2_gfortran
diff --git a/debian/dh/libpacklib-lesstif1-dev.install b/debian/dh/libpacklib-lesstif1-dev.install
index 3342fe9..4ad1b2e 100644
--- a/debian/dh/libpacklib-lesstif1-dev.install
+++ b/debian/dh/libpacklib-lesstif1-dev.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libpacklib-lesstif.a
-debian/tmp/usr/lib/libpacklib-lesstif.so
+debian/tmp/usr/lib/*/libpacklib-lesstif.a
+debian/tmp/usr/lib/*/libpacklib-lesstif.so
diff --git a/debian/dh/libpacklib-lesstif1-gfortran.install b/debian/dh/libpacklib-lesstif1-gfortran.install
index 3b45b37..05426fd 100644
--- a/debian/dh/libpacklib-lesstif1-gfortran.install
+++ b/debian/dh/libpacklib-lesstif1-gfortran.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libpacklib-lesstif.so.1_gfortran.2006
-debian/tmp/usr/lib/libpacklib-lesstif.so.1_gfortran
+debian/tmp/usr/lib/*/libpacklib-lesstif.so.1_gfortran.2006
+debian/tmp/usr/lib/*/libpacklib-lesstif.so.1_gfortran
diff --git a/debian/dh/libpacklib1-dev.dirs b/debian/dh/libpacklib1-dev.dirs
index 7a1ba37..6ce9db3 100644
--- a/debian/dh/libpacklib1-dev.dirs
+++ b/debian/dh/libpacklib1-dev.dirs
@@ -1,3 +1 @@
-usr/lib
-usr/include
 usr/include/cfortran
diff --git a/debian/dh/libpacklib1-dev.install b/debian/dh/libpacklib1-dev.install
index cdc7c46..b54e14a 100644
--- a/debian/dh/libpacklib1-dev.install
+++ b/debian/dh/libpacklib1-dev.install
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/libpacklib.a
-debian/tmp/usr/lib/libpacklib.so
+debian/tmp/usr/lib/*/libpacklib.a
+debian/tmp/usr/lib/*/libpacklib.so
 debian/tmp/usr/include/cspack.h
 debian/tmp/usr/include/hbook.h
 debian/tmp/usr/include/kuip.h
diff --git a/debian/dh/libpacklib1-gfortran.dirs b/debian/dh/libpacklib1-gfortran.dirs
index a03ce18..f102fec 100644
--- a/debian/dh/libpacklib1-gfortran.dirs
+++ b/debian/dh/libpacklib1-gfortran.dirs
@@ -1,2 +1 @@
-usr/lib/libpacklib1-gfortran
 usr/share/man/man7
diff --git a/debian/dh/libpacklib1-gfortran.install b/debian/dh/libpacklib1-gfortran.install
index ac8a156..6a8be88 100644
--- a/debian/dh/libpacklib1-gfortran.install
+++ b/debian/dh/libpacklib1-gfortran.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/libpacklib.so.1_gfortran.2006
-debian/tmp/usr/lib/libpacklib.so.1_gfortran
+debian/tmp/usr/lib/*/libpacklib.so.1_gfortran.2006
+debian/tmp/usr/lib/*/libpacklib.so.1_gfortran
 debian/tmp/usr/bin/kuesvr
 debian/tmp/usr/share/man/man1/kuesvr.1
diff --git a/debian/patches/605-move-kuesvr-to-usrlib.dpatch b/debian/patches/605-move-kuesvr-to-usrlib.dpatch
index a442f1f..7f5ddc4 100755
--- a/debian/patches/605-move-kuesvr-to-usrlib.dpatch
+++ b/debian/patches/605-move-kuesvr-to-usrlib.dpatch
@@ -2,7 +2,7 @@
 ## 605-move-kuesvr-to-usrlib.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Move kuesvr into /usr/lib/libpacklib1-gfortran in conformance
+## DP: Move kuesvr into /usr/lib/x86_64-linux-gnu/libpacklib1-gfortran in conformance
 ## DP: with Policy 8.1.
 
 @DPATCH@
@@ -16,7 +16,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./src/packlib/kuip/code_kuip/kedit.c /t
 -    
 +
 +#if defined(CERNLIB_DEBIAN)
-+    line = strdup( "/usr/lib/libpacklib1-gfortran/kuesvr -p " );
++    line = strdup( "/usr/lib/x86_64-linux-gnu/libpacklib1-gfortran/kuesvr -p " );
 +#else
      line = strdup( "kuesvr -p " );
 +#endif
@@ -43,7 +43,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./src/packlib/kuip/code_kuip/kiinit.F /
           IF (EDITOR(1:1) .EQ. '/' .OR. EDITOR(1:2) .EQ. 'vi') THEN
              SERVER = .FALSE.
 +#if defined(CERNLIB_DEBIAN)
-+C        For Debian, kuesvr is in /usr/lib/libpacklib1-gfortran/
++C        For Debian, kuesvr is in /usr/lib/x86_64-linux-gnu/libpacklib1-gfortran/
 +C        so don't test for it in PATH
 +         ELSE
 +            SERVER = .TRUE.
@@ -76,7 +76,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./src/packlib/kuip/code_kuip/kuipcdf.cd
  In order to do that the following conditions must be fulfilled:
   - The KUIP edit server 'kuesvr' must be found in the search path.
 +   (This is not necessary in Debian, where it is installed into the
-+   /usr/lib/libpacklib1-gfortran directory.)
++   /usr/lib/x86_64-linux-gnu/libpacklib1-gfortran directory.)
   - The editor command set by HOST_EDITOR must end with an ampersand ('&').
   - The environment variable 'DISPLAY' must be set.
  .
diff --git a/debian/patches/605-move-kuesvr-to-usrlib.dpatch b/debian/patches/605-move-kuesvr-to-usrlib.dpatch.in
similarity index 91%
copy from debian/patches/605-move-kuesvr-to-usrlib.dpatch
copy to debian/patches/605-move-kuesvr-to-usrlib.dpatch.in
index a442f1f..ee20744 100755
--- a/debian/patches/605-move-kuesvr-to-usrlib.dpatch
+++ b/debian/patches/605-move-kuesvr-to-usrlib.dpatch.in
@@ -2,7 +2,7 @@
 ## 605-move-kuesvr-to-usrlib.dpatch by  <kmccarty at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Move kuesvr into /usr/lib/libpacklib1-gfortran in conformance
+## DP: Move kuesvr into /usr/lib/@MULTIARCH@/libpacklib1-gfortran in conformance
 ## DP: with Policy 8.1.
 
 @DPATCH@
@@ -16,7 +16,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./src/packlib/kuip/code_kuip/kedit.c /t
 -    
 +
 +#if defined(CERNLIB_DEBIAN)
-+    line = strdup( "/usr/lib/libpacklib1-gfortran/kuesvr -p " );
++    line = strdup( "/usr/lib/@MULTIARCH@/libpacklib1-gfortran/kuesvr -p " );
 +#else
      line = strdup( "kuesvr -p " );
 +#endif
@@ -43,7 +43,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./src/packlib/kuip/code_kuip/kiinit.F /
           IF (EDITOR(1:1) .EQ. '/' .OR. EDITOR(1:2) .EQ. 'vi') THEN
              SERVER = .FALSE.
 +#if defined(CERNLIB_DEBIAN)
-+C        For Debian, kuesvr is in /usr/lib/libpacklib1-gfortran/
++C        For Debian, kuesvr is in /usr/lib/@MULTIARCH@/libpacklib1-gfortran/
 +C        so don't test for it in PATH
 +         ELSE
 +            SERVER = .TRUE.
@@ -76,7 +76,7 @@ diff -urNad --exclude=CVS --exclude=.svn ./src/packlib/kuip/code_kuip/kuipcdf.cd
  In order to do that the following conditions must be fulfilled:
   - The KUIP edit server 'kuesvr' must be found in the search path.
 +   (This is not necessary in Debian, where it is installed into the
-+   /usr/lib/libpacklib1-gfortran directory.)
++   /usr/lib/@MULTIARCH@/libpacklib1-gfortran directory.)
   - The editor command set by HOST_EDITOR must end with an ampersand ('&').
   - The environment variable 'DISPLAY' must be set.
  .
diff --git a/debian/rules b/debian/rules
index 92d93b2..676e9fc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,9 @@ binary-arch: install-arch
 	dh_install -s
 	# move a couple files around
 	PL=debian/libpacklib1-gfortran/usr ; \
-	mv -f $$PL/bin/kuesvr $$PL/lib/libpacklib1-gfortran/ ; \
+	mkdir -p $$PL/lib/$(DEB_HOST_MULTIARCH)/libpacklib1-gfortran/; \
+	mv -f $$PL/bin/kuesvr \
+		$$PL/lib/$(DEB_HOST_MULTIARCH)/libpacklib1-gfortran/ ; \
 	mv -f $$PL/share/man/man1/kuesvr.1 $$PL/share/man/man7/kuesvr.7 ; \
 	sed -i -e '/^\.TH/s/1/7/' $$PL/share/man/man7/kuesvr.7 ; \
 	rmdir $$PL/bin $$PL/share/man/man1

-- 
CERNLIB is a suite of data analysis tools and libraries created for use in physics experiments, but also with applications to other fields such as the biological sciences

More information about the debian-science-commits mailing list