Commit 27fb6cf5 authored by Michael Hanke's avatar Michael Hanke

Rename package from matlab to matlab-support

See http://bugs.debian.org/608922
parent 7b811703
matlab for Debian
-----------------
matlab-support for Debian
-------------------------
The MATLAB installer usually places symlinks to the respective MATLAB binaries
into /usr/local/bin. Since this directory typically comes first in the search
......
......@@ -8,16 +8,16 @@ little effort.
Since an official Debian package cannot build-depend on Matlab, MEX extensions
have to be built when a package is installed on a particular system. To
guarantee that a local Matlab is installed, a binary package may simply depend
on the 'matlab' package that represents one or more local Matlab installations
in the Debian package management system.
on the 'matlab-support' package that represents one or more local Matlab
installations in the Debian package management system.
For maximum comfort, install all sources for MEX extensions into
/usr/src/matlab/<package name>
Analogous to Octave, the 'matlab-dev' package ships a little Makefile snippet
defining the MATLAB_MEX_SRCDIR variable that points to /usr/src/matlab/. The
script can be included into debian/rules like this
Analogous to Octave, the 'matlab-support-dev' package ships a little Makefile
snippet defining the MATLAB_MEX_SRCDIR variable that points to
/usr/src/matlab/. The script can be included into debian/rules like this
include /usr/share/matlab/debian/defs.make
......@@ -48,15 +48,14 @@ esac
The call to 'debian-matlab-mexhelper' is fully customizable for arbitrary
commands to build and install extensions, as well as to clean up the source
tree afterwards. The matlab package offers default installation directories for
Matlab MEX extensions and M-files (hence complete toolboxes) under
/usr/lib/matlab/site and /usr/share/matlab/site/m respectively. The
tree afterwards. The matlab-support package offers default installation
directories for Matlab MEX extensions and M-files (hence complete toolboxes)
under /usr/lib/matlab/site and /usr/share/matlab/site/m respectively. The
aforementioned Makefile snippet defines the MATLAB_MEX_BINDIR and MATLAB_MDIR
variables that point to these locations. When Matlab toolboxes including MEX
extensions are installed into MATLAB_MDIR the debian-matlab-mexhelper helper
can also automatically move binary extensions to the respective
MATLAB_MEX_BINDIR and symlink them back into the actual installation
directory.
MATLAB_MEX_BINDIR and symlink them back into the actual installation directory.
Please take a look at the manpage for 'debian-matlab-mexhelper' for a
comprehensive list of options and a number of examples for common use cases.
......@@ -91,14 +90,14 @@ esac
Caveats
-------
While the matlab adaptor package tries to offer some integration of a local
While the matlab-support package tries to offer some integration of a local
Matlab installation into a Debian system this integration is not and cannot be
complete. For example, if a potentially required license manager is not running
the build process will fail and in turn cause the package installation itself
to fail -- leaving the package broken. A log file will be available for
inspection. The matlab package supports building extensions under a user other
than 'root', in case specific permissions for contacting a license manager are
required.
inspection. The matlab-support package supports building extensions under a
user other than 'root', in case specific permissions for contacting a license
manager are required.
Moreover, Matlab lacks the concept of a 'package' (in contrast to Octave) that
can be used to enable/disable packages at runtime to deal with namespace
......
......@@ -2,13 +2,12 @@ Although this whole package is pointless without Matlab (a large non-free
something) the source package has been placed into 'main' for the following
reason:
It builds a 'matlab-dev' package that other source packages can build depend
on to figure out where to install MEX sources and M-files (analogous to the
way Octave packages provide this information via a Makefile snippet). This
It builds a 'matlab-support-dev' package that other source packages can build
depend on to figure out where to install MEX sources and M-files (analogous to
the way Octave packages provide this information via a Makefile snippet). This
-dev package has nothing to do with Matlab and should go into 'main', as
otherwise no source package that build-depends on it could go into 'main'.
That would be suboptimal for otherwise DFSG-compliant package that simply
also _can_ build MEX extensions (e.g. see the dynare-matlab package in the
archive).
That would be suboptimal for otherwise DFSG-compliant package that simply also
_can_ build MEX extensions (e.g. see the dynare-matlab package in the archive).
The actual Matlab adaptor package is placed into 'contrib'.
matlab-support (0.0.14) unstable; urgency=low
* Rename source and binary packages to matlab-support*, after discussion
on debian-devel.
-- Michael Hanke <mih@debian.org> Wed, 05 Jan 2011 09:15:51 -0500
matlab (0.0.13) unstable; urgency=low
* Do not set Makefile-related build/install/clean command by default.
......
Source: matlab
Source: matlab-support
Section: devel
Priority: optional
Maintainer: NeuroDebian Team <team@neuro.debian.net>
Uploaders: Michael Hanke <mih@debian.org>, Yaroslav Halchenko <debian@onerussian.com>
Build-Depends: debhelper (>= 7.0.50~), po-debconf, help2man
Standards-Version: 3.9.1
Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/matlab.git
Vcs-Git: git://git.debian.org/git/pkg-exppsy/matlab.git
Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/matlab-support.git
Vcs-Git: git://git.debian.org/git/pkg-exppsy/matlab-support.git
XS-DM-Upload-Allowed: yes
Package: matlab
Package: matlab-support
Section: contrib/devel
Architecture: all
Depends: debconf (>=1.3.22) | cdebconf (>= 0.43), ${misc:Depends}, libxp6, sudo
Recommends: libstdc++6-4.4-dev | libstdc++-dev
Conflicts: matlab (<= 0.0.14~)
Replaces: matlab (<= 0.0.14~)
Description: integrate local Matlab installations into the Debian system
This package does NOT provide Matlab (TM). It merely helps sysadmins
integrate local installations in the Debian system to handle this proprietary
......@@ -27,10 +29,12 @@ Description: integrate local Matlab installations into the Debian system
configuration is conveniently done via debconf.
Package: matlab-dev
Package: matlab-support-dev
Section: devel
Architecture: all
Depends: ${misc:Depends}
Conflicts: matlab-dev (<= 0.0.14~)
Replaces: matlab-dev (<= 0.0.14~)
Description: helpers for packages building Matlab toolboxes
Analogous to Octave a Makefile snippet is provided that configures the
locations for architecture independent M-files, binary MEX-extensions, and
......
......@@ -8,15 +8,15 @@ shopt -s extglob
db_version 2.0
db_capb backup
db_settitle matlab/title
db_settitle matlab-support/title
CONFIGFILE=/etc/matlab/debconf
# Load config file, if it exists.
if [ -e $CONFIGFILE ]; then
. $CONFIGFILE || true
db_set matlab/matlab-install-glob "$MATLAB_INSTALL_GLOB"
db_set matlab/mexbuild-user "$MATLAB_MEXBUILD_USER"
db_set matlab-support/matlab-install-glob "$MATLAB_INSTALL_GLOB"
db_set matlab-support/mexbuild-user "$MATLAB_MEXBUILD_USER"
fi # load config file
......@@ -37,7 +37,7 @@ if [ -z "$matlab_install_glob" ]; then
# locate
matlab_bin="$(readlink -f $(which matlab))"
matlab_install_glob="$(dirname $(dirname $matlab_bin))"
db_set matlab/matlab-install-glob "$matlab_install_glob"
db_set matlab-support/matlab-install-glob "$matlab_install_glob"
fi
fi
......@@ -48,24 +48,24 @@ while [ "$STATE" != 0 -a "$STATE" != 6 ]; do
case $STATE in
1)
if [ -z "$MATLAB_INSTALL_GLOB" ]; then
db_fset matlab/matlab-install-glob seen false
db_fset matlab-support/matlab-install-glob seen false
fi
db_input high matlab/matlab-install-glob || true
db_input high matlab-support/matlab-install-glob || true
;;
2)
db_get matlab/matlab-install-glob
db_get matlab-support/matlab-install-glob
matlab_install_glob="$RET"
# no location is not good
if [ -z "$matlab_install_glob" ]; then
# fail in non-interactive mode
db_input critical matlab/no-matlab-found || \
db_input critical matlab-support/no-matlab-found || \
{ echo "No matlab found and maybe running in non-interactive mode. No way out -- failing..."; exit 1; }
db_fset matlab/matlab-install-glob seen false
db_fset matlab-support/matlab-install-glob seen false
STATE=0
else
# preserve the old default version to check whether it is still
# there
db_get matlab/default-version
db_get matlab-support/default-version
matlab_old_default="$RET"
# figure out what versions we have
for mpath in $matlab_install_glob; do
......@@ -104,33 +104,33 @@ while [ "$STATE" != 0 -a "$STATE" != 6 ]; do
# make sure the selection gets displayed if the old default
# vanished
if [ $matlab_have_old_default -eq 0 ]; then
db_fset matlab/default-version seen false
db_fset matlab-support/default-version seen false
fi
# we require at least one valid choice
if [ -z "$matlab_choices" ]; then
db_input critical matlab/no-matlab-found || true
db_fset matlab/matlab-install-glob seen false
db_input critical matlab-support/no-matlab-found || true
db_fset matlab-support/matlab-install-glob seen false
STATE=0
else
# set the list of version choices
db_subst matlab/default-version choices $matlab_choices
db_input high matlab/default-version || true
db_subst matlab-support/default-version choices $matlab_choices
db_input high matlab-support/default-version || true
fi
;;
4)
# make sure we have a default
db_get matlab/default-version
db_get matlab-support/default-version
matlab_default_version="$RET"
if [ -z "$matlab_default_version" ]; then
db_input critical matlab/no-matlab-found || true
db_fset matlab/matlab-install-glob seen false
db_input critical matlab-support/no-matlab-found || true
db_fset matlab-support/matlab-install-glob seen false
STATE=0
else
db_input high matlab/mexbuild-user || true
db_input high matlab-support/mexbuild-user || true
fi
;;
5)
db_input high matlab/rename-libs || true
db_input high matlab-support/rename-libs || true
;;
esac
......
......@@ -4,13 +4,13 @@ set -e
. /usr/share/debconf/confmodule
db_get matlab/matlab-install-glob
db_get matlab-support/matlab-install-glob
matlab_install_glob="$RET"
db_get matlab/default-version
db_get matlab-support/default-version
matlab_default_path=$(echo $RET | cut -d '@' -f 2,2)
db_get matlab/mexbuild-user
db_get matlab-support/mexbuild-user
matlab_mexbuild_user=$RET
db_get matlab/rename-libs
db_get matlab-support/rename-libs
matlab_rename_libs=$RET
CFG=/etc/matlab/debconf
......
Template: matlab/title
Template: matlab-support/title
Type: title
_description: MATLAB interface configuration
Template: matlab/matlab-install-glob
Template: matlab-support/matlab-install-glob
Type: string
_Description: Location of MATLAB installation(s):
The Debian MATLAB interface needs to know where MATLAB is installed on this
......@@ -19,7 +19,7 @@ _Description: Location of MATLAB installation(s):
just MATLAB installation directories without negative side effects.
Template: matlab/default-version
Template: matlab-support/default-version
Type: select
Choices: ${choices}
_Description: Default MATLAB version:
......@@ -27,13 +27,13 @@ _Description: Default MATLAB version:
can serve as the default MATLAB on this system.
Template: matlab/no-matlab-found
Template: matlab-support/no-matlab-found
Type: error
_Description: No MATLAB installation found.
This package requires at least one local installation of MATLAB.
Template: matlab/mexbuild-user
Template: matlab-support/mexbuild-user
Type: string
_Description: UNIX user account able to launch MATLAB:
If MATLAB can only be launched by a limited set of UNIX user accounts, please
......@@ -44,7 +44,7 @@ _Description: UNIX user account able to launch MATLAB:
please leave this field empty.
Template: matlab/rename-libs
Template: matlab-support/rename-libs
Type: boolean
Default: false
_Description: Rename MATLAB's GCC libraries?
......
[type: gettext/rfc822deb] matlab.templates
[type: gettext/rfc822deb] matlab-support.templates
......@@ -7,8 +7,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: matlab@packages.debian.org\n"
"POT-Creation-Date: 2010-11-18 23:10-0500\n"
"Report-Msgid-Bugs-To: matlab-support@packages.debian.org\n"
"POT-Creation-Date: 2011-01-05 09:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -19,19 +19,19 @@ msgstr ""
#. Type: title
#. description
#: ../matlab.templates:1001
#: ../matlab-support.templates:1001
msgid "MATLAB interface configuration"
msgstr ""
#. Type: string
#. Description
#: ../matlab.templates:2001
#: ../matlab-support.templates:2001
msgid "Location of MATLAB installation(s):"
msgstr ""
#. Type: string
#. Description
#: ../matlab.templates:2001
#: ../matlab-support.templates:2001
msgid ""
"The Debian MATLAB interface needs to know where MATLAB is installed on this "
"system. This can be specified as a single directory or, in case of multiple "
......@@ -41,7 +41,7 @@ msgstr ""
#. Type: string
#. Description
#: ../matlab.templates:2001
#: ../matlab-support.templates:2001
msgid ""
"If, for example, the MATLAB executable is at '/opt/matlab76/bin/matlab', "
"please enter '/opt/matlab76'. If there are multiple MATLAB versions "
......@@ -53,13 +53,13 @@ msgstr ""
#. Type: select
#. Description
#: ../matlab.templates:3001
#: ../matlab-support.templates:3001
msgid "Default MATLAB version:"
msgstr ""
#. Type: select
#. Description
#: ../matlab.templates:3001
#: ../matlab-support.templates:3001
msgid ""
"The following MATLAB versions were found on this system. Any of these "
"versions can serve as the default MATLAB on this system."
......@@ -67,25 +67,25 @@ msgstr ""
#. Type: error
#. Description
#: ../matlab.templates:4001
#: ../matlab-support.templates:4001
msgid "No MATLAB installation found."
msgstr ""
#. Type: error
#. Description
#: ../matlab.templates:4001
#: ../matlab-support.templates:4001
msgid "This package requires at least one local installation of MATLAB."
msgstr ""
#. Type: string
#. Description
#: ../matlab.templates:5001
#: ../matlab-support.templates:5001
msgid "UNIX user account able to launch MATLAB:"
msgstr ""
#. Type: string
#. Description
#: ../matlab.templates:5001
#: ../matlab-support.templates:5001
msgid ""
"If MATLAB can only be launched by a limited set of UNIX user accounts, "
"please specify the login of such an account. This account will be used by "
......@@ -94,7 +94,7 @@ msgstr ""
#. Type: string
#. Description
#: ../matlab.templates:5001
#: ../matlab-support.templates:5001
msgid ""
"If every UNIX user account (including root) is allowed to launch MATLAB, "
"please leave this field empty."
......@@ -102,13 +102,13 @@ msgstr ""
#. Type: boolean
#. Description
#: ../matlab.templates:6001
#: ../matlab-support.templates:6001
msgid "Rename MATLAB's GCC libraries?"
msgstr ""
#. Type: boolean
#. Description
#: ../matlab.templates:6001
#: ../matlab-support.templates:6001
msgid ""
"A MATLAB installation is shipped with copies of GCC dynamic loadable "
"libraries, which typically come from an old version of GCC."
......@@ -116,13 +116,13 @@ msgstr ""
#. Type: boolean
#. Description
#: ../matlab.templates:6001
#: ../matlab-support.templates:6001
msgid "These libraries sometimes cause conflicts."
msgstr ""
#. Type: boolean
#. Description
#: ../matlab.templates:6001
#: ../matlab-support.templates:6001
msgid ""
"If you accept it, the conflicting libraries will be renamed by appending a "
"\".bak\" extension. These libraries are located in the \"sys/os/glnx86\" or "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment