[Pkg-octave-commit] [SCM] Debian packaging for octave-geometry branch, master, updated. upstream/1.4.1-12-g53d6fe8

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 53d6fe83a66a07418eaee9a1e49a82a1e7b08d20
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Mar 25 15:45:16 2012 +0200

    Adapt patches for PKG_DEL also
    
    Git-Dch: Ignore

diff --git a/debian/patches/arch-indep-path-for-pkg-add-del.patch b/debian/patches/arch-indep-path-for-pkg-add-del.patch
new file mode 100644
index 0000000..5291dde
--- /dev/null
+++ b/debian/patches/arch-indep-path-for-pkg-add-del.patch
@@ -0,0 +1,32 @@
+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/arch-indep-path-for-pkg-add.patch b/debian/patches/arch-indep-path-for-pkg-add.patch
deleted file mode 100644
index 957020c..0000000
--- a/debian/patches/arch-indep-path-for-pkg-add.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Dcription: 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"))
diff --git a/debian/patches/clean-variables-in-pkg-add-del.patch b/debian/patches/clean-variables-in-pkg-add-del.patch
new file mode 100644
index 0000000..65e2cf2
--- /dev/null
+++ b/debian/patches/clean-variables-in-pkg-add-del.patch
@@ -0,0 +1,20 @@
+Dcription: Clean temporary variables in PKG_ADD and PKG_DEL
+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
+@@ -33,4 +33,4 @@ else
+ endif
+ 
+ warning('off', 'Octave:fopen-file-in-path');
+-clear dirlist dirname pp
++clear dirlist dirname pp arch pkg_folder dep_folder
+--- octave-geometry-1.4.1.orig/PKG_DEL
++++ octave-geometry-1.4.1/PKG_DEL
+@@ -30,4 +30,4 @@ else
+   endfor
+ endif
+ 
+-clear dirlist dirname pp
++clear dirlist dirname pp arch pkg_folder dep_folder
diff --git a/debian/patches/clean-variables-in-pkg-add.patch b/debian/patches/clean-variables-in-pkg-add.patch
deleted file mode 100644
index ed7c9be..0000000
--- a/debian/patches/clean-variables-in-pkg-add.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Dcription: Clean temporary variables in PKG_ADD
-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
-@@ -33,4 +33,4 @@ else
- endif
- 
- warning('off', 'Octave:fopen-file-in-path');
--clear dirlist dirname pp
-+clear dirlist dirname pp arch pkg_folder dep_folder
diff --git a/debian/patches/series b/debian/patches/series
index 7edb137..f113db7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-arch-indep-path-for-pkg-add.patch
-clean-variables-in-pkg-add.patch
+arch-indep-path-for-pkg-add-del.patch
+clean-variables-in-pkg-add-del.patch

-- 
Debian packaging for octave-geometry