[Pkg-octave-commit] [SCM] octave-image branch, master, updated. 7b173c29e642d3391ee6860a9d29f1b84ca26dbc

[Thomas Weber]

tags 517902 pending
thanks

The following commit has been merged in the master branch:
commit e40c86f859de31bd3b5fd21d97e13c148bc4041a
Author: Thomas Weber <thomas.weber.mail at gmail.com>
Date:   Tue Dec 29 09:54:10 2009 +0100

    new patch replace_obsoleted_spfind

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..236b825
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,5 @@
+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.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com>  Sat Dec  5 01:47:17 CET 2009
diff --git a/debian/changelog b/debian/changelog
index 5d3d679..3cba68c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-octave-image (1.0.9-1) UNRELEASED; urgency=low
+octave-image (1.0.10-1) UNRELEASED; urgency=low
 
+  [ Rafael Laboissiere ]
   * New upstream release
   * debian/control:
     + (Depends): Add ${misc:Depends}
@@ -10,6 +11,13 @@ octave-image (1.0.9-1) UNRELEASED; urgency=low
     + Use DEP5 URL in Format-Specification
     + Use separate License stanzas for instructing about the location of
       the different licenses used in the package
+  
+  [ Thomas Weber ]
+  * New upstream release 
+  * This release uses the im* function from octave3.2 (closes: #517902)
+  * Use quilt for patches and document that in README.source.
+  * New patch: replace_obsoleted_spfind, replaces calls to the obsoleted
+    spfind() function with calls to find()
 
  -- Rafael Laboissiere <rafael at debian.org>  Mon, 13 Apr 2009 22:50:43 +0200
 
diff --git a/debian/control b/debian/control
index de61dc1..33bc273 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ólafur Jens Sigurðsson <ojsbug at gmail.com>,
  Rafael Laboissiere <rafael at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.0), cdbs, octave-pkg-dev (>= 0.7.0),
- libpng12-dev, libjpeg62-dev
+ libpng12-dev, libjpeg62-dev, quilt
 Standards-Version: 3.8.1
 Homepage: http://octave.sourceforge.net/image
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-image.git
diff --git a/debian/patches/replace_obsoleted_spfind b/debian/patches/replace_obsoleted_spfind
new file mode 100644
index 0000000..f4897b1
--- /dev/null
+++ b/debian/patches/replace_obsoleted_spfind
@@ -0,0 +1,22 @@
+--- a/inst/qtgetblk.m
++++ b/inst/qtgetblk.m
+@@ -47,7 +47,7 @@
+   endif
+ 
+   ## get blocks
+-  [i,j,v]=spfind(S);
++  [i,j,v]=find(S);
+ 
+   ## filter the ones which match dim
+   idx=find(v==dim);
+--- a/inst/qtsetblk.m
++++ b/inst/qtsetblk.m
+@@ -33,7 +33,7 @@
+   endif
+ 
+   ## get blocks
+-  [ii,ji,v]=spfind(S);
++  [ii,ji,v]=find(S);
+ 
+   ## filter the ones which match dim
+   idx=find(v==dim);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2992f48
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+replace_obsoleted_spfind
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-image