[Pkg-octave-commit] [octave-ltfat] 03/03: d/p/add-subdirs-to-loadpath.patch: Drop patch (fixed upstream)

[Rafael Laboissière]

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

rlaboiss-guest pushed a commit to branch master
in repository octave-ltfat.

commit aaffb428b29f272d3aab39705c59eb87ecaa076c
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Tue Oct 7 19:48:38 2014 -0300

    d/p/add-subdirs-to-loadpath.patch: Drop patch (fixed upstream)
---
 debian/patches/add-subdirs-to-loadpath.patch | 104 ---------------------------
 debian/patches/series                        |   1 -
 2 files changed, 105 deletions(-)

diff --git a/debian/patches/add-subdirs-to-loadpath.patch b/debian/patches/add-subdirs-to-loadpath.patch
deleted file mode 100644
index a4e9a4b..0000000
--- a/debian/patches/add-subdirs-to-loadpath.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Description: Add/delete subdirs to/from the loadpath at pkg install/uninstall
-Author: Rafael Laboissiere <rafael at laboissiere.net>
-Forwarded: https://savannah.gnu.org/bugs/index.php?42302
-Last-Update: <2014-05-04>
-
---- octave-ltfat-1.4.4.orig/PKG_ADD
-+++ octave-ltfat-1.4.4/PKG_ADD
-@@ -4,3 +4,51 @@ if exist("ltfatstart","file")
-   # Start ltfat quietly 
-   ltfatstart(0);
- end;
-+
-+## Add subdirectories to the Octave path
-+## (This code was taken from the Octave Forge package geometry.)
-+
-+dirlist = {"auditory", "blockproc", "comp", "demos", "filterbank", ...
-+  "fourier", "frames", "gabor", "ltfat", "nonstatgab", "operators", ...
-+  "signals", "sigproc", "wavelets"};
-+dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
-+pp = strsplit (dirname,filesep (), true);
-+arch = cstrcat (octave_config_info ("canonical_host_type"),
-+                              "-", octave_config_info ("api_version"));
-+
-+%% Get the correct path
-+% Search installed packages
-+[local_packages, global_packages] = pkg("list");
-+installed_pkgs_lst = {local_packages{:}, global_packages{:}};
-+pkg_data = installed_pkgs_lst (cellfun(@(x) ismember (x.name, {"ltfat"}), ...
-+                                             installed_pkgs_lst, "unif", true));
-+if isempty(pkg_data)
-+  % The package is not installed yet
-+  [pkg_folder dep_folder] = pkg ("prefix");
-+  pkg_folder = [pkg_folder strcat(filesep(),{pp{end}}){:} ];
-+  if strcmp (arch , pp{end})
-+  %% If we are in Architecture dependent folder add from outside
-+    pkg_folder = strsplit (pkg_folder,filesep (), true);
-+    pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
-+  end
-+else
-+  pkg_folder = pkg_data{1}.dir;
-+end
-+
-+if (! exist (fullfile (dirname, "inst"), "dir"))
-+%% Installing
-+  for ii=1:length (dirlist)
-+    addpath ( [ pkg_folder filesep() dirlist{ii}],"-end")
-+  endfor
-+
-+else
-+%% Testing
-+  warning("ltfat:Devel", "Adding path for testing.");
-+  for ii=1:length(dirlist)
-+    addpath ([ dirname "/inst/" dirlist{ii}])
-+  endfor
-+endif
-+
-+warning('off', 'Octave:fopen-file-in-path');
-+clear dirlist dirname pp arch pkg_folder dep_folder
-+clear global_packages ii installed_pkgs_lst local_packages pkg_data
---- /dev/null
-+++ octave-ltfat-1.4.4/PKG_DEL
-@@ -0,0 +1,42 @@
-+## Remove subdirectories from the Octave path
-+## (This code was taken from the Octave Forge package geometry.)
-+
-+dirlist = {"auditory", "blockproc", "comp", "demos", "filterbank", ...
-+  "fourier", "frames", "gabor", "ltfat", "nonstatgab", "operators", ...
-+  "signals", "sigproc", "wavelets"};
-+dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
-+pp = strsplit (dirname,filesep (), true);
-+arch = cstrcat (octave_config_info ("canonical_host_type"),
-+                              "-", octave_config_info ("api_version"));
-+%% Get the correct path
-+% Search installed packages
-+[local_packages, global_packages] = pkg("list");
-+installed_pkgs_lst = {local_packages{:}, global_packages{:}};
-+pkg_data = installed_pkgs_lst (cellfun(@(x) ismember (x.name, {"ltfat"}), ...
-+                                             installed_pkgs_lst, "unif", true));
-+if isempty(pkg_data)
-+  % The package is not installed yet
-+  [pkg_folder dep_folder] = pkg ("prefix");
-+  pkg_folder = [pkg_folder strcat(filesep(),{pp{end}}){:} ];
-+  if strcmp (arch , pp{end})
-+  %% If we are in Architecture dependent folder add from outside
-+    pkg_folder = strsplit (pkg_folder,filesep (), true);
-+    pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
-+  end
-+else
-+  pkg_folder = pkg_data{1}.dir;
-+end
-+
-+if (! exist (fullfile (dirname, "inst"), "dir"))
-+## Run this if the package is installed
-+  for ii=1:length (dirlist)
-+    rmpath ( [ pkg_folder filesep() dirlist{ii}])
-+  endfor
-+else
-+  warning("geometry:Devel","Removing path for testing.");
-+  for ii=1:length(dirlist)
-+    rmpath ([ dirname "/inst/" dirlist{ii}])
-+  endfor
-+endif
-+
-+clear dirlist dirname pp arch pkg_folder dep_folder
diff --git a/debian/patches/series b/debian/patches/series
index b86bc9b..3cbe24b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 autoload-yes.patch
-add-subdirs-to-loadpath.patch
 add-hardening-flags.patch

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