[Pkg-octave-commit] [matlab2tikz] 02/03: Refresh patches.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository matlab2tikz.

commit 804758dd8b2eda0ed9e4aa175587240ef13e2c9d
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Jan 15 21:11:58 2014 +0100

    Refresh patches.
    
    Git-Dch: Ignore
---
 debian/patches/disable-updater.patch    | 26 +++++++++++++-------------
 debian/patches/remove_cleanfigure.patch |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/patches/disable-updater.patch b/debian/patches/disable-updater.patch
index 49603c6..2e74081 100644
--- a/debian/patches/disable-updater.patch
+++ b/debian/patches/disable-updater.patch
@@ -7,7 +7,7 @@ Last-Update: 2013-03-25
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/src/matlab2tikz.m
 +++ b/src/matlab2tikz.m
-@@ -90,7 +90,7 @@
+@@ -90,7 +90,7 @@ function matlab2tikz(varargin)
  %
  %   MATLAB2TIKZ('checkForUpdates',BOOL,...) determines whether to automatically
  %   check for updates of matlab2tikz.
@@ -16,25 +16,25 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  %
  %   Example
  %      x = -pi:pi/10:pi;
-@@ -296,7 +296,7 @@
-   m2t.cmdOpts = m2t.cmdOpts.addParamValue(m2t.cmdOpts, 'standalone', false, @islogical);
+@@ -193,7 +193,7 @@ function matlab2tikz(varargin)
+   ipp = ipp.addParamValue(ipp, 'strict', false, @islogical);
+   ipp = ipp.addParamValue(ipp, 'showInfo', true, @islogical);
+   ipp = ipp.addParamValue(ipp, 'showWarnings', true, @islogical);
+-  ipp = ipp.addParamValue(ipp, 'checkForUpdates', true, @islogical);
++  ipp = ipp.addParamValue(ipp, 'checkForUpdates', false, @islogical);
  
-   % Automatic updater.
--  m2t.cmdOpts = m2t.cmdOpts.addParamValue(m2t.cmdOpts, 'checkForUpdates', true, @islogical);
-+  m2t.cmdOpts = m2t.cmdOpts.addParamValue(m2t.cmdOpts, 'checkForUpdates', false, @islogical);
+   ipp = ipp.addParamValue(ipp, 'encoding' , '', @ischar);
+   ipp = ipp.addParamValue(ipp, 'standalone', false, @islogical);
+@@ -339,11 +339,7 @@ function matlab2tikz(varargin)
  
-   % Finally parse all the elements.
-   m2t.cmdOpts = m2t.cmdOpts.parse(m2t.cmdOpts, varargin{:});
-@@ -391,11 +391,7 @@
- 
-   % Conditionally check for a new matlab2tikz version.
-   if m2t.cmdOpts.Results.checkForUpdates
+   % Conditionally check for a new matlab2tikz version outside version control
+   if m2t.cmdOpts.Results.checkForUpdates && isempty(VCID)
 -      updater(m2t.name, ...
 -              m2t.website, ...
 -              m2t.version, ...
 -              m2t.cmdOpts.Results.showInfo, ...
 -              m2t.env)
-+     warning('Auto-updater not available. Please use the package manager instead.')
++      warning('Auto-updater not available. Please use the package manager instead.')
    end
  
    % print some version info to the screen
diff --git a/debian/patches/remove_cleanfigure.patch b/debian/patches/remove_cleanfigure.patch
index 7c92f00..baabaa3 100644
--- a/debian/patches/remove_cleanfigure.patch
+++ b/debian/patches/remove_cleanfigure.patch
@@ -8,7 +8,7 @@ Last-Update: 2013-06-28
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/test/matlab2tikz_acidtest.m
 +++ b/test/matlab2tikz_acidtest.m
-@@ -198,7 +198,6 @@
+@@ -188,7 +188,6 @@ function matlab2tikz_acidtest( varargin
        end
        % now, test matlab2tikz
        try

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/matlab2tikz.git