[Pkg-octave-commit] [SCM] octave-ftp branch, master, updated. 7922fe9bbc313a87dbbe45f20d7fc6580337c4a9

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 87232ee8e86aed372d392ddca2c661c51fb7e146
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sat May 16 20:26:22 2009 +0200

    Limit the chances of crash wehn running "clear -all"
    
    Add two quilt patches (autoload-no.diff and warn-clear-all-at-init.diff)
    that set Autoload to "no" and send a warning when the user runs "pkg load
    ftp".  Adjust debian/control and debian/rules for using quilt.  Also, add a
    README.source file as required by the Debian Policy.

diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..9826e72
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,13 @@
+octave-ftp (1.0.2-1) unstable; urgency=low
+
+    Starting with this version, this package does not autoload as it did
+    before.  The reason is that all the SWIG-generated Octave-Forge
+    packages make Octave crash when calling "clear -all" if the package is
+    loaded. 
+  
+    In order to activate the package, the user must issue now:
+  
+        pkg load ftp
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 16 May 2009 20:19:21 +0200
+
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..cd2a4f1
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,8 @@
+README.source for octave-ftp
+============================
+
+This package uses quilt to manage all modifications to the upstream
+sources.  See `/usr/share/doc/quilt/README.source' to get more
+information on how to use it.
+
+ -- Rafael Laboissiere <rafael at debian.org>, Sat, 16 May 2009 20:18:29 +0200
diff --git a/debian/changelog b/debian/changelog
index d47f3bc..8fbc11e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,19 @@
 octave-ftp (1.0.2-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/autoload-no: New patch to avoid autoloading the package
+  * debian/patches/warn-clear-all-at-init.diff: New patch to send a
+    warning at pkg load time regarding the crash after "clear -all"
+  * debian/rules: Include patchsys-quilt.mk
   * debian/control:
+    + (Build-Depends): Add quilt
     + (Standards-Version): Bump to 3.8.1 (no changes needed)
     + (Depends): Add ${misc:Depends}
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
+  * debian/README.source: Add file explaining the quilt patch system, as
+    mandated by the Policy
+  * debian/NEWS: Explain the change in the autoloading of the package and
+    instruct the reader on how to use pkg load
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:51:41 +0200
 
diff --git a/debian/control b/debian/control
index dfd131c..957d8df 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Ólafur Jens Sigurðsson <ojsbug at gmail.com>,
  Thomas Weber <thomas.weber.mail at gmail.com>,
  Rafael Laboissiere <rafael at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), cdbs, octave-pkg-dev (>= 0.6.4), ftplib-dev
+Build-Depends: debhelper (>= 7), cdbs, octave-pkg-dev (>= 0.6.4), ftplib-dev,
+ quilt
 Standards-Version: 3.8.1
 Homepage: http://octave.sourceforge.net/ftp
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-ftp.git
diff --git a/debian/patches/autoload-no.diff b/debian/patches/autoload-no.diff
new file mode 100644
index 0000000..240a371
--- /dev/null
+++ b/debian/patches/autoload-no.diff
@@ -0,0 +1,16 @@
+Do not auto-load the package, otherwise "clear -all" will make Octave crash.
+See Bug#523085 and Bug#528078 for details.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 15 May 2009 19:22:37 +0200
+
+--- a/DESCRIPTION
++++ b/DESCRIPTION
+@@ -6,7 +6,7 @@
+ Title: FTP functions
+ Description: These are bindings for ftplib, and MATLAB compatible APIs.
+ Depends: octave (>= 2.9.12)
+-Autoload: yes
++Autoload: no
+ SystemRequirements: swig, ftplib-dev.
+ License: BSD
+ Url: http://octave.sf.net
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a24dbed
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+autoload-no.diff
+warn-clear-all-at-init.diff
diff --git a/debian/patches/warn-clear-all-at-init.diff b/debian/patches/warn-clear-all-at-init.diff
new file mode 100644
index 0000000..2796541
--- /dev/null
+++ b/debian/patches/warn-clear-all-at-init.diff
@@ -0,0 +1,20 @@
+Issue a warning when the package is loaded.
+See Bug#523085 and Bug#528078 for details.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 15 May 2009 19:22:37 +0200
+
+--- a/src/ftp.i
++++ b/src/ftp.i
+@@ -35,6 +35,12 @@
+ 
+ %include "docs.i"
+ 
++%init %{
++  warning ("You loaded the ann module.\n"
++           "A call to \"clear -all\" from now on will make Octave crash.\n"
++           "You have been warned.");
++%}
++
+ // **********************************************************************
+ // ftp object
+ 
diff --git a/debian/rules b/debian/rules
index 71fb86c..038c30c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,3 +2,4 @@
 # -*- makefile -*-
 
 include /usr/share/cdbs/1/class/octave-pkg.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk

-- 
octave-ftp