[Pkg-octave-commit] [SCM] Debian packaging for octave-pkg-dev branch, master, updated. 5b141b7c79d58226d864ad42998a7ccb6be0aed6

Sébastien Villemot sebastien.villemot at ens.fr
Wed Feb 29 11:09:39 UTC 2012


The following commit has been merged in the master branch:
commit 5b141b7c79d58226d864ad42998a7ccb6be0aed6
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Wed Feb 29 11:01:31 2012 +0100

    Reflect the fact that octave package is now multi-arch

diff --git a/debian/control b/debian/control
index b697681..986dccf 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-octave/octave-pkg-dev.git
 
 Package: octave-pkg-dev
 Architecture: all
-Depends: liboctave-dev, debhelper (>= 6), cdbs, ${misc:Depends}
+Depends: liboctave-dev (>= 3.6.1-2~), debhelper (>= 6), cdbs, ${misc:Depends}
 Description: infrastructure to build Octave packages
  Since version 3.0 of Octave (a numerical computation software),
  add-ons can be installed through the pkg.m system.  This package
diff --git a/octave-pkg.mk.in b/octave-pkg.mk.in
index a631502..701c2e7 100644
--- a/octave-pkg.mk.in
+++ b/octave-pkg.mk.in
@@ -28,7 +28,7 @@ shrpkg = /usr/share/octave/debian
 # The directories below are versioned.  We only support the packages for the
 # stable version of Octave
 mpath = usr/share/octave/packages
-bpath = usr/lib/octave/packages
+bpath = usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/octave/packages
 hosttype = $(shell octave-config -p CANONICAL_HOST_TYPE)
 apiversion = $(shell octave-config -p API_VERSION)
 octave_options = --no-history --silent --no-init-file

-- 
Debian packaging for octave-pkg-dev



More information about the Pkg-octave-commit mailing list