diff -Nru matlab-support-0.0.21/debian/changelog matlab-support-0.0.21.1/debian/changelog --- matlab-support-0.0.21/debian/changelog 2015-08-15 08:07:38.000000000 +0000 +++ matlab-support-0.0.21.1/debian/changelog 2019-12-03 21:09:24.000000000 +0000 @@ -1,3 +1,21 @@ +matlab-support (0.0.21.1) unstable; urgency=medium + + * Take over maintenance via ITS process. (Closes: #918843). + * debian/: Apply "wrap-and-sort -abst". + * debian/control: + + Bump debhelper compat to v12. + + Bump Standards-Version to 4.4.1. + + Update version of dependency recommendation (libstdc++-dev). + + Set maintainer to Debian Science team. + * debian/po: Add Simplified Chinese debconf translation. + * debian/rules: Use "dh_missing --fail-missing". + * debian-mex-helper: Bump version string. + * matlab.desktop: + + Do not use hardcoded icon path. + + Add zh_CN translation for Comment field. + + -- Boyuan Yang Tue, 03 Dec 2019 16:09:24 -0500 + matlab-support (0.0.21) unstable; urgency=medium * Re-remove the libxp6 dependency again, mistakenly reintroduced do to an @@ -183,7 +201,6 @@ * MEX helper now also deals with installing, cleaning and symlinking extensions. - * -- Michael Hanke Tue, 23 Nov 2010 08:20:25 -0500 diff -Nru matlab-support-0.0.21/debian/compat matlab-support-0.0.21.1/debian/compat --- matlab-support-0.0.21/debian/compat 2010-07-01 01:21:30.000000000 +0000 +++ matlab-support-0.0.21.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -7 diff -Nru matlab-support-0.0.21/debian/control matlab-support-0.0.21.1/debian/control --- matlab-support-0.0.21/debian/control 2015-08-15 08:05:11.000000000 +0000 +++ matlab-support-0.0.21.1/debian/control 2019-12-03 21:09:24.000000000 +0000 @@ -1,22 +1,33 @@ Source: matlab-support Section: devel Priority: optional -Maintainer: NeuroDebian Team -Uploaders: Michael Hanke , Yaroslav Halchenko -Build-Depends: debhelper (>= 7.0.50~), po-debconf, help2man -Standards-Version: 3.9.6.1 -Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/matlab-support.git -Vcs-Git: git://git.debian.org/git/pkg-exppsy/matlab-support.git - +Maintainer: Debian Science Maintainers +Uploaders: + Boyuan Yang , +Build-Depends: + debhelper-compat (= 12), + help2man, + po-debconf, +Standards-Version: 4.4.1 +Rules-Requires-Root: no +Vcs-Browser: https://salsa.debian.org/debian/matlab-support +Vcs-Git: https://salsa.debian.org/debian/matlab-support.git Package: matlab-support Section: contrib/devel Architecture: all -Depends: debconf (>=1.3.22) | cdebconf (>= 0.43), ${misc:Depends}, sudo -Recommends: libstdc++6-4.4-dev | libstdc++-dev -Suggests: lsb-core -Conflicts: matlab (<= 0.0.14~) -Replaces: matlab (<= 0.0.14~) +Depends: + debconf (>=1.3.22) | cdebconf (>= 0.43), + sudo, + ${misc:Depends}, +Recommends: + libstdc++-8-dev | libstdc++-dev, +Suggests: + lsb-core, +Conflicts: + matlab (<= 0.0.14~), +Replaces: + matlab (<= 0.0.14~), Description: distro integration for local MATLAB installations This package does not provide MATLAB. Instead, it configures an existing MATLAB installation to integrate more comfortably in @@ -32,13 +43,15 @@ this one if they install MATLAB code, for example in order to compile MEX extensions. - Package: matlab-support-dev -Section: devel Architecture: all -Depends: ${misc:Depends} -Conflicts: matlab-dev (<= 0.0.14~) -Replaces: matlab-dev (<= 0.0.14~) +Multi-Arch: foreign +Depends: + ${misc:Depends}, +Conflicts: + matlab-dev (<= 0.0.14~), +Replaces: + matlab-dev (<= 0.0.14~), Description: helpers for packages building MATLAB toolboxes This package provides a Makefile snippet (analogous to the one used for Octave) that configures the locations for architecture independent M-files, diff -Nru matlab-support-0.0.21/debian/copyright matlab-support-0.0.21.1/debian/copyright --- matlab-support-0.0.21/debian/copyright 2012-03-07 12:10:51.000000000 +0000 +++ matlab-support-0.0.21.1/debian/copyright 2019-04-23 17:28:56.000000000 +0000 @@ -1,21 +1,20 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: matlab-support Upstream-Contact: NeuroDebian team Source: http://neuro.debian.net - Files: * Copyright: 2010-2012 NeuroDebian Team License: GPL-3+ On Debian systems the full text of the GNU General Public License can be found in the `/usr/share/common-licenses/GPL-3' file. -Files: matlab.png +Files: icons/*/matlab.png Copyright: This has been placed into the public domain. License: public-domain This icon has been derived from this source . - http://en.wikipedia.org/wiki/File:Matlab_Logo.png + https://commons.wikimedia.org/wiki/File:Matlab_Logo.png . It is a rendering of the first eigenfunction of the L-shaped membrane, resembling (but not identical to) the MATLAB's logo trademarked by MathWorks @@ -30,5 +29,5 @@ without any conditions, unless such conditions are required by law. . The file included in this package is identical, but re-sampled to a resolution - of 48x48 pixels, and is also placed into the public domain (under the same - conditions as the original). + of 64x64 and 512x512 pixels, and is also placed into the public domain (under + the same conditions as the original). diff -Nru matlab-support-0.0.21/debian/matlab-support.dirs matlab-support-0.0.21.1/debian/matlab-support.dirs --- matlab-support-0.0.21/debian/matlab-support.dirs 2010-11-23 13:46:29.000000000 +0000 +++ matlab-support-0.0.21.1/debian/matlab-support.dirs 2019-04-23 15:07:52.000000000 +0000 @@ -1,4 +1,4 @@ etc/matlab -usr/share/matlab/site/m usr/lib/matlab/site +usr/share/matlab/site/m usr/src/matlab diff -Nru matlab-support-0.0.21/debian/matlab-support.install matlab-support-0.0.21.1/debian/matlab-support.install --- matlab-support-0.0.21/debian/matlab-support.install 2011-10-25 11:23:15.000000000 +0000 +++ matlab-support-0.0.21.1/debian/matlab-support.install 2019-04-23 15:43:20.000000000 +0000 @@ -1,4 +1,5 @@ debconf.template usr/share/matlab/debian debian-matlab-mexhelper usr/sbin -matlab.png usr/share/icons/hicolor/48x48/apps/ matlab.desktop /usr/share/applications/ +icons/64x64/matlab.png usr/share/icons/hicolor/64x64/apps/ +icons/512x512/matlab.png usr/share/icons/hicolor/512x512/apps/ diff -Nru matlab-support-0.0.21/debian/po/zh_CN.po matlab-support-0.0.21.1/debian/po/zh_CN.po --- matlab-support-0.0.21/debian/po/zh_CN.po 1970-01-01 00:00:00.000000000 +0000 +++ matlab-support-0.0.21.1/debian/po/zh_CN.po 2019-04-23 15:26:28.000000000 +0000 @@ -0,0 +1,152 @@ +# Chinese translations for matlab-support package +# matlab-support 软件包的简体中文翻译. +# Copyright (C) 2019 matlab-support'S COPYRIGHT HOLDER +# This file is distributed under the same license as the matlab-support package. +# Boyuan Yang , 2019. +# +msgid "" +msgstr "" +"Project-Id-Version: matlab-support 0.0.21.1\n" +"Report-Msgid-Bugs-To: matlab-support@packages.debian.org\n" +"POT-Creation-Date: 2011-05-17 08:01+0200\n" +"PO-Revision-Date: 2019-04-23 11:26-0400\n" +"Last-Translator: Boyuan Yang <073plan@gmail.com>\n" +"Language-Team: Chinese (simplified)\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.2.1\n" + +#. Type: title +#. description +#: ../matlab-support.templates:2001 +msgid "MATLAB interface configuration" +msgstr "MATLAB 界面配置" + +#. Type: string +#. Description +#: ../matlab-support.templates:3001 +msgid "Location of MATLAB installation(s):" +msgstr "MATLAB 的安装位置：" + +#. Type: string +#. Description +#: ../matlab-support.templates:3001 +msgid "" +"The 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 MATLAB " +"installations, as a glob expression (any expression supported by bash, " +"including extended pattern matching operators)." +msgstr "" +"MATLAB 界面需要知道 MATLAB 安装在系统的哪个位置。可以指定一个单独的目录，或者" +"在安装了多个 MATLAB 的情况下，可以指定一个通配符表达式（任何 bash 支持的表达" +"式，包括扩展模式匹配操作符）。" + +#. Type: string +#. Description +#: ../matlab-support.templates:3001 +msgid "" +"If, for example, the MATLAB executable is installed in /opt/matlab76/bin/" +"matlab, please enter \"/opt/matlab76\". If there are multiple MATLAB " +"versions installed, you can enter \"/opt/matlab*\" or a similar expression. " +"Only matches that really contain a MATLAB executable will be considered. " +"Therefore, a glob expression may match more than just MATLAB installation " +"directories without negative side effects." +msgstr "" +"例如，如果 MATLAB 可执行文件位于 /opt/matlab76/bin/matlab，请输入“/opt/" +"matlab76”。如果有安装有多个 MATLAB 版本，您可以输入“/opt/matlab*”或者类似的一" +"个表达式。只有真正包含 MATLAB 可执行程序的匹配项才会纳入考虑范围内。因此，匹" +"配到超出范围的目录也不会有负面影响。" + +#. Type: select +#. Description +#: ../matlab-support.templates:4001 +msgid "Default MATLAB version:" +msgstr "默认 MATLAB 版本：" + +#. Type: select +#. Description +#: ../matlab-support.templates:4001 +msgid "" +"The following MATLAB versions were found on this system. Please select which " +"one should serve as the default MATLAB on this system." +msgstr "" +"系统上找到了如下的 MATLAB 版本。请选择将要在本系统上默认使用的 MATLAB 版本。" + +#. Type: error +#. Description +#: ../matlab-support.templates:5001 +msgid "No MATLAB installation found" +msgstr "未找到 MATLAB 安装实例" + +#. Type: error +#. Description +#: ../matlab-support.templates:5001 +msgid "No MATLAB executables were found in the directories you specified." +msgstr "在您指定的目录中未找到 MATLAB 可执行文件。" + +#. Type: error +#. Description +#: ../matlab-support.templates:5001 +msgid "This package requires at least one local installation of MATLAB." +msgstr "本软件包徐哟至少一个本地已安装的 MATLAB 实例。" + +#. Type: string +#. Description +#: ../matlab-support.templates:6001 +msgid "Authorized user for MATLAB:" +msgstr "可使用 MATLAB 的授权用户：" + +#. Type: string +#. Description +#: ../matlab-support.templates:6001 +msgid "" +"If MATLAB can only be launched by a limited set of user accounts, please " +"specify one of these. This account will be used by other packages to build " +"MEX extensions upon installation." +msgstr "" +"如果 MATLAB 只被允许由某些特定用户帐户启动的话，请指定这些帐户。该帐户将被其" +"它软件包所使用，在安装时用于构建 MEX 扩展。" + +#. Type: string +#. Description +#: ../matlab-support.templates:6001 +msgid "" +"You may leave this field empty if any user account (including root) is " +"allowed to launch MATLAB." +msgstr "" +"如果任何帐户（包括 root）都被允许启动 MATLAB 的话，您可以将此项保持为空。" + +#. Type: boolean +#. Description +#: ../matlab-support.templates:7001 +msgid "Rename MATLAB's GCC libraries?" +msgstr "是否重命名 MATLAB 的 GCC 库？" + +#. Type: boolean +#. Description +#: ../matlab-support.templates:7001 +msgid "" +"A MATLAB installation is shipped with copies of GCC dynamic loadable " +"libraries, which typically come from an old version of GCC." +msgstr "" +"MATLAB 的安装实例通常包含 GCC 动态链接库的一些副本，它们通常来自旧版本的 " +"GCC。" + +#. Type: boolean +#. Description +#: ../matlab-support.templates:7001 +msgid "These libraries sometimes cause conflicts." +msgstr "这些软件库有时会导致某些冲突。" + +#. Type: boolean +#. Description +#: ../matlab-support.templates:7001 +msgid "" +"If you choose this option, the conflicting libraries will be renamed by " +"appending a \".bak\" extension. These libraries are located in the \"sys/os/" +"glnx86\" or \"sys/os/glnxa64\" subdirectory of a MATLAB installation tree." +msgstr "" +"如果您选择此选项，可能引起冲突的库将被重命名并添加“.bak”后缀名。这些库位于 " +"MATLAB 安装实例的目录树下的“sys/os/glnx86”或者“sys/os/glnxa64”目录中。" diff -Nru matlab-support-0.0.21/debian/README.Developers matlab-support-0.0.21.1/debian/README.Developers --- matlab-support-0.0.21/debian/README.Developers 2011-01-05 14:56:38.000000000 +0000 +++ matlab-support-0.0.21.1/debian/README.Developers 2019-04-23 17:52:27.000000000 +0000 @@ -104,3 +104,7 @@ collisions. For this reason, no Matlab toolbox (installed by a Debian package) is automatically added to Matlab's search path. Sysadmins or users have to perform this final configuration step manually. + +For desktop integration, it is known that newer MATLAB are setting WMClass +information based on the version (e.g., "MATLAB R2018b"). Current settings in +matlab.desktop will not work well. diff -Nru matlab-support-0.0.21/debian/rules matlab-support-0.0.21.1/debian/rules --- matlab-support-0.0.21/debian/rules 2013-02-13 07:02:29.000000000 +0000 +++ matlab-support-0.0.21.1/debian/rules 2019-04-23 17:16:08.000000000 +0000 @@ -1,15 +1,19 @@ #!/usr/bin/make -f +# -*- makefile -*- +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 -# one ring to rule them all ... %: dh $@ # nothing to do override_dh_auto_configure: -override_dh_auto_install:: -override_dh_auto_test:: -override_dh_auto_build:: +override_dh_auto_install: + +override_dh_auto_test: + +override_dh_auto_build: help2man -N -n "helper to build Matlab extensions on Debian" \ ./debian-matlab-mexhelper > debian-matlab-mexhelper.1 @@ -17,3 +21,6 @@ dh_clean debconf-updatepo -rm -f debian-matlab-mexhelper.1 + +override_dh_missing: + dh_missing --fail-missing diff -Nru matlab-support-0.0.21/debian-matlab-mexhelper matlab-support-0.0.21.1/debian-matlab-mexhelper --- matlab-support-0.0.21/debian-matlab-mexhelper 2012-03-07 12:04:59.000000000 +0000 +++ matlab-support-0.0.21.1/debian-matlab-mexhelper 2019-04-23 17:29:16.000000000 +0000 @@ -4,7 +4,7 @@ set -u # init -version='0.0.18' +version='0.0.21.1' scriptname=$(basename $0) mode="" build_cmd="" @@ -54,7 +54,7 @@ Copyright (C) 2010-2011 Michael Hanke -Licensed under GNU Public License version 3 or later. +Licensed under GNU General Public License version 3 or later. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Binary files /tmp/tmpNVCyKS/TZ0iN5NPRz/matlab-support-0.0.21/icons/512x512/matlab.png and /tmp/tmpNVCyKS/Akml8pagx3/matlab-support-0.0.21.1/icons/512x512/matlab.png differ Binary files /tmp/tmpNVCyKS/TZ0iN5NPRz/matlab-support-0.0.21/icons/64x64/matlab.png and /tmp/tmpNVCyKS/Akml8pagx3/matlab-support-0.0.21.1/icons/64x64/matlab.png differ diff -Nru matlab-support-0.0.21/matlab.desktop matlab-support-0.0.21.1/matlab.desktop --- matlab-support-0.0.21/matlab.desktop 2013-02-11 20:15:05.000000000 +0000 +++ matlab-support-0.0.21.1/matlab.desktop 2019-04-23 17:11:18.000000000 +0000 @@ -4,8 +4,9 @@ Terminal=false Exec=matlab -desktop Name=MATLAB -Icon=/usr/share/icons/hicolor/48x48/apps/matlab.png +Icon=matlab Categories=Development;Math;Science Comment=Scientific computing environment +Comment[zh_CN] = 科学计算环境 StartupNotify=true StartupWMClass=com-mathworks-util-PostVMInit Binary files /tmp/tmpNVCyKS/TZ0iN5NPRz/matlab-support-0.0.21/matlab.png and /tmp/tmpNVCyKS/Akml8pagx3/matlab-support-0.0.21.1/matlab.png differ