[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. debian/3.6.2-3-1-gecf9137

[Mike Miller]

The following commit has been merged in the master branch:
commit ecf9137782ad2329687cdb8f9e7d5c92cae64176
Author: Mike Miller <mtmiller at ieee.org>
Date:   Fri Jul 20 19:39:31 2012 -0400

    Modify octave.conf to set pkg prefix without dpkg-architecture
    
    Remove dependency on dpkg-dev.
    
    Closes: #682207

diff --git a/debian/control b/debian/control
index 94dc66b..ed43e0d 100644
--- a/debian/control
+++ b/debian/control
@@ -23,8 +23,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-octave/octave.git
 
 Package: octave
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, texinfo, octave-common (= ${source:Version}),
- dpkg-dev (>= 1.16.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, texinfo, octave-common (= ${source:Version})
 Recommends: gnuplot-x11 | gnuplot-qt, libatlas3-base | libopenblas-base
 Suggests: octave-info,
  octave-doc,
diff --git a/debian/octave.conf b/debian/octave.conf
index 687659a..2896f80 100644
--- a/debian/octave.conf
+++ b/debian/octave.conf
@@ -22,9 +22,10 @@ pkg global_list /usr/share/octave/octave_packages;
 
 ## Adjust pkg prefix
 
-[~, target] = system("dpkg-architecture -qDEB_HOST_MULTIARCH");
-pkg ("prefix", "/usr/share/octave/packages", [ "/usr/lib/" strtrim(target) "/octave/packages/"]);
-clear target
+suffix = "/octave/packages";
+pkg ("prefix", sprintf ("%s%s", octave_config_info ("datadir"), suffix),
+               sprintf ("%s%s", octave_config_info ("libdir"), suffix));
+clear suffix;
 
 ## This appears here instead of in the pkg/PKG_ADD file so that --norc
 ## will also skip automatic loading of packages.

-- 
Debian packaging for octave