[Pkg-octave-commit] [SCM] octave-communications branch, master, updated. 44766fefa456e8c0694ba1ae9bf4abe51dca7fa3

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 44766fefa456e8c0694ba1ae9bf4abe51dca7fa3
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Fri May 22 14:09:16 2009 +0200

    Add patch for making the package compile against Octave 3.0.5
    
    Also, build-depend on quilt and include patchsys-quilt.mk in debian/rules.

diff --git a/debian/changelog b/debian/changelog
index d174221..e9d44a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 octave-communications (1.0.9-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/call-mlock-with-arg.diff: Add patch for making the
+    package compile against Octave 3.0.5
+  * 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
diff --git a/debian/control b/debian/control
index e30b78e..d8c76f8 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.0.0), cdbs, octave-signal, octave-pkg-dev (>= 0.6.4)
+Build-Depends: debhelper (>= 7.0.0), cdbs, quilt, octave-signal,
+ octave-pkg-dev (>= 0.6.4)
 Standards-Version: 3.8.1
 Homepage: http://octave.sourceforge.net/comm
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-communications.git
diff --git a/debian/patches/call-mlock-with-arg.diff b/debian/patches/call-mlock-with-arg.diff
new file mode 100644
index 0000000..a68e7bd
--- /dev/null
+++ b/debian/patches/call-mlock-with-arg.diff
@@ -0,0 +1,16 @@
+Call the mmlock() function using a string argument, otherwise
+compilation fails against Octave 3.0.5.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Fri, 22 May 2009 14:06:11 +0200
+
+--- a/src/gf.cc
++++ b/src/gf.cc
+@@ -128,7 +128,7 @@
+       install_s_gm_ops ();
+       install_gm_s_ops ();
+       galois_type_loaded = true;
+-      mlock ();
++      mlock ("gf");
+   }
+ 
+   retval = new octave_galois(data, m, primpoly);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..faef61f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+call-mlock-with-arg.diff
diff --git a/debian/rules b/debian/rules
index cc1bd1b..038c30c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,4 +2,4 @@
 # -*- makefile -*-
 
 include /usr/share/cdbs/1/class/octave-pkg.mk
-
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk

-- 
octave-communications