[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. debian/3.4.3-4-13-g443dd48

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit fce474c0078de7e4105cc19866a882c7843396d8
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Tue Feb 28 21:19:39 2012 +0100

    Bump to dehelper compat level 9. Convert to multi-arch by the way.

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index f1fa172..5092f87 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
 Uploaders: Thomas Weber <tweber at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: gfortran, debhelper (>= 7.0.50~), automake, dh-autoreconf, texinfo,
+Build-Depends: gfortran, debhelper (>= 9), automake, dh-autoreconf, texinfo,
  texlive-latex-base, texlive-generic-recommended, epstool, transfig, pstoedit,
  libreadline-dev | libreadline6-dev | libreadline5-dev,
  libncurses5-dev, gperf, libhdf5-dev (>= 1.8.8),
@@ -13,7 +13,7 @@ Build-Depends: gfortran, debhelper (>= 7.0.50~), automake, dh-autoreconf, texinf
  libsuitesparse-dev (>= 1:3.2.0), gawk, ghostscript, libcurl4-gnutls-dev | libcurl4-dev,
  libqhull-dev, desktop-file-utils, libfltk1.1-dev, libgl2ps-dev,
  libgraphicsmagick++1-dev, libftgl-dev, libfontconfig1-dev,
- libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2)
+ libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2), dh-exec
 Standards-Version: 3.8.4
 Homepage: http://www.octave.org/
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave.git
@@ -109,7 +109,9 @@ Description: GNU Info documentation on the GNU Octave language
 
 Package: liboctave1
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Section: libs
 Description: Shared libraries of the GNU Octave language
  Octave is a (mostly Matlab (R) compatible) high-level language, primarily
diff --git a/debian/liboctave-dev.install b/debian/liboctave-dev.install
old mode 100644
new mode 100755
index dafb673..4e81362
--- a/debian/liboctave-dev.install
+++ b/debian/liboctave-dev.install
@@ -1,8 +1,9 @@
+#!/usr/bin/dh-exec
 src/mkoctfile /usr/bin/
 src/octave-config /usr/bin/
 examples/ /usr/share/doc/liboctave-dev/
 usr/include  /usr
 debian/defs.make /usr/share/octave/debian/
-usr/lib/liboctave.so /usr/lib
-usr/lib/libcruft.so /usr/lib
-usr/lib/liboctinterp.so /usr/lib
+usr/lib/${DEB_HOST_MULTIARCH}/liboctave.so /usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/libcruft.so /usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/${DEB_HOST_MULTIARCH}/liboctinterp.so /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/liboctave1.install b/debian/liboctave1.install
old mode 100644
new mode 100755
index e8fee0b..8db377d
--- a/debian/liboctave1.install
+++ b/debian/liboctave1.install
@@ -1,5 +1,7 @@
-usr/lib/liboctave.so.1* /usr/lib
+#!/usr/bin/dh-exec
 
-usr/lib/libcruft.so.1* /usr/lib
+usr/lib/${DEB_HOST_MULTIARCH}/liboctave.so.1* /usr/lib/${DEB_HOST_MULTIARCH}
 
-usr/lib/liboctinterp.so.1* /usr/lib
+usr/lib/${DEB_HOST_MULTIARCH}/libcruft.so.1* /usr/lib/${DEB_HOST_MULTIARCH}
+
+usr/lib/${DEB_HOST_MULTIARCH}/liboctinterp.so.1* /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/octave.conf b/debian/octave.conf
index 0c845b6..94b7c42 100644
--- a/debian/octave.conf
+++ b/debian/octave.conf
@@ -20,9 +20,11 @@ endif
 
 pkg global_list /usr/share/octave/octave_packages;
 
-## Adjust pkg prefix for each branch of Octave
+## Adjust pkg prefix
 
-pkg prefix /usr/share/octave/packages /usr/lib/octave/packages/;
+[junk, target] = system("dpkg-architecture -qDEB_HOST_MULTIARCH");
+pkg ("prefix", "/usr/share/octave/packages", [ "/usr/lib/" strtrim(target) "/octave/packages/"]);
+clear junk target
 
 ## This appears here instead of in the pkg/PKG_ADD file so that --norc
 ## will also skip automatic loading of packages.
diff --git a/debian/octave.dirs b/debian/octave.dirs
old mode 100644
new mode 100755
index f37024c..f7d7946
--- a/debian/octave.dirs
+++ b/debian/octave.dirs
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
 # create the arch-dependent directories for Octave packages
-usr/lib/octave/packages
+usr/lib/${DEB_HOST_MULTIARCH}/octave/packages
 
diff --git a/debian/octave.install b/debian/octave.install
old mode 100644
new mode 100755
index 798a842..7d27f94
--- a/debian/octave.install
+++ b/debian/octave.install
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
 usr/bin/octave /usr/bin
-usr/lib/octave/* /usr/lib/octave
+usr/lib/${DEB_HOST_MULTIARCH}/octave/* /usr/lib/${DEB_HOST_MULTIARCH}/octave
 usr/share/applications /usr/share

-- 
Debian packaging for octave