From 1fd0603526bf5c3ebc6ad19f3930bae65e6f612d Mon Sep 17 00:00:00 2001 From: Dimitrios Eftaxiopoulos Date: Tue, 3 Apr 2018 18:00:54 +0300 Subject: [PATCH] Remove M-A header from libmgl7.5.0 library --- debian/changelog | 30 +- debian/changelog.orig | 515 --------------------------- debian/compat | 2 +- debian/control | 36 +- debian/control.orig | 250 ------------- debian/libmgl7.5.0.install | 2 +- debian/patches/CMakeLists.patch | 23 +- debian/patches/CMakeLists.patch.orig | 112 ------ debian/patches/fix_hdf5.patch | 7 - debian/patches/pthread-fix.patch | 16 - debian/patches/series | 1 - debian/rules | 4 +- debian/source/local-options | 2 + debian/source/options | 2 + mathgl_es.po | 512 +++++++++++++++++--------- mathgl_ru.po | 2 +- 16 files changed, 400 insertions(+), 1116 deletions(-) delete mode 100644 debian/changelog.orig delete mode 100644 debian/control.orig delete mode 100644 debian/patches/CMakeLists.patch.orig delete mode 100644 debian/patches/fix_hdf5.patch delete mode 100644 debian/patches/pthread-fix.patch create mode 100644 debian/source/local-options create mode 100644 debian/source/options diff --git a/debian/changelog b/debian/changelog index 31e5668..813523b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,9 +21,9 @@ mathgl (2.4-1) unstable; urgency=medium * New upstream release * Library version numbers updated to soname 7.4.1->7.5.0 - * Standards-Version: 4.0.0 + * Standards-Version: 4.0.0 * Set libmgl-data as M-A: foreign - * Added myself as uploader + * Added myself as uploader -- Alastair McKinstry Wed, 28 Jun 2017 09:27:37 +0100 @@ -122,7 +122,7 @@ mathgl (2.2.1+svn921-1) unstable; urgency=low * Imported Upstream version 2.2.1+svn921 (Closes: #737110, #737437) * Fix DEP5 lintian error in d/copyright * Disable openmpi support and keep pthread support (Closes: #738540) - * Disable octave interface due to FTBFS + * Disable octave interface due to FTBFS -- Dimitrios Eftaxiopoulos Sun, 23 Feb 2014 19:16:25 +0200 @@ -166,12 +166,12 @@ mathgl (2.1.3.1-1) unstable; urgency=low * Add udav manpage. * Replace octave3.2-headers with liboctave-dev in build deps. * Fix library package names to reflect soname. - * Rename mathgl-doc binary to mathgl-doc-en. + * Rename mathgl-doc binary to mathgl-doc-en. * Fix installation directory in doc-base file mathgl-doc-en. * Fix installation directory of python module and files. * Add udav binary package. * Make build dependency on libhdf5-dev only. - * Add c++ compilation include path for pyconfig.h + * Add c++ compilation include path for pyconfig.h * Fix typo in libmgl-glut6.0.0 package (by D. Haley) (Closes: #698570) * Change soname in libraries from 6 to 7 * Add libmgl-qt7.0.0 library package creation @@ -220,20 +220,20 @@ mathgl (2~rc1-3) experimental; urgency=low mathgl (2~rc1-2) experimental; urgency=low * Correct typo in mathgl description in debian/control (Closes: #644863). - * Try to fix symbols FTBFS on several arches. + * Try to fix symbols FTBFS on several arches. -- Dimitrios Eftaxiopoulos Wed, 4 Jan 2012 15:30:00 +0200 mathgl (2~rc1-1) experimental; urgency=low * New experimental upstream release (Closes: #632468). - * No documentation debian packages provided. + * No documentation debian packages provided. -- Dimitrios Eftaxiopoulos Wed, 28 Sep 2011 11:30:00 +0300 mathgl (1.11.2-6) unstable; urgency=low - * Fix FTBFS for sparc (Closes: #642654). + * Fix FTBFS for sparc (Closes: #642654). -- Dimitrios Eftaxiopoulos Mon, 26 Sep 2011 16:23:12 +0300 @@ -254,7 +254,7 @@ mathgl (1.11.2-4) unstable; urgency=low mathgl (1.11.2-3) unstable; urgency=low - * Replace libfltk-dev with libfltk1.3-dev | libfltk-dev in debian/control + * Replace libfltk-dev with libfltk1.3-dev | libfltk-dev in debian/control Build-Depends (Closes: #638834). * Ammend symbols files for s390x architecture (Closes: #639492). @@ -369,7 +369,7 @@ mathgl (1.11.0.1-5) unstable; urgency=low mathgl (1.11.0.1-4) unstable; urgency=low - * Create mixed symbols files for amd64 and i386 with tagged symbols + * Create mixed symbols files for amd64 and i386 with tagged symbols (Closes: #610777) -- Dimitrios Eftaxiopoulos Sat, 19 Feb 2011 23:10:00 +0200 @@ -409,16 +409,16 @@ mathgl (1.10.2.1-2) unstable; urgency=low * Add python support (Closes: #541481). -- Dimitrios Eftaxiopoulos Sun, 11 Sep 2010 12:37:00 +0200 - + mathgl (1.10.2.1-1) unstable; urgency=low [ D Eftaxiopoulos ] * Update to Debian Policy 3.9.1 * Put myself and D. Haley to the maintainers list. * Comment out parallel-build-png.patch in the debian/patches/series file - since it seems to apply to a texinfo/Makefile.am file that is not + since it seems to apply to a texinfo/Makefile.am file that is not included in the source tree. - * Append package quilt to the build-depends list for the source in the + * Append package quilt to the build-depends list for the source in the debian/control file, in order to fix a lintian error. * Reinstate debian/source/format file with content '3.0 (quilt)'. * Fix Lintian warnings related to manpages. @@ -430,8 +430,8 @@ mathgl (1.10.2.1-1) unstable; urgency=low * New Maintainer (Closes: #564422). Set Maintainer to Debian Science Maintainers . * Convert to '3.0 (quilt)' package source format. Drop quilt framework for - packaging. - * debian/control: + packaging. + * debian/control: - Change Vcs-Browser and Vcs-Git to the debian-science git repository. - Change Section for source package to 'science' as per debian-science group policy. diff --git a/debian/changelog.orig b/debian/changelog.orig deleted file mode 100644 index 6ae6587..0000000 --- a/debian/changelog.orig +++ /dev/null @@ -1,515 +0,0 @@ -<<<<<<< HEAD -mathgl (2.3.5.1-1) UNRELEASED; urgency=medium - - * New upstream version 2.3.5.1 - - -- Dimitrios Eftaxiopoulos Tue, 24 Jan 2017 18:39:45 +0200 -======= -mathgl (2.4.1-2) unstable; urgency=medium - - * Push to unstable. Closes: #868622 - - -- Alastair McKinstry Wed, 02 Aug 2017 10:43:55 +0100 - -mathgl (2.4.1-1) experimental; urgency=medium - - * New upstream release - * Remove spurious build-dependency on libtwebkit-dev. Closes: #867297 - - -- Alastair McKinstry Tue, 01 Aug 2017 08:52:55 +0100 - -mathgl (2.4-1) unstable; urgency=medium - - * New upstream release - * Library version numbers updated to soname 7.4.1->7.5.0 - * Standards-Version: 4.0.0 - * Set libmgl-data as M-A: foreign - * Added myself as uploader - - -- Alastair McKinstry Wed, 28 Jun 2017 09:27:37 +0100 - -mathgl (2.3.4-1.1) unstable; urgency=medium - - * Non-maintainer upload. - * Fix from Bas Couwenberg for HDF5 build issue. Closes: #835680 - - -- Alastair McKinstry Mon, 12 Sep 2016 10:41:06 +0100 ->>>>>>> 92ae9b8fae4c900177b8b7d36736919646f2b965 - -mathgl (2.3.4-1) unstable; urgency=medium - - * Imported Upstream version 2.3.4 - * Disable C++11 features - - -- Dimitrios Eftaxiopoulos Sat, 20 Feb 2016 13:34:52 +0200 - -mathgl (2.3.3+svn1216-1) unstable; urgency=medium - - * Imported Upstream version 2.3.3+svn1216 (Closes: #800460) - * Fix GSL-2 use bug - thanks to Bas Couwenberg (Closes: #805801) - * Fix Qt related bug -thanks to Peter Green (Closes: #803312) - * Enable Octave interface (Closes: #741156) - - -- Dimitrios Eftaxiopoulos Sat, 05 Dec 2015 16:20:20 +0200 - -mathgl (2.3.3-3) unstable; urgency=medium - - * Disable need for C++11 support (Closes: #800460) - - -- Dimitrios Eftaxiopoulos Mon, 05 Oct 2015 21:53:19 +0300 - -mathgl (2.3.3-2) unstable; urgency=medium - - * Fix FTBFS on several arches (patched by E. G. Evans) (#Closes: 797610) - * Set enable-qt ON in json sample enable line - - -- Dimitrios Eftaxiopoulos Sat, 05 Sep 2015 22:51:26 +0300 - -mathgl (2.3.3-1) unstable; urgency=medium - - * Imported Upstream version 2.3.3 (Closes: #788776) - * Transition from Qt4 to Qt5 (Closes: #784495) - * Add libqt5opengl5-dev, libxcursor-dev and fluid to Build-Depends - * Set compat=9 - * Fix several dep5 related issues in d/copyright - - -- Dimitrios Eftaxiopoulos Sat, 29 Aug 2015 03:52:28 +0300 - -mathgl (2.3.2-1) experimental; urgency=medium - - * Imported Upstream version 2.3.2 - * Fix d/copyright format as prompted by lintian warning - * Add file argument to udav exec in udav/udav.desktop - * Fix d/copyright as prompted by lintian info - * Replace swig3.0 build dep by swig - * Update Conflicts/Replaces entries in d/control - * Set versioned build dependency for libssl1.0.0 to avert FTBFS - * Update copyright holder names in d/copyright - - -- Dimitrios Eftaxiopoulos Thu, 12 Feb 2015 11:26:30 +0200 - -mathgl (2.2.2.1-3) unstable; urgency=medium - - * Re-enable Architecture=any on all arch dependent binaries - * Edit several Conflicts and Replaces lines in d/control - - -- Dimitrios Eftaxiopoulos Sun, 20 Apr 2014 09:53:11 +0300 - -mathgl (2.2.2.1-2) unstable; urgency=medium - - * Exclude kfreebsd-i386 from build arch due to FTBFS - - -- Dimitrios Eftaxiopoulos Mon, 24 Mar 2014 12:20:56 +0200 - -mathgl (2.2.2.1-1) unstable; urgency=medium - - * Imported Upstream version 2.2.2.1 - - -- Dimitrios Eftaxiopoulos Mon, 24 Mar 2014 01:00:27 +0200 - -mathgl (2.2.2+svn930-2) unstable; urgency=medium - - * Build against newer libwxgtk3.0 (Closes: #741710) - - -- Dimitrios Eftaxiopoulos Sun, 16 Mar 2014 09:02:42 +0200 - -mathgl (2.2.2+svn930-1) unstable; urgency=medium - - * Imported Upstream version 2.2.2+svn930 (Closes: #741131) - - -- Dimitrios Eftaxiopoulos Sat, 15 Mar 2014 12:08:13 +0200 - -mathgl (2.2.1+svn921-1) unstable; urgency=low - - * Imported Upstream version 2.2.1+svn921 (Closes: #737110, #737437) - * Fix DEP5 lintian error in d/copyright - * Disable openmpi support and keep pthread support (Closes: #738540) - * Disable octave interface due to FTBFS - - -- Dimitrios Eftaxiopoulos Sun, 23 Feb 2014 19:16:25 +0200 - -mathgl (2.2-1) unstable; urgency=low - - * Imported Upstream version 2.2 - * Disable documentation building in order to avoid FTBFS on some arches - * Disable Lua interface - * Drop symbols files (Closes: #701320, #701651) - - -- Dimitrios Eftaxiopoulos Fri, 10 Jan 2014 12:29:27 +0200 - -mathgl (2.1.3.1-4) unstable; urgency=low - - * More symbols changes for build on ia64 - - -- Dimitrios Eftaxiopoulos Sun, 18 Aug 2013 11:32:38 +0300 - -mathgl (2.1.3.1-3) unstable; urgency=low - - * Further symbols tweaking for build on ia64 - - -- Dimitrios Eftaxiopoulos Sun, 18 Aug 2013 08:48:20 +0300 - -mathgl (2.1.3.1-2) unstable; urgency=low - - * Amend symbols files to enable build on ia64 - - -- Dimitrios Eftaxiopoulos Sat, 17 Aug 2013 21:00:08 +0300 - -mathgl (2.1.3.1-1) unstable; urgency=low - - * Imported Upstream version 2.1.3.1 (Closes: #708969) - * Add mpi-default-dev to build dependencies. - * Add patch for lang/setup.py.in to enable python to read directory tree - written in utf-8 (not ascii) encoding. - * Add UDAV.desktop and udav.png to the files to be installed within the - package udav. - * Add Replaces and Conflicts with mathgl-1* packages in the debian/control - file. - * Add udav manpage. - * Replace octave3.2-headers with liboctave-dev in build deps. - * Fix library package names to reflect soname. - * Rename mathgl-doc binary to mathgl-doc-en. - * Fix installation directory in doc-base file mathgl-doc-en. - * Fix installation directory of python module and files. - * Add udav binary package. - * Make build dependency on libhdf5-dev only. - * Add c++ compilation include path for pyconfig.h - * Fix typo in libmgl-glut6.0.0 package (by D. Haley) (Closes: #698570) - * Change soname in libraries from 6 to 7 - * Add libmgl-qt7.0.0 library package creation - * Add libmgl-fltk7.0.0 and libmgl-wx7.0.0 packages - * Remove DM-Upload-Allow field from debian/control - * Remove D. Haley from uploaders after his request - * Update Standards-Version to 3.9.4 - * Add title for CMakeLists-txt.patch - * Remove encoding specification line from udav.desktop - * Shorten debian/rules file by using dh $@ and overrides - * Remove .pyc file from python-mathgl package - * Remove old udav manpage file - * Modify vcs field - * Associate udav.1 manpage to package udav - * Built with g++-4.7 on both unstable and experimental - * Add version on libfltk1.3-dev build dependency - * Remove (optional) tags from symbols - * Built with gcc-4.8 on amd64 - * Add Conflicts/Replaces options in debian/control - * Remove multiarch related commands from debian/rules - * Add libqtwebkit-dev to build deps in debian/control - * Amend libmgl7.0.0 related symbols for amd64 - * Install executable mgl.cgi in /usr/bin - * Amend overlooked debian/copyright - * Add libmgl-mpi binary package - * Add header to the CMakeLists-txt.patch - * Correct short package description lines (Closes: #703834) - * Minor symbols tuning - * Remove version from libfltk1.3-dev build dependency - * Fix most, missing compilation and linker flag, lintian warnings - * Update header of CMakeLists-txt.patch - * Add --parallel option to dh $@ in debian/rules - * Include missing files and licenses in debian/copyright - * Fix build failure due to gsl 1.15 --> 1.16 upgrade - * Add full text of BSD license in debian/copyright - - -- Dimitrios Eftaxiopoulos Sun, 11 Aug 2013 22:24:05 +0300 - -mathgl (2~rc1-3) experimental; urgency=low - - * Fix symbols FTBFS, related to libmgl-wnd6, on several arches. - * Make libmgl-dev dependent on libmgl-wnd6. - - -- Dimitrios Eftaxiopoulos Wed, 4 Jan 2012 20:16:00 +0200 - -mathgl (2~rc1-2) experimental; urgency=low - - * Correct typo in mathgl description in debian/control (Closes: #644863). - * Try to fix symbols FTBFS on several arches. - - -- Dimitrios Eftaxiopoulos Wed, 4 Jan 2012 15:30:00 +0200 - -mathgl (2~rc1-1) experimental; urgency=low - - * New experimental upstream release (Closes: #632468). - * No documentation debian packages provided. - - -- Dimitrios Eftaxiopoulos Wed, 28 Sep 2011 11:30:00 +0300 - -mathgl (1.11.2-6) unstable; urgency=low - - * Fix FTBFS for sparc (Closes: #642654). - - -- Dimitrios Eftaxiopoulos Mon, 26 Sep 2011 16:23:12 +0300 - -mathgl (1.11.2-5) unstable; urgency=low - - * Resolve differences for all non-optional symbols, in symbols files for ia64, - sparc and sh4 architectures (Closes: #642654). - - -- Dimitrios Eftaxiopoulos Mon, 26 Sep 2011 10:25:00 +0300 - -mathgl (1.11.2-4) unstable; urgency=low - - * Add python-numpy to Depnds of python-mathgl in debian/control and add - dh_numpy in binary-arch in debian/rules (Closes: #641793). - * Ammend symbols files for ia64, sparc and sh4 architectures (Closes: #642654). - - -- Dimitrios Eftaxiopoulos Sat, 24 Sep 2011 23:16:00 +0300 - -mathgl (1.11.2-3) unstable; urgency=low - - * Replace libfltk-dev with libfltk1.3-dev | libfltk-dev in debian/control - Build-Depends (Closes: #638834). - * Ammend symbols files for s390x architecture (Closes: #639492). - - -- Dimitrios Eftaxiopoulos Wed, 7 Sep 2011 06:04:00 +0300 - -mathgl (1.11.2-2) unstable; urgency=low - - * Add debian/source/options file in order to avoid the generation of unneeded debian- - changes patch, due to the creation of extra file config.log during build. - * Ammend symbols files. - - -- Dimitrios Eftaxiopoulos Thu, 18 Aug 2011 20:48:00 +0300 - -mathgl (1.11.2-1) unstable; urgency=low - - * Incorporate changes due to the last two NMU's. - * New upstream version. - - -- Dimitrios Eftaxiopoulos Tue, 28 Jun 2011 17:01:00 +0200 - -mathgl (1.11.1.1-2.2) unstable; urgency=low - - * Non-maintainer upload (closes: #610777). - * debian/libmgl-qt5.symbols: _ZN10QByteArrayD1Ev is needed on sparc and - ia64, so add it as optional. - * debian/libmgl-wx5.symbols: three destructors known to be undefined on - armel/armhf are also not defined on ia64 or sparc, so mark these as - optional also. Destructors of foreign classes are not part of the - library ABI, so it's fine to ignore these. - - -- Steve Langasek Sun, 19 Jun 2011 07:57:43 +0000 - -mathgl (1.11.1.1-2.1) unstable; urgency=low - - * Non-maintainer upload. - * Fix library symbols files (closes: #610777): - - debian/libmgl-qt5.symbols: drop _ZN10QByteArrayD2Ev, which is not - present on *any* architecture anymore. - - debian/libmgl-fltk5.symbols: _ZN9Fl_PixmapC2EPKPKc is not present on - ia64 or sparc and never has been. - - debian/libmgl5.symbols: - + _ZN7mglFuncD1Ev is present on all architectures, drop the - architecture list (fixing the 'kfeebsd' typo that caused a build - failure on kfreebsd-amd64). - + _ZNSt15basic_stringbufIcSt11char_traitsIcESaIcEED2Ev, - _ZN8u3dLightD2Ev: symbols not seen on *any* archs, drop. - + Drop 18 symbols whose exclusion list included all 15 architectures - that have been tested. - + Other symbols that are template instantiations are now marked as - optional symbols instead of tagged with an arch list, since they are - not part of the ABI and will come and go based on the compiler - version used, *not* just on the architecture. - + If there are 8 or more architectures in the arch qualifier, invert - it. In some cases this reveals that certain symbols are actually - 64-bit specific - so infer that not-yet-tested 32-bit archs follow - the pattern. - - debian/*.symbols: any symbols marked for armel should also be marked - for armhf. - * debian/rules: clean the dependency_libs out of .la files at build - time, per Policy 10.2. Closes: #620629. - - -- Steve Langasek Sat, 18 Jun 2011 07:33:55 +0000 - -mathgl (1.11.1.1-3) unreleased; urgency=low - - * Further attempt to fix symbol breakages - - -- Dimitrios Eftaxiopoulos Sun, 29 May 2011 19:41:00 +0200 - -mathgl (1.11.1.1-2) unstable; urgency=low - - * Try to fix libmgl5 related symbols breakage on all arches - - -- Dimitrios Eftaxiopoulos Sun, 22 May 2011 20:50:00 +0200 - -mathgl (1.11.1.1-1) unstable; urgency=low - - * New upstream version - - -- Dimitrios Eftaxiopoulos Tue, 26 Apr 2011 01:15:00 +0200 - -mathgl (1.11.0.1-9) unreleased; urgency=low - - * Again try to fix build failure due to broken symbols for several architectures - - -- Dimitrios Eftaxiopoulos Sat, 2 Apr 2011 02:05:00 +0200 - -mathgl (1.11.0.1-8) unstable; urgency=low - - * Try to fix build failure due to broken symbols for several architectures - - -- Dimitrios Eftaxiopoulos Thu, 24 Mar 2011 23:56:00 +0200 - -mathgl (1.11.0.1-7) unstable; urgency=low - - * Create patch for the removal of the texinfo/mgl_ru.info-* files - * Update symbols files (Closes: #618235) - - -- Dimitrios Eftaxiopoulos Mon, 14 Mar 2011 00:10:00 +0200 - -mathgl (1.11.0.1-6) unstable; urgency=low - - * Try to fix build failure due to broken symbols for sparc64 - - -- Dimitrios Eftaxiopoulos Sat, 5 Mar 2011 21:27:00 +0200 - -mathgl (1.11.0.1-5) unstable; urgency=low - - * Try to fix build failure due to broken symbols for armel and s390 - - -- Dimitrios Eftaxiopoulos Fri, 25 Feb 2011 21:30:00 +0200 - -mathgl (1.11.0.1-4) unstable; urgency=low - - * Create mixed symbols files for amd64 and i386 with tagged symbols - (Closes: #610777) - - -- Dimitrios Eftaxiopoulos Sat, 19 Feb 2011 23:10:00 +0200 - -mathgl (1.11.0.1-3) unstable; urgency=low - - * Upload in unstable - * Change symbols files for pbuilder --distribution unstable (Closes: #610777) - - -- Dimitrios Eftaxiopoulos Sat, 12 Feb 2011 22:14:00 +0200 - -mathgl (1.11.0.1-2) experimental; urgency=low - - * Update symbols files for pbuilder --distribution experimental. - * Remove createpngdirectory.patch from series. - * Apply patch for FTBFS on i386 (Closes: #607539). - * Add Replaces tags for old mathgl-doc package in debian/control. - * Various improvements in the debian/rules file. - - -- Dimitrios Eftaxiopoulos Mon, 17 Jan 2011 21:43:00 +0200 - -mathgl (1.11.0.1-1) experimental; urgency=low - - * Correct debian/copyright file. - * Create proper patches for the changes in the source tree. - * Add new package for Russian documentation. - * New upstream release (Closes: #603004). - * Correct several spelling mistakes in manpages and in lang/numpy.i - * Create symbols files for libraries. - * Register documentation to doc-base. - - -- Dimitrios Eftaxiopoulos Sun, 12 Dec 2010 19:13:00 +0200 - -mathgl (1.10.2.1-2) unstable; urgency=low - - * Make .png pictures visible from the html documentation. - * Add python support (Closes: #541481). - - -- Dimitrios Eftaxiopoulos Sun, 11 Sep 2010 12:37:00 +0200 - -mathgl (1.10.2.1-1) unstable; urgency=low - - [ D Eftaxiopoulos ] - * Update to Debian Policy 3.9.1 - * Put myself and D. Haley to the maintainers list. - * Comment out parallel-build-png.patch in the debian/patches/series file - since it seems to apply to a texinfo/Makefile.am file that is not - included in the source tree. - * Append package quilt to the build-depends list for the source in the - debian/control file, in order to fix a lintian error. - * Reinstate debian/source/format file with content '3.0 (quilt)'. - * Fix Lintian warnings related to manpages. - - [ D Haley ] - * New upstream release 1.10.2.1 (Closes: #562743). - - [ Salvatore Bonaccorso ] - * New Maintainer (Closes: #564422). Set Maintainer to Debian Science - Maintainers . - * Convert to '3.0 (quilt)' package source format. Drop quilt framework for - packaging. - * debian/control: - - Change Vcs-Browser and Vcs-Git to the debian-science git repository. - - Change Section for source package to 'science' as per debian-science - group policy. - - Set DM-Upload-Allowed field to yes. - * Add myself to Uploaders. - - [ Sylvestre Ledru ] - * Missing dependency against automake added. - - -- Sylvestre Ledru Sun, 15 Aug 2010 21:45:47 +0200 - -mathgl (1.9-3) unstable; urgency=low - - * QA upload. - * Properly orphan the package (see #564422), set maintainer to QA. - * Bump Standards-Version to 3.8.4, no changes needed. - * Add debian/README.source, pointing to quilt doc. - * Bump build-deps on octave from 3.0 to 3.2 (Closes: #574025). - - -- Stefano Zacchiroli Fri, 26 Mar 2010 14:06:08 +0100 - -mathgl (1.9-2) unstable; urgency=low - - * Fix FTBFS. Closes: #545882. - * Update Standards-Version to 3.8.3. - - -- Bradley Smith Wed, 09 Sep 2009 22:44:44 +0100 - -mathgl (1.9-1) unstable; urgency=low - - * New upstream release. Closes: #535503. - * QT -> qt in package descriptions. Closes: #534425. - - -- Bradley Smith Sun, 19 Jul 2009 16:41:41 +0100 - -mathgl (1.8.1-6) unstable; urgency=low - - * Redo descriptions. - - -- Bradley Smith Tue, 09 Jun 2009 20:26:42 +0100 - -mathgl (1.8.1-5) unstable; urgency=low - - * Correct info-dir-section in texinfo/mathgl.texi. Closes: #528893. - - -- Bradley Smith Wed, 27 May 2009 17:52:50 +0100 - -mathgl (1.8.1-4) unstable; urgency=low - - * Correct libltdl-dev Build-Depend. Closes: #526426. - * Further improve descriptions. - - -- Bradley Smith Fri, 01 May 2009 12:59:05 +0100 - -mathgl (1.8.1-3) unstable; urgency=low - - * Tidy up descriptions. Closes: #521830, #521917. - * Update Standards-Version to 3.8.1. (No changes). - * Fix watch file. - - -- Bradley Smith Sat, 18 Apr 2009 17:42:59 +0100 - -mathgl (1.8.1-2) unstable; urgency=low - - * Fix parallel builds. Closes: #519738. - - -- Bradley Smith Thu, 19 Mar 2009 19:08:37 +0000 - -mathgl (1.8.1-1) unstable; urgency=low - - * New upstream release. Closes: #518769. - - -- Bradley Smith Sun, 08 Mar 2009 13:29:33 +0000 - -mathgl (1.8-1) unstable; urgency=low - - * Initial release. Closes: #510378. - - -- Bradley Smith Thu, 01 Jan 2009 11:27:32 +0000 diff --git a/debian/compat b/debian/compat index 7641d3f..b4de394 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 \ No newline at end of file +11 diff --git a/debian/control b/debian/control index e7a397a..7e659c8 100644 --- a/debian/control +++ b/debian/control @@ -4,17 +4,17 @@ Priority: optional Maintainer: Debian Science Maintainers Uploaders: Dimitrios Eftaxiopoulos , Alastair McKinstry -Build-Depends: debhelper (>= 9), libltdl-dev, libgsl-dev, freeglut3-dev, +Build-Depends: debhelper (>= 11), libltdl-dev, libgsl-dev, freeglut3-dev, libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev, libqt5opengl5-dev, - libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt5webkit5-dev, libwxgtk3.0-dev, + libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt5webkit5-dev, libwxgtk3.0-dev, texinfo, texlive, texlive-generic-recommended, liblua5.1-dev, libxcursor-dev, - libgif-dev, python-dev, python-numpy, libfontconfig1-dev, + libgif-dev, python-dev, python-numpy, libfontconfig1-dev, libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev, libhpdf-dev, mpi-default-dev, swig3.0, cmake, libxft-dev, liboctave-dev, fluid -Standards-Version: 4.0.0 +Standards-Version: 4.1.3 Homepage: http://mathgl.sourceforge.net/doc_en/Main.html -Vcs-Git: https://anonscm.debian.org/debian-science/packages/mathgl.git -Vcs-Browser: https://anonscm.debian.org/gitweb/?p=debian-science/packages/mathgl.git +Vcs-Git: https://salsa.debian.org/science-team/mathgl.git +Vcs-Browser: https://salsa.debian.org/science-team/mathgl Package: mathgl Architecture: any @@ -59,12 +59,11 @@ Description: library for scientific graphs (window interface) Package: libmgl7.5.0 Architecture: any -Multi-Arch: foreign Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data Replaces: libmgl5, libmgl6, libmgl6.0.0, libmgl7.1.0, libmgl7.2.0, libmgl7.4.0 -Conflicts: libmgl5, libmgl6, libmgl6.0.0, libmgl7.1.0, libmgl7.2.0, +Conflicts: libmgl5, libmgl6, libmgl6.0.0, libmgl7.1.0, libmgl7.2.0, libmgl7.4.0 Description: library for scientific graphs (main runtime library) A free cross-platform library of fast C++ routines for plotting data in up @@ -88,7 +87,7 @@ Description: library for scientific graphs (mpi enhanced runtime library) MathGL can also be used in the console. There are interfaces to a set of languages, such as, C, Fortran, Pascal, Forth, Python, Octave. . - This package contains the, parallel interface enhanced, shared object + This package contains the, parallel interface enhanced, shared object files. Package: libmgl-wnd7.5.0 @@ -108,7 +107,7 @@ Description: library for scientific graphs (windows runtime library) . This package contains the window opening related shared object files based on Fltk, Qt and Wx. - + Package: libmgl-glut7.5.0 Architecture: any Section: libs @@ -124,7 +123,7 @@ Description: library for scientific graphs (glut interface for windows) MathGL can also be used in the console. There are interfaces to a set of languages, such as, C, Fortran, Pascal, Forth, Python, Octave. . - This package contains the glut interface shared object files for window + This package contains the glut interface shared object files for window opening. Package: libmgl-qt5-7.5.0 @@ -140,14 +139,14 @@ Description: library for scientific graphs (Qt interface for windows) MathGL can also be used in the console. There are interfaces to a set of languages, such as, C, Fortran, Pascal, Forth, Python, Octave. . - This package contains the Qt interface shared object files for window + This package contains the Qt interface shared object files for window opening. Package: libmgl-fltk7.5.0 Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl-fltk5, libmgl-fltk7.1.0, libmgl-fltk7.2.0, libmgl-fltk7.4.0 +Replaces: libmgl-fltk5, libmgl-fltk7.1.0, libmgl-fltk7.2.0, libmgl-fltk7.4.0 Conflicts: libmgl-fltk5, libmgl-fltk7.1.0, libmgl-fltk7.2.0, libmgl-fltk7.4.0 Description: library for scientific graphs (fltk interface for windows) A free cross-platform library of fast C++ routines for plotting data in up @@ -156,7 +155,7 @@ Description: library for scientific graphs (fltk interface for windows) MathGL can also be used in the console. There are interfaces to a set of languages, such as, C, Fortran, Pascal, Forth, Python, Octave. . - This package contains the fltk interface shared object files for window + This package contains the fltk interface shared object files for window opening. Package: libmgl-wx7.5.0 @@ -172,7 +171,7 @@ Description: library for scientific graphs (wx interface for windows) MathGL can also be used in the console. There are interfaces to a set of languages, such as, C, Fortran, Pascal, Forth, Python, Octave. . - This package contains the wx interface shared object files for window + This package contains the wx interface shared object files for window opening. # Package: mgl-lua @@ -207,7 +206,7 @@ Section: libdevel Depends: libmgl7.5.0 (= ${binary:Version}), libmgl-wnd7.5.0 (= ${binary:Version}), libmgl-wx7.5.0 (= ${binary:Version}), libmgl-fltk7.5.0 (= ${binary:Version}), libmgl-qt5-7.5.0 (= ${binary:Version}), libmgl-glut7.5.0 (= ${binary:Version}), - libmgl-mpi7.5.0 (= ${binary:Version}), ${misc:Depends}, libgsl-dev, + libmgl-mpi7.5.0 (= ${binary:Version}), ${misc:Depends}, libgsl-dev, libgl1-mesa-dev | libgl-dev, libpng-dev Description: library for scientific graphs (development files) A free cross-platform library of fast C++ routines for plotting data in up @@ -216,12 +215,13 @@ Description: library for scientific graphs (development files) MathGL can also be used in the console. There are interfaces to a set of languages, such as, C, Fortran, Pascal, Forth, Python, Octave. . - This package contains the development files. + This package contains the development files. Package: python-mathgl Architecture: any Section: python -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python, + python-numpy Description: library for scientific graphs (Python module) A free cross-platform library of fast C++ routines for plotting data in up to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF diff --git a/debian/control.orig b/debian/control.orig deleted file mode 100644 index 492364b..0000000 --- a/debian/control.orig +++ /dev/null @@ -1,250 +0,0 @@ -Source: mathgl -Section: science -Priority: optional -Maintainer: Debian Science Maintainers -Uploaders: Dimitrios Eftaxiopoulos , - Alastair McKinstry -Build-Depends: debhelper (>= 9), libltdl-dev, libgsl-dev, freeglut3-dev, - libgl1-mesa-dev | libgl-dev, libpng-dev, libhdf5-dev, libqt5opengl5-dev, - libjpeg-dev, libtiff-dev, libfltk1.3-dev, libqt5webkit5-dev, libwxgtk3.0-dev, - texinfo, texlive, texlive-generic-recommended, liblua5.1-dev, libxcursor-dev, - libgif-dev, python-dev, python-numpy, libfontconfig1-dev, - libhdf4-dev, chrpath, libxinerama-dev, libxmu-dev, libxi-dev, libhpdf-dev, - mpi-default-dev, swig3.0, cmake, libxft-dev, liboctave-dev, fluid -Standards-Version: 4.0.0 -Homepage: http://mathgl.sourceforge.net/doc_en/Main.html -Vcs-Git: https://anonscm.debian.org/debian-science/packages/mathgl.git -Vcs-Browser: https://anonscm.debian.org/gitweb/?p=debian-science/packages/mathgl.git - -Package: mathgl -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl7.5.0 (= ${binary:Version}) -Description: library for scientific graphs (utilities and examples) - A free cross-platform library of fast C++ routines for plotting data in up - to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF - files. There are simple window interfaces based on GLUT, FLTK and/or Qt. - MathGL can also be used in the console. There are interfaces to a set of - languages, such as, C, Fortran, Pascal, Forth, Python, Octave. - . - This package contains MathGL utilities and examples. - -Package: udav -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl7.5.0 (= ${binary:Version}) -Description: library for scientific graphs (window interface) - A free cross-platform library of fast C++ routines for plotting data in up - to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF - files. There are simple window interfaces based on GLUT, FLTK and/or Qt. - MathGL can also be used in the console. There are interfaces to a set of - languages, such as, C, Fortran, Pascal, Forth, Python, Octave. - . - This package contains the udav window environment based on mathgl. - -# Package: mathgl-doc-en -# Architecture: all -# Section: doc -# Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends} -# Replaces: mathgl-doc, mathgl-doc-ru -# Conflicts: mathgl-doc, mathgl-doc-ru -# Description: library for scientific graphs (English documentation) -# A free cross-platform library of fast C++ routines for plotting data in up -# to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF -# files. There are simple window interfaces based on GLUT, FLTK and/or Qt. -# MathGL can also be used in the console. There are interfaces to a set of -# languages, such as, C, Fortran, Pascal, Forth, Python, Octave. -# . -# This package contains the MathGL documentation in English. - -Package: libmgl7.5.0 -Architecture: any -Multi-Arch: foreign -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl5, libmgl6, libmgl6.0.0, libmgl7.1.0, libmgl7.2.0, - libmgl7.4.0 -Conflicts: libmgl5, libmgl6, libmgl6.0.0, libmgl7.1.0, libmgl7.2.0, - libmgl7.4.0 -Description: library for scientific graphs (main runtime library) - A free cross-platform library of fast C++ routines for plotting data in up - to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF - files. There are simple window interfaces based on GLUT, FLTK and/or Qt. - MathGL can also be used in the console. There are interfaces to a set of - languages, such as, C, Fortran, Pascal, Forth, Python, Octave. - . - This package contains the shared object files. - -<<<<<<< HEAD -# Package: libmgl-mpi7.4.1 -# Architecture: any -# Section: libs -# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -# Replaces: libmgl-mpi7.0.0, libmgl-mpi7.1.0, libmgl-mpi7.2.0, libmgl-mpi7.4.0 -# Conflicts: libmgl-mpi7.0.0, libmgl-mpi7.1.0, libmgl-mpi7.2.0, libmgl-mpi7.4.0 -# Description: library for scientific graphs (mpi enhanced runtime library) -# A free cross-platform library of fast C++ routines for plotting data in up -# to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF -# files. There are simple window interfaces based on GLUT, FLTK and/or Qt. -# MathGL can also be used in the console. There are interfaces to a set of -# languages, such as, C, Fortran, Pascal, Forth, Python, Octave. -# . -# This package contains the, parallel interface enhanced, shared object -# files. -======= -Package: libmgl-mpi7.5.0 -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl-mpi7.0.0, libmgl-mpi7.1.0, libmgl-mpi7.2.0, libmgl-mpi7.4.0 -Conflicts: libmgl-mpi7.0.0, libmgl-mpi7.1.0, libmgl-mpi7.2.0, libmgl-mpi7.4.0 -Description: library for scientific graphs (mpi enhanced runtime library) - A free cross-platform library of fast C++ routines for plotting data in up - to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF - files. There are simple window interfaces based on GLUT, FLTK and/or Qt. - MathGL can also be used in the console. There are interfaces to a set of - languages, such as, C, Fortran, Pascal, Forth, Python, Octave. - . - This package contains the, parallel interface enhanced, shared object - files. ->>>>>>> 92ae9b8fae4c900177b8b7d36736919646f2b965 - -Package: libmgl-wnd7.5.0 -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5, libmgl-wnd6.0.0, - libmgl-wnd7.1.0, libmgl-wnd7.2.0, libmgl-wnd7.4.0 -Conflicts: libmgl-fltk5, libmgl-wnd6, libmgl-qt5, libmgl-wx5, libmgl-wnd6.0.0, - libmgl-wnd7.1.0, libmgl-wnd7.2.0, libmgl-wnd7.4.0 -Description: library for scientific graphs (windows runtime library) - A free cross-platform library of fast C++ routines for plotting data in up - to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF - files. There are simple window interfaces based on GLUT, FLTK and/or Qt. - MathGL can also be used in the console. There are interfaces to a set of - languages, such as, C, Fortran, Pascal, Forth, Python, Octave. - . - This package contains the window opening related shared object files based - on Fltk, Qt and Wx. - -Package: libmgl-glut7.5.0 -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl-glut5, libmgl-glut6.0.0, libmgl-glut7.1.0, libmgl-glut7.2.0, - libmgl-glut7.4.0 -Conflicts: libmgl-glut5, libmgl-glut6.0.0, libmgl-glut7.1.0, libmgl-glut7.2.0, - libmgl-glut7.4.0 -Description: library for scientific graphs (glut interface for windows) - A free cross-platform library of fast C++ routines for plotting data in up - to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF - files. There are simple window interfaces based on GLUT, FLTK and/or Qt. - MathGL can also be used in the console. There are interfaces to a set of - languages, such as, C, Fortran, Pascal, Forth, Python, Octave. - . - This package contains the glut interface shared object files for window - opening. - -Package: libmgl-qt5-7.5.0 -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl-qt5, libmgl-qt7.1.0, libmgl-qt7.2.0, libmgl-qt7.4.0 -Conflicts: libmgl-qt5, libmgl-qt7.1.0, libmgl-qt7.2.0, libmgl-qt7.4.0 -Description: library for scientific graphs (Qt interface for windows) - A free cross-platform library of fast C++ routines for plotting data in up - to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF - files. There are simple window interfaces based on GLUT, FLTK and/or Qt. - MathGL can also be used in the console. There are interfaces to a set of - languages, such as, C, Fortran, Pascal, Forth, Python, Octave. - . - This package contains the Qt interface shared object files for window - opening. - -Package: libmgl-fltk7.5.0 -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl-fltk5, libmgl-fltk7.1.0, libmgl-fltk7.2.0, libmgl-fltk7.4.0 -Conflicts: libmgl-fltk5, libmgl-fltk7.1.0, libmgl-fltk7.2.0, libmgl-fltk7.4.0 -Description: library for scientific graphs (fltk interface for windows) - A free cross-platform library of fast C++ routines for plotting data in up - to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF - files. There are simple window interfaces based on GLUT, FLTK and/or Qt. - MathGL can also be used in the console. There are interfaces to a set of - languages, such as, C, Fortran, Pascal, Forth, Python, Octave. - . - This package contains the fltk interface shared object files for window - opening. - -Package: libmgl-wx7.5.0 -Architecture: any -Section: libs -Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -Replaces: libmgl-wx5, libmgl-wx7.1.0, libmgl-wx7.2.0, libmgl-wx7.4.0 -Conflicts: libmgl-wx5, libmgl-wx7.1.0, libmgl-wx7.2.0, libmgl-wx7.4.0 -Description: library for scientific graphs (wx interface for windows) - A free cross-platform library of fast C++ routines for plotting data in up - to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF - files. There are simple window interfaces based on GLUT, FLTK and/or Qt. - MathGL can also be used in the console. There are interfaces to a set of - languages, such as, C, Fortran, Pascal, Forth, Python, Octave. - . - This package contains the wx interface shared object files for window - opening. - -# Package: mgl-lua -# Architecture: any -# Section: libs -# Depends: ${shlibs:Depends}, ${misc:Depends}, libmgl-data -# Description: library for scientific graphs (Lua interface) -# A free cross-platform library of fast C++ routines for plotting data in up -# to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF -# files. There are simple window interfaces based on GLUT, FLTK and/or Qt. -# MathGL can also be used in the console. There are interfaces to a set of -# languages, such as, C, Fortran, Pascal, Forth, Python, Octave. -# . -# This package contains the Lua interface shared object files. - -Package: libmgl-data -Architecture: all -Section: misc -Depends: ${misc:Depends} -Description: library for scientific graphs (data files) - A free cross-platform library of fast C++ routines for plotting data in up - to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF - files. There are simple window interfaces based on GLUT, FLTK and/or Qt. - MathGL can also be used in the console. There are interfaces to a set of - languages, such as, C, Fortran, Pascal, Forth, Python, Octave. - . - This package contains the MathGL data files. - -Package: libmgl-dev -Architecture: any -Section: libdevel -Depends: libmgl7.5.0 (= ${binary:Version}), libmgl-wnd7.5.0 (= ${binary:Version}), - libmgl-wx7.5.0 (= ${binary:Version}), libmgl-fltk7.5.0 (= ${binary:Version}), - libmgl-qt5-7.5.0 (= ${binary:Version}), libmgl-glut7.5.0 (= ${binary:Version}), - libmgl-mpi7.5.0 (= ${binary:Version}), ${misc:Depends}, libgsl-dev, - libgl1-mesa-dev | libgl-dev, libpng-dev -Description: library for scientific graphs (development files) - A free cross-platform library of fast C++ routines for plotting data in up - to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF - files. There are simple window interfaces based on GLUT, FLTK and/or Qt. - MathGL can also be used in the console. There are interfaces to a set of - languages, such as, C, Fortran, Pascal, Forth, Python, Octave. - . - This package contains the development files. - -Package: python-mathgl -Architecture: any -Section: python -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy -Description: library for scientific graphs (Python module) - A free cross-platform library of fast C++ routines for plotting data in up - to 3 dimensions. It can export plots to bitmaps and vector EPS, SVG, IDTF - files. There are simple window interfaces based on GLUT, FLTK and/or Qt. - MathGL can also be used in the console. There are interfaces to a set of - languages, such as, C, Fortran, Pascal, Forth, Python, Octave. - . - This package provides the Python module for mathgl. diff --git a/debian/libmgl7.5.0.install b/debian/libmgl7.5.0.install index 248a51b..ce4b0fd 100644 --- a/debian/libmgl7.5.0.install +++ b/debian/libmgl7.5.0.install @@ -1 +1 @@ -debian/tmp/usr/lib/libmgl.so.* \ No newline at end of file +debian/tmp/usr/lib/libmgl.so.* diff --git a/debian/patches/CMakeLists.patch b/debian/patches/CMakeLists.patch index ff19a4c..d8bcc63 100644 --- a/debian/patches/CMakeLists.patch +++ b/debian/patches/CMakeLists.patch @@ -1,8 +1,7 @@ -Index: mathgl-2.4/CMakeLists.txt -=================================================================== ---- mathgl-2.4.orig/CMakeLists.txt -+++ mathgl-2.4/CMakeLists.txt -@@ -145,7 +145,7 @@ if(WIN32) +Adjust enablement of several features +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -160,7 +160,7 @@ endif(WIN32) option(enable-double "Enable double precision in MathGL library" ON) @@ -11,19 +10,23 @@ Index: mathgl-2.4/CMakeLists.txt option(enable-opengl "Enable OpenGL support" ON) option(enable-all-docs "Enable all documentation building") #option(enable-doc "Enable documentation building") -@@ -153,9 +153,9 @@ option(enable-all "Enable all core featu +@@ -168,13 +168,13 @@ option(enable-all-widgets "Enable all Widgets") option(enable-all-swig "Enable all SWIG based interfaces") option(enable-rvalue "Enable move constructor support (need C++11)" OFF) -option(enable-pthread "Enable POSIX threads support" OFF) +option(enable-pthread "Enable POSIX threads support" ON) - option(enable-pthr-widget "Enable POSIX threads for widgets" ON) + if(MSVC) + option(enable-pthr-widget "Enable POSIX threads for widgets" OFF) + else(MSVC) + option(enable-pthr-widget "Enable POSIX threads for widgets" ON) + endif(MSVC) -option(enable-openmp "Enable OpenMP support" ON) +option(enable-openmp "Enable OpenMP support" OFF) if(enable-pthread AND enable-openmp) message(SEND_ERROR "You can't enable POSIX threads and OpenMP at the same time!") -@@ -163,7 +163,7 @@ endif(enable-pthread AND enable-openmp) +@@ -182,7 +182,7 @@ option(enable-lgpl "Enable only LGPL part of MathGL") option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'") @@ -32,7 +35,7 @@ Index: mathgl-2.4/CMakeLists.txt option(enable-doc-site "Enable HTML documentation for website") #CMAKE_DEPENDENT_OPTION(enable-doc-site "Enable HTML documentation for website" OFF "NOT enable-all-docs" ON) CMAKE_DEPENDENT_OPTION(enable-doc-html "Enable HTML documentation" OFF "NOT enable-all-docs" ON) -@@ -177,19 +177,19 @@ CMAKE_DEPENDENT_OPTION(enable-mgltex "En +@@ -196,19 +196,19 @@ CMAKE_DEPENDENT_OPTION(enable-zlib "Enable zlib support" ON "NOT enable-all" ON) CMAKE_DEPENDENT_OPTION(enable-png "Enable png support" ON "NOT enable-all" ON) @@ -63,7 +66,7 @@ Index: mathgl-2.4/CMakeLists.txt # msvc fwprintf print char* for the specifier of "%s" format if(MSVC AND MSVC_VERSION GREATER 1899) -@@ -226,11 +226,11 @@ if(enable-qt4 OR enable-qt5) +@@ -245,11 +245,11 @@ # endif(NOT enable-opengl) endif(enable-qt4 OR enable-qt5) diff --git a/debian/patches/CMakeLists.patch.orig b/debian/patches/CMakeLists.patch.orig deleted file mode 100644 index a60d077..0000000 --- a/debian/patches/CMakeLists.patch.orig +++ /dev/null @@ -1,112 +0,0 @@ -<<<<<<< HEAD ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -118,9 +118,9 @@ -======= -Index: mathgl-2.4/CMakeLists.txt -=================================================================== ---- mathgl-2.4.orig/CMakeLists.txt -+++ mathgl-2.4/CMakeLists.txt -@@ -145,7 +145,7 @@ if(WIN32) - endif(WIN32) - - option(enable-double "Enable double precision in MathGL library" ON) --option(enable-mpi "Enable mpi") -+option(enable-mpi "Enable mpi" ON) - option(enable-opengl "Enable OpenGL support" ON) - option(enable-all-docs "Enable all documentation building") - #option(enable-doc "Enable documentation building") -@@ -153,9 +153,9 @@ option(enable-all "Enable all core featu ->>>>>>> 92ae9b8fae4c900177b8b7d36736919646f2b965 - option(enable-all-widgets "Enable all Widgets") - option(enable-all-swig "Enable all SWIG based interfaces") - option(enable-rvalue "Enable move constructor support (need C++11)" OFF) --option(enable-pthread "Enable POSIX threads support" OFF) -+option(enable-pthread "Enable POSIX threads support" ON) - option(enable-pthr-widget "Enable POSIX threads for widgets" ON) --option(enable-openmp "Enable OpenMP support" ON) -+option(enable-openmp "Enable OpenMP support" OFF) - - if(enable-pthread AND enable-openmp) - message(SEND_ERROR "You can't enable POSIX threads and OpenMP at the same time!") -<<<<<<< HEAD -@@ -141,19 +141,19 @@ -======= -@@ -163,7 +163,7 @@ endif(enable-pthread AND enable-openmp) - - option(enable-lgpl "Enable only LGPL part of MathGL") - option(enable-mgl2 "Use names 'libmgl2-*' instead of 'libmgl-*'") --option(enable-ltdl "Enable loading modules support") -+option(enable-ltdl "Enable loading modules support" ON) - option(enable-doc-site "Enable HTML documentation for website") - #CMAKE_DEPENDENT_OPTION(enable-doc-site "Enable HTML documentation for website" OFF "NOT enable-all-docs" ON) - CMAKE_DEPENDENT_OPTION(enable-doc-html "Enable HTML documentation" OFF "NOT enable-all-docs" ON) -@@ -177,19 +177,19 @@ CMAKE_DEPENDENT_OPTION(enable-mgltex "En ->>>>>>> 92ae9b8fae4c900177b8b7d36736919646f2b965 - - CMAKE_DEPENDENT_OPTION(enable-zlib "Enable zlib support" ON "NOT enable-all" ON) - CMAKE_DEPENDENT_OPTION(enable-png "Enable png support" ON "NOT enable-all" ON) --CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" OFF "NOT enable-all" ON) --MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) --MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) --MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" OFF "NOT enable-lgpl" ON "NOT enable-all" ON) --CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" OFF "NOT enable-all" ON) --CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" OFF "NOT enable-all" ON) --CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" OFF "NOT enable-all-widgets" ON) --CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" OFF "NOT enable-all-widgets" ON) --CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" OFF "NOT enable-all-widgets" ON) -+CMAKE_DEPENDENT_OPTION(enable-jpeg "Enable jpeg support" ON "NOT enable-all" ON) -+MGL_DEPENDENT_OPTION(enable-gsl "Enable gsl support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) -+MGL_DEPENDENT_OPTION(enable-hdf4 "Enable hdf4 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) -+MGL_DEPENDENT_OPTION(enable-hdf5 "Enable hdf5 support" ON "NOT enable-lgpl" ON "NOT enable-all" ON) -+CMAKE_DEPENDENT_OPTION(enable-pdf "Enable pdf support" ON "NOT enable-all" ON) -+CMAKE_DEPENDENT_OPTION(enable-gif "Enable gif support" ON "NOT enable-all" ON) -+CMAKE_DEPENDENT_OPTION(enable-glut "Enable glut support" ON "NOT enable-all-widgets" ON) -+CMAKE_DEPENDENT_OPTION(enable-fltk "Enable fltk widget" ON "NOT enable-all-widgets" ON) -+CMAKE_DEPENDENT_OPTION(enable-wx "Enable wxWidget widget" ON "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-qt4 "Enable Qt4 widget" OFF "NOT enable-all-widgets" ON) - CMAKE_DEPENDENT_OPTION(enable-qt4asqt "Set Qt4 as default libmgl-qt" OFF "enable-qt4" OFF) --CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" OFF "NOT enable-all-widgets" ON) --CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" OFF "enable-qt5" OFF) -+CMAKE_DEPENDENT_OPTION(enable-qt5 "Enable Qt5 widget" ON "NOT enable-all-widgets" ON) -+CMAKE_DEPENDENT_OPTION(enable-qt5asqt "Set Qt5 as default libmgl-qt" ON "enable-qt5" OFF) - - # msvc fwprintf print char* for the specifier of "%s" format - if(MSVC AND MSVC_VERSION GREATER 1899) -<<<<<<< HEAD -@@ -178,9 +178,9 @@ - endif(enable-qt4 OR enable-qt5) - - CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample" ON "QT_ENABLED" OFF) --MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) -======= -@@ -226,11 +226,11 @@ if(enable-qt4 OR enable-qt5) - # endif(NOT enable-opengl) - endif(enable-qt4 OR enable-qt5) - --CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample (WebKit variant is the default)." ON "QT_ENABLED" OFF) --CMAKE_DEPENDENT_OPTION(enable-json-sample-we "Enable JSON sample (WebEngine variant)." OFF "enable-json-sample" OFF) --MGL_DEPENDENT_OPTION(enable-python "Enable python interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) -+CMAKE_DEPENDENT_OPTION(enable-json-sample "Enable JSON sample (WebKit variant is the default)." ON "QT_ENABLED" ON) -+CMAKE_DEPENDENT_OPTION(enable-json-sample-we "Enable JSON sample (WebEngine variant)." ON "enable-json-sample" ON) ->>>>>>> 92ae9b8fae4c900177b8b7d36736919646f2b965 -+MGL_DEPENDENT_OPTION(enable-python "Enable python interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) - MGL_DEPENDENT_OPTION(enable-lua "Enable Lua (v.5.1) interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) --MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" OFF "NOT enable-lgpl" ON "NOT enable-all-swig" ON) -+MGL_DEPENDENT_OPTION(enable-octave "Enable octave interface" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) - MGL_DEPENDENT_OPTION(enable-octave-install "Octave interface will install for all users" ON "NOT enable-lgpl" ON "NOT enable-all-swig" ON) - -<<<<<<< HEAD - include_directories( ${MathGL_SOURCE_DIR}/include ${MathGL_BINARY_DIR}/include) -@@ -411,7 +411,7 @@ - endif(NOT HDF5_FOUND) - endif(NOT HDF5_FOUND) - set(MGL_DEP_LIBS ${HDF5_LIBRARIES} ${HDF5_C_SHARED_LIBRARY} ${MGL_DEP_LIBS}) -- include_directories(${HDF5_INCLUDE_DIR}) -+ include_directories(${HDF5_INCLUDE_DIRS}) - else(enable-hdf5) - set(MGL_HAVE_HDF5 0) - endif(enable-hdf5) -======= - include_directories( ${MathGL2_SOURCE_DIR}/include ${MathGL2_BINARY_DIR}/include) ->>>>>>> 92ae9b8fae4c900177b8b7d36736919646f2b965 diff --git a/debian/patches/fix_hdf5.patch b/debian/patches/fix_hdf5.patch deleted file mode 100644 index ead57d6..0000000 --- a/debian/patches/fix_hdf5.patch +++ /dev/null @@ -1,7 +0,0 @@ -Description: Fix for HDF5 building on cmake > 3.6 -Author: Sebastiaan Couwenberg -Origin: , -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835680 -Forwarded: no -Last-Update: 2016-09-12 - diff --git a/debian/patches/pthread-fix.patch b/debian/patches/pthread-fix.patch deleted file mode 100644 index 8f54691..0000000 --- a/debian/patches/pthread-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: mathgl-2.4.1/src/canvas.cpp -=================================================================== ---- mathgl-2.4.1.orig/src/canvas.cpp -+++ mathgl-2.4.1/src/canvas.cpp -@@ -1219,9 +1219,9 @@ void mglCanvas::Pop() - { - B = stack.back(); - #if MGL_HAVE_PTHREAD -- pthread_mutex_lock(&m); -+ pthread_mutex_lock(&mutexStk); - stack.pop_back(); -- pthread_mutex_unlock(&m); -+ pthread_mutex_unlock(&mutexStk); - #else - #pragma omp critical(stk) - stack.pop_back(); diff --git a/debian/patches/series b/debian/patches/series index 76861c9..879efc6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ CMakeLists.patch -pthread-fix.patch diff --git a/debian/rules b/debian/rules index 0f9fa26..c1d31b7 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ export DH_VERBOSE=1 export DH_OPTIONS=-v %: - dh $@ --buildsystem=cmake --with python2 --parallel + dh $@ --buildsystem=cmake --with python2 override_dh_python2: - dh_numpy \ No newline at end of file + dh_numpy diff --git a/debian/source/local-options b/debian/source/local-options new file mode 100644 index 0000000..d4bb316 --- /dev/null +++ b/debian/source/local-options @@ -0,0 +1,2 @@ + +unapply-patches diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..2976527 --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ + +extend-diff-ignore = "(^|/)(mathgl_es\.po|mathgl_ru\.po)$" diff --git a/mathgl_es.po b/mathgl_es.po index 420ff1e..8f91ee4 100644 --- a/mathgl_es.po +++ b/mathgl_es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MathGL2 2.4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-20 11:17+0300\n" +"POT-Creation-Date: 2018-03-30 21:36+0300\n" "PO-Revision-Date: 2018-03-18 21:55-0400\n" "Last-Translator: Diego Sejas Viscarra \n" "Language-Team: \n" @@ -3372,8 +3372,9 @@ msgid "New order of dimensions" msgstr "Nuevo orden de dimensiones" #: udav/udav_wnd.cpp:282 mgllab/mgllab.cpp:293 +#, fuzzy msgid "New script" -msgstr "" +msgstr "Nuevo grafico interno" #: mgllab/table.cpp:95 msgid "New size of data on 1st dimension (x-direction)" @@ -3396,8 +3397,9 @@ msgid "Next @->" msgstr "" #: udav/dat_pnl.cpp:745 mgllab/table.cpp:804 +#, fuzzy msgid "Next slice" -msgstr "" +msgstr "Ultima seccion" #: widgets/qt.cpp:1260 udav/plot_pnl.cpp:560 msgid "Next slide" @@ -3412,8 +3414,11 @@ msgid "No action is selected. Do nothing." msgstr "" #: udav/newcmd_dlg.cpp:308 +#, fuzzy msgid "No argument is selected" msgstr "" +"\n" +"Argumento(s) incorrecto(s) en linea %ld" #: udav/dat_pnl.cpp:573 msgid "No direction/formula is entered. Do nothing." @@ -3554,16 +3559,19 @@ msgid "Open printer dialog and print graphics (Ctrl+P)" msgstr "" #: mgllab/editor.cpp:506 +#, fuzzy msgid "Open script or data file" -msgstr "" +msgstr "Ejecutar script de archivo externo" #: mgllab/help.cpp:160 +#, fuzzy msgid "Open table with selected data for editing." -msgstr "" +msgstr "Borrar datos seleccionados." #: udav/data_dlg.cpp:65 mgllab/dialogs.cpp:578 +#, fuzzy msgid "Operation" -msgstr "" +msgstr "Informacion" #: mgllab/table.cpp:231 msgid "Operation is not supported for this type of data." @@ -3583,25 +3591,29 @@ msgid "Origin" msgstr "" #: udav/newcmd_dlg.cpp:171 mgllab/dialogs.cpp:712 +#, fuzzy msgid "Other plots" -msgstr "" +msgstr "1 - otro grafico" #: mgllab/dialogs.cpp:1025 +#, fuzzy msgid "Others" -msgstr "" +msgstr "Otro" #: udav/style_dlg.cpp:161 mgllab/dialogs.cpp:372 msgid "Overline" msgstr "" #: mgllab/dialogs.cpp:112 +#, fuzzy msgid "Own brightness of the surface" -msgstr "" +msgstr "Luminosidad del i-esimo color" #. Q #: udav/style_dlg.cpp:248 mgllab/dialogs.cpp:56 +#, fuzzy msgid "P - darkpink" -msgstr "" +msgstr "E - verde pasto oscuro" #: src/prc.cpp:982 msgid "PDF support was disabled. Please, enable it and rebuild MathGL." @@ -3612,8 +3624,9 @@ msgid "PNG" msgstr "" #: mgllab/table.cpp:474 mgllab/table.cpp:486 +#, fuzzy msgid "PNG Files \t*.png" -msgstr "" +msgstr "Archivos MGL \t*.mgl" #: src/canvas_cf.cpp:502 src/canvas_cf.cpp:504 src/data_png.cpp:117 #: src/export.cpp:75 src/export.cpp:109 @@ -3633,32 +3646,38 @@ msgid "Parabolic *5" msgstr "" #: udav/dat_pnl.cpp:713 +#, fuzzy msgid "Paste data" -msgstr "" +msgstr "Modificar datos" #: udav/dat_pnl.cpp:715 +#, fuzzy msgid "Paste range of numbers from clipboard (Ctrl+Shift+P)." -msgstr "" +msgstr "Copiar rango de numeros a memoria (Ctrl+Shift+C)." #: udav/text_pnl.cpp:538 mgllab/mgllab.cpp:311 +#, fuzzy msgid "Paste text" -msgstr "" +msgstr "Ingresar texto" #: mgllab/editor.cpp:513 +#, fuzzy msgid "Paste text from clipboard" -msgstr "" +msgstr "Copiar imagen a memoria" #: udav/text_pnl.cpp:540 +#, fuzzy msgid "Paste text or data from clipboard (Ctrl+V)." -msgstr "" +msgstr "Copiar texto seleccionado o datos a memoria (Ctrl+C)." #: mgllab/mgllab.cpp:484 msgid "Path for MathGL font (without extension)" msgstr "" #: udav/prop_dlg.cpp:110 mgllab/mgllab.cpp:481 +#, fuzzy msgid "Path for help files" -msgstr "" +msgstr "Folder de archivos de ayuda" #: udav/prop_dlg.cpp:130 msgid "Path for user MathGL font files" @@ -3699,8 +3718,9 @@ msgstr "" #. o->addAction(a); #. bb = new QToolButton(this); l->addWidget(bb); bb->setDefaultAction(a); #: udav/dat_pnl.cpp:701 +#, fuzzy msgid "Plot data" -msgstr "" +msgstr "Copiar datos" #: udav/dat_pnl.cpp:703 msgid "" @@ -3709,44 +3729,51 @@ msgid "" msgstr "" #: mgllab/mgllab.cpp:340 +#, fuzzy msgid "Plot setup" -msgstr "" +msgstr "2 - configuracion" #: udav/text_pnl.cpp:571 mgllab/dialogs.cpp:312 mgllab/mgllab.cpp:324 +#, fuzzy msgid "Plot style" -msgstr "" +msgstr "Estilo de fuente" #: src/exec_prm.cpp:634 msgid "Plot surface by formula" msgstr "" #: mgllab/dialogs.cpp:386 +#, fuzzy msgid "Popular color schemes" -msgstr "" +msgstr "Ingresar esquema de colores" #: udav/hint_dlg.cpp:66 +#, fuzzy msgid "Prev" -msgstr "" +msgstr "@<- Prev" #: udav/dat_pnl.cpp:727 mgllab/table.cpp:803 +#, fuzzy msgid "Prev slice" -msgstr "" +msgstr "Primera seccion" #: widgets/qt.cpp:1269 udav/plot_pnl.cpp:575 msgid "Prev slide" msgstr "" #: udav/info_dlg.cpp:51 +#, fuzzy msgid "Preview" -msgstr "" +msgstr "Vista previa de datos" #: mgllab/mgllab.cpp:581 msgid "Previous expressions" msgstr "" #: udav/newcmd_dlg.cpp:181 mgllab/dialogs.cpp:722 +#, fuzzy msgid "Primitives" -msgstr "" +msgstr "13 - primitivas" #: widgets/qt.cpp:1163 udav/plot_pnl.cpp:365 msgid "Primitives ..." @@ -3777,8 +3804,9 @@ msgid "Print message or information about the data" msgstr "" #: mgllab/mgllab.cpp:297 +#, fuzzy msgid "Print plot" -msgstr "" +msgstr "Graficos ocultos" #: udav/udav_wnd.cpp:295 msgid "Print script" @@ -3789,8 +3817,9 @@ msgid "Print string from file" msgstr "" #: udav/text_pnl.cpp:178 +#, fuzzy msgid "Printing aborted" -msgstr "" +msgstr "Cargado abortado" #: udav/text_pnl.cpp:176 msgid "Printing completed" @@ -3801,36 +3830,42 @@ msgid "Printing..." msgstr "" #: udav/newcmd_dlg.cpp:180 mgllab/dialogs.cpp:721 +#, fuzzy msgid "Program flow" -msgstr "" +msgstr "6 - flujo de programa" #: src/exec_dat.cpp:1637 msgid "Project periodical data in [v1,v2]" msgstr "" #: udav/udav_wnd.cpp:312 mgllab/mgllab.cpp:337 mgllab/mgllab.cpp:476 +#, fuzzy msgid "Properties" -msgstr "" +msgstr "Obtener propiedades de pulso" #: udav/mem_pnl.cpp:61 +#, fuzzy msgid "Properties of selected data array" -msgstr "" +msgstr "Borrar datos seleccionados" #: mgllab/table.cpp:342 mgllab/table.cpp:793 msgid "Pulse prop." msgstr "" #: udav/calc_dlg.cpp:127 mgllab/mgllab.cpp:615 +#, fuzzy msgid "Put function" -msgstr "" +msgstr "Funcion" #: udav/dat_pnl.cpp:457 +#, fuzzy msgid "Put in variable" -msgstr "" +msgstr " - UDAV variable" #: udav/dat_pnl.cpp:548 +#, fuzzy msgid "Put into this data array" -msgstr "" +msgstr "Juntar arreglos de datos" #: udav/anim_dlg.cpp:74 mgllab/mathgl.cpp:203 msgid "Put to script" @@ -3883,8 +3918,9 @@ msgid "Rearrange data dimensions" msgstr "" #: udav/udav_wnd.cpp:301 mgllab/mgllab.cpp:298 +#, fuzzy msgid "Recent files" -msgstr "" +msgstr "Archivo/Archivos recientes" #: udav/dat_pnl.cpp:768 msgid "Recreate the data with new sizes and fill it by zeros (Ctrl+Shift+N)." @@ -3895,8 +3931,9 @@ msgid "Redo" msgstr "" #: udav/text_pnl.cpp:523 +#, fuzzy msgid "Redo editor change (Ctrl+Shift+Z)." -msgstr "" +msgstr "Histograma (Ctrl+Shift+H)" #: widgets/qt.cpp:1143 udav/plot_pnl.cpp:331 msgid "Redraw" @@ -3919,8 +3956,9 @@ msgid "Refresh the picture" msgstr "" #: mgllab/dialogs.cpp:404 +#, fuzzy msgid "Relative position of i-th color" -msgstr "" +msgstr "Luminosidad del i-esimo color" #: udav/plot_pnl.cpp:342 msgid "Reload" @@ -3943,20 +3981,24 @@ msgid "Remove jump into the data, like phase jumps" msgstr "" #: udav/find_dlg.cpp:50 mgllab/editor.cpp:561 +#, fuzzy msgid "Replace" -msgstr "" +msgstr "Buscar/Reemplazar" #: mgllab/editor.cpp:564 +#, fuzzy msgid "Replace all" -msgstr "" +msgstr "Buscar/Reemplazar" #: udav/find_dlg.cpp:39 mgllab/editor.cpp:560 +#, fuzzy msgid "Replace by:" -msgstr "" +msgstr "Buscar/Reemplazar" #: udav/text_pnl.cpp:581 +#, fuzzy msgid "Replace expression by its numerical value." -msgstr "" +msgstr "Definir parametro como valor numerico" #: mgllab/editor.cpp:630 #, c-format @@ -3997,8 +4039,9 @@ msgid "Reset settings and clear picture" msgstr "" #: udav/dat_pnl.cpp:772 mgllab/table.cpp:761 +#, fuzzy msgid "Resize" -msgstr "" +msgstr "Tamano de imagen" #: udav/dat_pnl.cpp:774 msgid "Resize (interpolate) the data to specified sizes (Ctrl+Shift+R)." @@ -4050,12 +4093,14 @@ msgid "Return from function" msgstr "" #: udav/subplot_dlg.cpp:148 +#, fuzzy msgid "Right bottom edge" -msgstr "" +msgstr "Esquina inferior izq." #: udav/subplot_dlg.cpp:156 +#, fuzzy msgid "Right top edge" -msgstr "" +msgstr "Esquina superior izq." #: mgllab/table.cpp:166 mgllab/table.cpp:784 msgid "Roll" @@ -4075,12 +4120,14 @@ msgid "Rotate by mouse" msgstr "" #: udav/plot_pnl.cpp:545 +#, fuzzy msgid "Rotate down" -msgstr "" +msgstr "Mover abajo" #: udav/plot_pnl.cpp:549 +#, fuzzy msgid "Rotate left" -msgstr "" +msgstr "Mover a la izq." #: udav/subplot_dlg.cpp:164 mgllab/dialogs.cpp:1294 msgid "Rotate on" @@ -4095,16 +4142,19 @@ msgid "Rotate plot" msgstr "" #: udav/plot_pnl.cpp:553 +#, fuzzy msgid "Rotate right" -msgstr "" +msgstr "Mover a la der." #: udav/plot_pnl.cpp:541 +#, fuzzy msgid "Rotate up" -msgstr "" +msgstr "Mover arriba" #: mgllab/dialogs.cpp:356 +#, fuzzy msgid "Rotation" -msgstr "" +msgstr "Informacion" #: widgets/qt.cpp:1267 msgid "Run slideshow (CTRl+F5)." @@ -4133,16 +4183,19 @@ msgid "SVG" msgstr "" #: udav/style_dlg.cpp:107 +#, fuzzy msgid "Saturation" -msgstr "" +msgstr "Calculos" #: udav/setup_dlg.cpp:143 mgllab/editor.cpp:282 +#, fuzzy msgid "Save" -msgstr "" +msgstr " Guardar" #: mgllab/help.cpp:250 mgllab/table.cpp:456 +#, fuzzy msgid "Save Data?" -msgstr "" +msgstr "¿Cargar datos?" #: widgets/fltk.cpp:591 mgllab/mgllab.cpp:229 msgid "Save File As?" @@ -4157,16 +4210,18 @@ msgid "Save as ..." msgstr "" #: udav/dat_pnl.cpp:688 +#, fuzzy msgid "Save data" -msgstr "" +msgstr "Modificar datos" #: src/exec_dat.cpp:1707 msgid "Save data to HDF5 file" msgstr "" #: udav/dat_pnl.cpp:690 +#, fuzzy msgid "Save data to a file (Ctrl+Shift+S)." -msgstr "" +msgstr "Crear nuevo (Ctrl+Shift+M)" #: src/exec_dat.cpp:1706 mgllab/table.cpp:844 msgid "Save data to file" @@ -4177,32 +4232,38 @@ msgid "Save file" msgstr "" #: mgllab/mgllab.cpp:488 +#, fuzzy msgid "Save file before redrawing" -msgstr "" +msgstr "Guardar automaticamente antes de graficar (F5)" #: udav/udav_wnd.cpp:201 +#, fuzzy msgid "Save script" -msgstr "" +msgstr "Descripcion" #: udav/udav_wnd.cpp:203 msgid "Save script to a file (Ctrl+S)" msgstr "" #: mgllab/editor.cpp:508 +#, fuzzy msgid "Save script to file" -msgstr "" +msgstr "Ejecutar script de archivo externo" #: mgllab/help.cpp:172 +#, fuzzy msgid "Save selected data to file." -msgstr "" +msgstr "Borrar datos seleccionados." #: mgllab/table.cpp:753 +#, fuzzy msgid "Save to file" -msgstr "" +msgstr "Cargar de archivo" #: udav/udav_wnd.cpp:672 +#, fuzzy msgid "Saving aborted" -msgstr "" +msgstr "Cargado abortado" #: udav/newcmd_dlg.cpp:179 mgllab/dialogs.cpp:720 msgid "Scale and rotate" @@ -4213,16 +4274,19 @@ msgid "Script" msgstr "" #: udav/find_dlg.cpp:43 mgllab/editor.cpp:563 +#, fuzzy msgid "Search backward" -msgstr "" +msgstr "Retroceder" #: udav/text_pnl.cpp:543 mgllab/mgllab.cpp:312 +#, fuzzy msgid "Select all" -msgstr "" +msgstr "Borrar todo" #: udav/text_pnl.cpp:585 +#, fuzzy msgid "Select and insert file name." -msgstr "" +msgstr "¿Insertar nombre de archivo?" #: udav/text_pnl.cpp:589 msgid "Select and insert folder name." @@ -4233,20 +4297,23 @@ msgid "Select data argument" msgstr "" #: mgllab/dialogs.cpp:160 +#, fuzzy msgid "Select direction" -msgstr "" +msgstr "Direccion del eje" #: mgllab/editor.cpp:653 +#, fuzzy msgid "Select file name" -msgstr "" +msgstr "Nombre de archivo de fuente" #: udav/newcmd_dlg.cpp:337 udav/newcmd_dlg.cpp:355 msgid "Select first the proper kind of arguments" msgstr "" #: mgllab/editor.cpp:666 +#, fuzzy msgid "Select folder name" -msgstr "" +msgstr "¿Insertar nombre de archivo?" #: udav/info_dlg.cpp:39 msgid "Select kind of plot" @@ -4273,8 +4340,9 @@ msgid "Set arbitrary position of plot in picture" msgstr "" #: udav/udav_wnd.cpp:315 mgllab/mgllab.cpp:338 +#, fuzzy msgid "Set arguments" -msgstr "" +msgstr "Argumentos" #: src/exec_set.cpp:782 msgid "Set aspect ration" @@ -4317,8 +4385,9 @@ msgid "Set cutting off/on for particular plot" msgstr "" #: udav/open_dlg.cpp:62 +#, fuzzy msgid "Set data sizes manually" -msgstr "" +msgstr "Modificar tamano de datos" #: src/exec_set.cpp:785 msgid "Set default bars width" @@ -4517,16 +4586,18 @@ msgid "" msgstr "" #: udav/udav_wnd.cpp:311 +#, fuzzy msgid "Settings" -msgstr "" +msgstr "Recortado" #: mgllab/mgllab.cpp:336 msgid "Setup" msgstr "" #: mgllab/mgllab.cpp:339 +#, fuzzy msgid "Setup animation" -msgstr "" +msgstr "Animacion" #: udav/prop_dlg.cpp:80 msgid "Setup colors for:" @@ -4549,16 +4620,18 @@ msgid "Setup plot points cutting" msgstr "" #: mgllab/dialogs.cpp:947 +#, fuzzy msgid "Setup script" -msgstr "" +msgstr "Descripcion" #: udav/plot_pnl.cpp:573 msgid "Setup show" msgstr "" #: udav/dat_pnl.cpp:623 +#, fuzzy msgid "Sew data along direction(s)" -msgstr "" +msgstr "Reflejar datos en una(s) direccion(es)" #: mgllab/table.cpp:166 mgllab/table.cpp:785 msgid "Sew phase" @@ -4597,8 +4670,9 @@ msgid "Short information about the data." msgstr "" #: udav/hint_dlg.cpp:62 +#, fuzzy msgid "Show at startup" -msgstr "" +msgstr "Flecha al principio" #: udav/udav_wnd.cpp:210 msgid "" @@ -4627,10 +4701,13 @@ msgid "Show dialog for new inplot and put it into the script." msgstr "" #: udav/text_pnl.cpp:577 +#, fuzzy msgid "" "Show dialog for options and put it into the script.\n" "Options are used for additional setup the plot." msgstr "" +"Aqui puede especificar opciones de cmando.\n" +"Uselas para configuracion adicional del grafico." #: udav/text_pnl.cpp:598 msgid "" @@ -4649,12 +4726,14 @@ msgid "Show dialog for text finding (Ctrl+F)." msgstr "" #: udav/udav_wnd.cpp:326 +#, fuzzy msgid "Show help on MGL commands (F1)." -msgstr "" +msgstr "Grupos de comandos de MGL" #: udav/udav_wnd.cpp:219 +#, fuzzy msgid "Show hidden plots" -msgstr "" +msgstr "Graficos ocultos" #: mgllab/help.cpp:303 msgid "Show hint on startup" @@ -4669,8 +4748,9 @@ msgid "Show info" msgstr "" #: mgllab/mgllab.cpp:314 +#, fuzzy msgid "Show lines" -msgstr "" +msgstr "Graficar recta" #: widgets/fltk.cpp:909 msgid "Show next frame in slideshow" @@ -4689,24 +4769,28 @@ msgid "Show previous slide (Ctrl+,)." msgstr "" #: mgllab/table.cpp:779 +#, fuzzy msgid "Sin FFT" -msgstr "" +msgstr "Coseno FFT" #: udav/dat_pnl.cpp:620 +#, fuzzy msgid "Sin-Fourier transform along direction(s)" -msgstr "" +msgstr "Cos-transformada de Fourier en dirreccion(es)" #: src/exec_dat.cpp:1711 msgid "Sin-Fourier transform at some direction" msgstr "" #: mgllab/table.cpp:165 +#, fuzzy msgid "Sinus FFT" -msgstr "" +msgstr "Coseno FFT" #: udav/opt_dlg.cpp:70 mgllab/dialogs.cpp:104 mgllab/dialogs.cpp:359 +#, fuzzy msgid "Size" -msgstr "" +msgstr "FontSize" #: udav/subplot_dlg.cpp:114 msgid "Size of column" @@ -4719,8 +4803,9 @@ msgstr "" #. size menu #: udav/mem_pnl.cpp:68 udav/dat_pnl.cpp:765 mgllab/dialogs.cpp:1015 #: mgllab/table.cpp:759 +#, fuzzy msgid "Sizes" -msgstr "" +msgstr "FontSize" #: src/parser.cpp:1482 msgid "Skip commands and iterate for-loop again" @@ -4739,8 +4824,9 @@ msgid "Smooth data" msgstr "" #: udav/dat_pnl.cpp:613 +#, fuzzy msgid "Smooth data along direction(s)" -msgstr "" +msgstr "Reflejar datos en una(s) direccion(es)" #: src/exec_dat.cpp:1695 msgid "Solve Hamiltonian ODE (find GO ray or trajectory)" @@ -4825,8 +4911,9 @@ msgid "Start/close commands which should executed only once" msgstr "" #: udav/subplot_dlg.cpp:76 +#, fuzzy msgid "Starting cell index" -msgstr "" +msgstr "Indice de celda" #: udav/setup_dlg.cpp:117 msgid "State" @@ -4949,20 +5036,23 @@ msgid "Subtract data or number" msgstr "" #: mgllab/table.cpp:797 +#, fuzzy msgid "Subtract to" -msgstr "" +msgstr "Extraer datos" #: udav/prop_dlg.cpp:94 msgid "Suffixes" msgstr "" #: udav/dat_pnl.cpp:539 +#, fuzzy msgid "Sum along direction(s)" -msgstr "" +msgstr "Max en direccion(es)" #: udav/dat_pnl.cpp:614 +#, fuzzy msgid "Summarize data along direction(s)" -msgstr "" +msgstr "Reflejar datos en una(s) direccion(es)" #. { _("Histogram of"), 0, hist_cb }, #: mgllab/table.cpp:342 mgllab/table.cpp:790 @@ -4974,8 +5064,9 @@ msgid "Swap data (useful after Fourier transform)" msgstr "" #: udav/dat_pnl.cpp:618 +#, fuzzy msgid "Swap data along direction(s)" -msgstr "" +msgstr "Reflejar datos en una(s) direccion(es)" #: mgllab/table.cpp:164 mgllab/table.cpp:778 msgid "Swap parts" @@ -5057,8 +5148,9 @@ msgid "Template" msgstr "" #: udav/setup_dlg.cpp:140 +#, fuzzy msgid "Template name" -msgstr "" +msgstr "Nombre de archivo" #: udav/setup_dlg.cpp:163 msgid "Template saved" @@ -5077,20 +5169,23 @@ msgid "Text align" msgstr "" #: udav/newcmd_dlg.cpp:172 mgllab/dialogs.cpp:713 +#, fuzzy msgid "Text and legend" -msgstr "" +msgstr "Graficar leyenda" #: udav/style_dlg.cpp:164 msgid "Text color" msgstr "" #: udav/style_dlg.cpp:123 mgllab/dialogs.cpp:343 +#, fuzzy msgid "Text on contours" -msgstr "" +msgstr "Curvas de nivel rellenas" #: mgllab/dialogs.cpp:367 +#, fuzzy msgid "Text style" -msgstr "" +msgstr "Estilo de fuente" #: udav/hint_dlg.cpp:48 mgllab/help.cpp:282 msgid "" @@ -5122,16 +5217,18 @@ msgid "There is changing temporary data in script" msgstr "" #: udav/text_pnl.cpp:124 +#, fuzzy msgid "There is manual primitives." -msgstr "" +msgstr "Primitivas personalizadas" #: udav/newcmd_dlg.cpp:341 msgid "There is no 'fmt' argument for this command" msgstr "" #: udav/text_pnl.cpp:137 mgllab/editor.cpp:680 +#, fuzzy msgid "There is no fitted formula." -msgstr "" +msgstr "Formula ajustada" #: utils/mglcgi.cpp:74 #, c-format @@ -5207,16 +5304,19 @@ msgid "To" msgstr "" #: udav/calc_dlg.cpp:66 udav/setup_dlg.cpp:147 +#, fuzzy msgid "To script" -msgstr "" +msgstr "Descripcion" #: udav/dat_pnl.cpp:790 +#, fuzzy msgid "Transform" -msgstr "" +msgstr "Transformar datos" #: udav/dat_pnl.cpp:792 +#, fuzzy msgid "Transform data along dimension(s) (Ctrl+Shift+T)." -msgstr "" +msgstr "Reflejar datos en una(s) direccion(es)" #: mgllab/dialogs.cpp:346 msgid "Transparency" @@ -5231,8 +5331,9 @@ msgid "Transpose" msgstr "" #: mgllab/table.cpp:671 +#, fuzzy msgid "Transpose data" -msgstr "" +msgstr "Modificar datos" #: src/exec_dat.cpp:1724 msgid "Transpose data array" @@ -5285,12 +5386,14 @@ msgid "UDAV - Clear data" msgstr "" #: udav/dat_pnl.cpp:424 +#, fuzzy msgid "UDAV - Crop data" -msgstr "" +msgstr "Cortar datos" #: udav/dat_pnl.cpp:255 +#, fuzzy msgid "UDAV - Export to PNG" -msgstr "" +msgstr "Exportar a PNG" #: udav/dat_pnl.cpp:351 msgid "UDAV - Fill data" @@ -5301,21 +5404,24 @@ msgid "UDAV - Find" msgstr "" #: udav/dat_pnl.cpp:485 +#, fuzzy msgid "UDAV - Go to slice" -msgstr "" +msgstr "Ir a seccion" #: udav/hint_dlg.cpp:55 msgid "UDAV - Hint" msgstr "" #: udav/dat_pnl.cpp:277 +#, fuzzy msgid "UDAV - Import PNG" -msgstr "" +msgstr "Importar de PNG" #: udav/prop_dlg.cpp:192 udav/prop_dlg.cpp:198 udav/newcmd_dlg.cpp:322 #: udav/text_pnl.cpp:145 udav/open_dlg.cpp:101 +#, fuzzy msgid "UDAV - Insert filename" -msgstr "" +msgstr "Insertar nombre de archivo" #: udav/newcmd_dlg.cpp:327 udav/text_pnl.cpp:152 msgid "UDAV - Insert path" @@ -5326,16 +5432,18 @@ msgid "UDAV - Insert style/scheme" msgstr "" #: udav/dat_pnl.cpp:270 +#, fuzzy msgid "UDAV - Load data" -msgstr "" +msgstr "Cargar datos" #: udav/dat_pnl.cpp:450 msgid "UDAV - Make histogram" msgstr "" #: udav/mem_pnl.cpp:84 +#, fuzzy msgid "UDAV - New variable" -msgstr "" +msgstr " - UDAV variable" #: udav/dat_pnl.cpp:377 msgid "UDAV - Normalize by slice" @@ -5394,33 +5502,39 @@ msgid "UDAV - Setup inplot" msgstr "" #: udav/setup_dlg.cpp:39 udav/setup_dlg.cpp:190 +#, fuzzy msgid "UDAV - Setup plot" -msgstr "" +msgstr "11 - grafico vectorial" #: udav/dat_pnl.cpp:413 msgid "UDAV - Squeeze data" msgstr "" #: udav/udav_wnd.cpp:456 +#, fuzzy msgid "UDAV - about" -msgstr "" +msgstr "MathGL - acerca de" #: udav/anim_dlg.cpp:105 +#, fuzzy msgid "UDAV - animation" -msgstr "" +msgstr "Animacion" #: udav/dat_pnl.cpp:608 +#, fuzzy msgid "UDAV - change data" -msgstr "" +msgstr "Modificar datos" #: udav/opt_dlg.cpp:94 udav/opt_dlg.cpp:101 udav/opt_dlg.cpp:108 #: udav/opt_dlg.cpp:115 +#, fuzzy msgid "UDAV - command options" -msgstr "" +msgstr "Anadir opcion(es) de comando" #: udav/mem_pnl.cpp:121 +#, fuzzy msgid "UDAV - delete all data" -msgstr "" +msgstr "Desea borrar todos los datos?" #: udav/text_pnl.cpp:202 msgid "UDAV - find text" @@ -5428,8 +5542,9 @@ msgstr "" #: udav/dat_pnl.cpp:536 udav/dat_pnl.cpp:566 udav/dat_pnl.cpp:572 #: udav/dat_pnl.cpp:643 +#, fuzzy msgid "UDAV - make new data" -msgstr "" +msgstr "Crear nuevos datos" #: udav/text_pnl.cpp:431 msgid "UDAV - open file" @@ -5469,12 +5584,14 @@ msgid "Update" msgstr "" #: udav/mem_pnl.cpp:62 +#, fuzzy msgid "Update list of data arrays" -msgstr "" +msgstr "Borrar TODOS los datos" #: mgllab/dialogs.cpp:100 +#, fuzzy msgid "Upper border for determining color or alpha" -msgstr "" +msgstr "Borde inferior para determinar color o alfa" #: utils/mglconv.cpp:83 #, c-format @@ -5510,8 +5627,9 @@ msgid "" msgstr "" #: udav/style_dlg.cpp:162 +#, fuzzy msgid "Use color scheme" -msgstr "" +msgstr "Ingresar esquema de colores" #: udav/prop_dlg.cpp:175 msgid "Use dots plot for preview" @@ -5526,14 +5644,16 @@ msgid "Value" msgstr "" #: mgllab/dialogs.cpp:398 +#, fuzzy msgid "Value for i-th color" -msgstr "" +msgstr "Luminosidad del i-esimo color" #: mgllab/dialogs.cpp:727 mgllab/dialogs.cpp:1047 msgid "Variant" msgstr "" #: mgllab/dialogs.cpp:728 +#, fuzzy msgid "" "Variant of command argument order. The notation is:\n" " * Capital arguments are data (like, Ydat);\n" @@ -5541,18 +5661,25 @@ msgid "" " * Other arguments are numbers (like, zval);\n" " * Arguments in [] are optional arguments." msgstr "" +"Tipo de argumentos de comando. La notacion es:\n" +" * mayusculas denotan datos (ej.: Ydat);\n" +" * argumentos en '' son texto (ej.: 'fmt');\n" +" * otros argumentos son numeros (ej.: zval);\n" +" * argumento en [] son opcionales." #: udav/newcmd_dlg.cpp:170 mgllab/dialogs.cpp:711 +#, fuzzy msgid "Vector plots" -msgstr "" +msgstr "11 - grafico vectorial" #: mgllab/dialogs.cpp:379 msgid "Vertical align" msgstr "" #: udav/subplot_dlg.cpp:55 udav/subplot_dlg.cpp:72 udav/subplot_dlg.cpp:97 +#, fuzzy msgid "Vertical size" -msgstr "" +msgstr "Tamano horizontal" #. k #: udav/style_dlg.cpp:236 mgllab/dialogs.cpp:44 @@ -5572,12 +5699,14 @@ msgid "Widget scheme" msgstr "" #: mgllab/dialogs.cpp:329 +#, fuzzy msgid "Width" -msgstr "" +msgstr "BaseWidth" #: udav/subplot_dlg.cpp:80 +#, fuzzy msgid "Width of selected cells" -msgstr "" +msgstr "Altura de celdas seleccionadas" #: src/data.cpp:1427 #, c-format @@ -5595,16 +5724,18 @@ msgid "Wire or mesh plot" msgstr "" #: udav/style_dlg.cpp:159 mgllab/dialogs.cpp:370 +#, fuzzy msgid "Wire style" -msgstr "" +msgstr "Estilo de linea" #: src/exec_set.cpp:839 msgid "Write current image to graphical file" msgstr "" #: udav/setup_dlg.cpp:48 mgllab/dialogs.cpp:950 +#, fuzzy msgid "X axis" -msgstr "" +msgstr "Eje c" #: udav/setup_dlg.cpp:118 msgid "X pos" @@ -5615,12 +5746,14 @@ msgid "X position" msgstr "" #: udav/dat_pnl.cpp:413 +#, fuzzy msgid "X-direction" -msgstr "" +msgstr "Direccion" #: udav/opt_dlg.cpp:38 mgllab/dialogs.cpp:85 +#, fuzzy msgid "X-range" -msgstr "" +msgstr "Rango c" #: udav/dat_pnl.cpp:388 udav/dat_pnl.cpp:402 udav/dat_pnl.cpp:436 msgid "X-size" @@ -5644,8 +5777,9 @@ msgid "Y - olive" msgstr "" #: udav/setup_dlg.cpp:49 mgllab/dialogs.cpp:963 +#, fuzzy msgid "Y axis" -msgstr "" +msgstr "Eje c" #: udav/setup_dlg.cpp:119 msgid "Y pos" @@ -5656,12 +5790,14 @@ msgid "Y position" msgstr "" #: udav/dat_pnl.cpp:413 +#, fuzzy msgid "Y-direction" -msgstr "" +msgstr "Direccion" #: udav/opt_dlg.cpp:41 mgllab/dialogs.cpp:89 +#, fuzzy msgid "Y-range" -msgstr "" +msgstr "Rango c" #: udav/dat_pnl.cpp:388 udav/dat_pnl.cpp:402 udav/dat_pnl.cpp:436 msgid "Y-size" @@ -5676,8 +5812,9 @@ msgid "Y/Z" msgstr "" #: mgllab/help.cpp:135 +#, fuzzy msgid "Yes" -msgstr "" +msgstr " Si " #: udav/hint_dlg.cpp:36 mgllab/help.cpp:270 msgid "" @@ -5785,8 +5922,9 @@ msgid "You need to restart UDAV for applying the changes." msgstr "" #: mgllab/dialogs.cpp:592 +#, fuzzy msgid "You need to select data array" -msgstr "" +msgstr "Borrar datos seleccionados" #: mgllab/dialogs.cpp:1489 msgid "You need to select marker!" @@ -5813,8 +5951,9 @@ msgid "You should specify required argument " msgstr "" #: udav/setup_dlg.cpp:50 mgllab/dialogs.cpp:976 +#, fuzzy msgid "Z axis" -msgstr "" +msgstr "Eje c" #: udav/setup_dlg.cpp:120 msgid "Z pos" @@ -5825,12 +5964,14 @@ msgid "Z position" msgstr "" #: udav/dat_pnl.cpp:413 +#, fuzzy msgid "Z-direction" -msgstr "" +msgstr "Direccion" #: udav/opt_dlg.cpp:44 mgllab/dialogs.cpp:93 +#, fuzzy msgid "Z-range" -msgstr "" +msgstr "Rango c" #: udav/dat_pnl.cpp:388 udav/dat_pnl.cpp:402 udav/dat_pnl.cpp:436 msgid "Z-size" @@ -5882,8 +6023,9 @@ msgid "Zoom out graphics." msgstr "" #: udav/help_pnl.cpp:56 +#, fuzzy msgid "Zoom out text" -msgstr "" +msgstr "Cortar texto" #: widgets/fltk.cpp:897 msgid "Zoom out the picture" @@ -5923,32 +6065,38 @@ msgid "along z" msgstr "" #: mgllab/dialogs.cpp:1012 +#, fuzzy msgid "alpha" -msgstr "" +msgstr "Alfa" #: mgllab/dialogs.cpp:1296 +#, fuzzy msgid "and" -msgstr "" +msgstr "Fin" #: mgllab/dialogs.cpp:1456 +#, fuzzy msgid "arc" -msgstr "" +msgstr "Anadir arco" #: mgllab/dialogs.cpp:1018 +#, fuzzy msgid "arrows" -msgstr "" +msgstr "'A' flecha" #: udav/setup_dlg.cpp:72 udav/style_dlg.cpp:170 msgid "at center" msgstr "" #: udav/setup_dlg.cpp:72 +#, fuzzy msgid "at maximum" -msgstr "" +msgstr "Maximo de" #: udav/setup_dlg.cpp:72 +#, fuzzy msgid "at minimum" -msgstr "" +msgstr "Minimo de" #: udav/setup_dlg.cpp:70 mgllab/dialogs.cpp:956 msgid "at position" @@ -5965,8 +6113,9 @@ msgstr "" #. w #: udav/style_dlg.cpp:222 mgllab/dialogs.cpp:29 +#, fuzzy msgid "b - blue" -msgstr "" +msgstr "N - azul cielo oscuro" #: mgllab/dialogs.cpp:1019 msgid "bars" @@ -6005,12 +6154,14 @@ msgid "couldn't open file" msgstr "" #: mgllab/dialogs.cpp:1455 +#, fuzzy msgid "curve" -msgstr "" +msgstr "Anadir curva" #: mgllab/dialogs.cpp:1026 +#, fuzzy msgid "cutting" -msgstr "" +msgstr "Recortado" #. ----------------------------------------------------------------------------- #: src/base.cpp:225 @@ -6034,25 +6185,29 @@ msgid "default" msgstr "" #: mgllab/help.cpp:149 +#, fuzzy msgid "dimensions" -msgstr "" +msgstr "Nuevo orden de dimensiones" #. l #: udav/style_dlg.cpp:229 mgllab/dialogs.cpp:36 +#, fuzzy msgid "e - lawngreen" -msgstr "" +msgstr "G - verde" #: mgllab/dialogs.cpp:1455 +#, fuzzy msgid "ellipse" -msgstr "" +msgstr "Anadir elipse" #: mgllab/dialogs.cpp:1017 msgid "facenum" msgstr "" #: mgllab/dialogs.cpp:1035 +#, fuzzy msgid "factor" -msgstr "" +msgstr "Factor" #. mglWarnSize #: src/base.cpp:237 @@ -6082,8 +6237,9 @@ msgstr "" #. p #: udav/style_dlg.cpp:234 mgllab/dialogs.cpp:41 +#, fuzzy msgid "h - gray" -msgstr "" +msgstr "H - gris oscuro" #: src/parser.cpp:1067 #, c-format @@ -6096,8 +6252,9 @@ msgstr "" #: mgllab/dialogs.cpp:1236 mgllab/dialogs.cpp:1249 mgllab/dialogs.cpp:1262 #: mgllab/dialogs.cpp:1271 mgllab/dialogs.cpp:1280 +#, fuzzy msgid "ind" -msgstr "" +msgstr "Buscar" #. h #: udav/style_dlg.cpp:235 mgllab/dialogs.cpp:43 @@ -6106,8 +6263,9 @@ msgstr "" #. y #: udav/style_dlg.cpp:228 mgllab/dialogs.cpp:35 +#, fuzzy msgid "l - springgreen" -msgstr "" +msgstr "L - verde marino" #: mgllab/dialogs.cpp:1045 msgid "lamp-like" @@ -6117,8 +6275,9 @@ msgstr "" #: udav/style_dlg.cpp:169 udav/subplot_dlg.cpp:187 mgllab/dialogs.cpp:957 #: mgllab/dialogs.cpp:970 mgllab/dialogs.cpp:983 mgllab/dialogs.cpp:996 #: mgllab/dialogs.cpp:1304 +#, fuzzy msgid "left" -msgstr "" +msgstr "Mover a la izq." #. mglWarnOpen #: src/base.cpp:235 @@ -6126,12 +6285,14 @@ msgid "light: ID is out of range" msgstr "" #: mgllab/dialogs.cpp:1013 +#, fuzzy msgid "lighting" -msgstr "" +msgstr "Config. de luz" #: mgllab/dialogs.cpp:1454 +#, fuzzy msgid "line" -msgstr "" +msgstr "Anadir linea" #. c #: udav/style_dlg.cpp:226 mgllab/dialogs.cpp:33 @@ -6199,8 +6360,9 @@ msgid "" msgstr "" #: udav/data_dlg.cpp:68 +#, fuzzy msgid "min" -msgstr "" +msgstr "Ambiente" #. mglWarnLow #: src/base.cpp:227 @@ -6209,12 +6371,14 @@ msgstr "" #. e #: udav/style_dlg.cpp:230 mgllab/dialogs.cpp:37 +#, fuzzy msgid "n - skyblue" -msgstr "" +msgstr "N - azul cielo oscuro" #: mgllab/help.cpp:147 +#, fuzzy msgid "name" -msgstr "" +msgstr "Nombre de datos" #. mglWarnNeg #: src/base.cpp:228 @@ -6236,8 +6400,9 @@ msgstr "" #: udav/style_dlg.cpp:339 udav/style_dlg.cpp:383 udav/data_dlg.cpp:67 #: mgllab/dialogs.cpp:214 mgllab/dialogs.cpp:230 mgllab/dialogs.cpp:1035 #: mgllab/dialogs.cpp:1039 +#, fuzzy msgid "none" -msgstr "" +msgstr "' ' ninguno" #: udav/style_dlg.cpp:220 msgid "none or default" @@ -6267,12 +6432,14 @@ msgid "off" msgstr "" #: udav/opt_dlg.cpp:63 udav/opt_dlg.cpp:66 udav/setup_dlg.cpp:128 +#, fuzzy msgid "on" -msgstr "" +msgstr "Fuente" #: udav/dat_pnl.cpp:549 +#, fuzzy msgid "or enter name for new variable" -msgstr "" +msgstr "Ingresar nombre para nueva variable" #. q #: udav/style_dlg.cpp:233 mgllab/dialogs.cpp:40 @@ -6293,17 +6460,20 @@ msgid "pointer is NULL" msgstr "" #: mgllab/dialogs.cpp:1456 +#, fuzzy msgid "polygon" -msgstr "" +msgstr "Anadir poligono" #: mgllab/dialogs.cpp:1040 +#, fuzzy msgid "projection" -msgstr "" +msgstr "Direccion" #. u #: udav/style_dlg.cpp:232 mgllab/dialogs.cpp:39 +#, fuzzy msgid "q - orange" -msgstr "" +msgstr "Rango c" #: mgllab/dialogs.cpp:1040 msgid "quaternary" @@ -6319,22 +6489,26 @@ msgid "r - red" msgstr "" #: mgllab/dialogs.cpp:1454 +#, fuzzy msgid "rectangle" -msgstr "" +msgstr "Graficar rectangulo" #: mgllab/dialogs.cpp:1455 +#, fuzzy msgid "rhomb" -msgstr "" +msgstr "'D' rombo" #: udav/style_dlg.cpp:172 udav/subplot_dlg.cpp:193 mgllab/dialogs.cpp:958 #: mgllab/dialogs.cpp:971 mgllab/dialogs.cpp:984 mgllab/dialogs.cpp:997 #: mgllab/dialogs.cpp:1310 +#, fuzzy msgid "right" -msgstr "" +msgstr "Luz" #: mgllab/dialogs.cpp:1029 +#, fuzzy msgid "rotate text" -msgstr "" +msgstr "Ingresar texto" #: mgllab/mathgl.cpp:199 msgid "save slides" @@ -6355,8 +6529,9 @@ msgid "smoothed" msgstr "" #: mgllab/dialogs.cpp:326 +#, fuzzy msgid "solid" -msgstr "" +msgstr "'-' solido" #: widgets/qt.cpp:1082 udav/plot_pnl.cpp:476 msgid "solid PNG" @@ -6367,8 +6542,9 @@ msgid "strings" msgstr "" #: udav/data_dlg.cpp:67 +#, fuzzy msgid "sum" -msgstr "" +msgstr "MeshNum" #: mgllab/dialogs.cpp:1039 msgid "ternary" @@ -6379,8 +6555,9 @@ msgid "ternary proj" msgstr "" #: mgllab/dialogs.cpp:1021 mgllab/dialogs.cpp:1456 +#, fuzzy msgid "text" -msgstr "" +msgstr "Anadir texto" #: mgllab/dialogs.cpp:1022 msgid "ticks" @@ -6392,8 +6569,9 @@ msgid "to" msgstr "" #: mgllab/mgllab.cpp:579 +#, fuzzy msgid "to script" -msgstr "" +msgstr "Descripcion" #: udav/subplot_dlg.cpp:191 mgllab/dialogs.cpp:1308 msgid "top" diff --git a/mathgl_ru.po b/mathgl_ru.po index 105d0b6..7589334 100644 --- a/mathgl_ru.po +++ b/mathgl_ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: MathGL2 2.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-20 11:17+0300\n" +"POT-Creation-Date: 2018-03-30 21:36+0300\n" "PO-Revision-Date: 2017-04-19 01:17+0300\n" "Last-Translator: Alexey Balakin \n" "Language-Team: Russian\n" -- 2.30.2