[Pkg-octave-commit] [SCM] Debian packaging for octave-geometry branch, master, updated. debian/1.4.1-1-9-g3f62fef

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit bd6cc30985dfd9b59a1f7416f34009d15d7b76fc
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Jun 10 08:21:07 2012 +0000

    Drop obsolete patch arch-indep-path-for-pkg-add-del

diff --git a/debian/patches/arch-indep-path-for-pkg-add-del.patch b/debian/patches/arch-indep-path-for-pkg-add-del.patch
deleted file mode 100644
index 5291dde..0000000
--- a/debian/patches/arch-indep-path-for-pkg-add-del.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Add appropriate path for the architecture independent files
-Author: Rafael Laboissiere <rafael at laboissiere.net>
-Last-Update: 2012-03-25
-
---- octave-geometry-1.4.1.orig/PKG_ADD
-+++ octave-geometry-1.4.1/PKG_ADD
-@@ -13,8 +13,9 @@ arch = cstrcat (octave_config_info ("can
-                               "-", octave_config_info ("api_version"));
- if strcmp (arch , pp{end})
-   dirname = [strcat(filesep(),{pp{1:end-1}}){:}];
--  pkg_folder = strsplit (pkg_folder,filesep (), true);
--  pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
-+  pkg_folder = sprintf ("%s%s",
-+                        dirname (1 : strfind (dirname, "usr/lib/") - 1),
-+                        "usr/share/octave/packages/geometry-1.4.1");
- end
- 
- if (! exist (fullfile (dirname, "inst"), "dir"))
---- octave-geometry-1.4.1.orig/PKG_DEL
-+++ octave-geometry-1.4.1/PKG_DEL
-@@ -14,8 +14,9 @@ arch = cstrcat (octave_config_info ("can
- pp = strsplit (dirname,filesep (), true);
- if strcmp(arch , pp{end})
-   dirname = [pkg("prefix") filesep() pp{end-1}];
--  pkg_folder = strsplit (pkg_folder,filesep (), true);
--  pkg_folder = [strcat(filesep(),{pkg_folder{1:end-1}}){:}];
-+  pkg_folder = sprintf ("%s%s",
-+                        dirname (1 : strfind (dirname, "usr/lib/") - 1),
-+                        "usr/share/octave/packages/geometry-1.4.1");
- end
- 
- if (! exist (fullfile (dirname, "inst"), "dir"))
diff --git a/debian/patches/series b/debian/patches/series
index f113db7..b1587a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-arch-indep-path-for-pkg-add-del.patch
 clean-variables-in-pkg-add-del.patch

-- 
Debian packaging for octave-geometry