[Pkg-octave-commit] [SCM] octave-signal branch, master, updated. 4a479c4ae9638d20487582b8acc7274dca8eb397

Sat May 23 11:56:01 UTC 2009

The following commit has been merged in the master branch:
commit 4a479c4ae9638d20487582b8acc7274dca8eb397
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sat May 23 13:54:38 2009 +0200

    Add patch for removing file inst/upfridn.m prior to package building
    
    Also, add the Policy-required file README.source, build-depends on quilt,
    include patchsys-quilt.mk in debian/rules, and adjust the list of exclusions
    in .gitignore accordingly.

diff --git a/.gitignore b/.gitignore
index 0d1a169..0fcc15c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.pc/
 COPYING
 ChangeLog
 DESCRIPTION
@@ -6,6 +7,7 @@ Makefile
 configure
 debian/files
 debian/octave-signal*
+debian/stamp-patched
 global-list
 inst/
 local-list
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..33f396b
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,9 @@
+README.source for octave-signal
+===============================
+
+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, 23 May 2009 12:59:43 +0200
+
diff --git a/debian/changelog b/debian/changelog
index 53de88a..7d183ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 octave-signal (1.0.9-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * debian/patches/remove-upfirdn-m.diff: Add patch for removing file
+    inst/upfridn.m prior to package building.  This file is obsolete and
+    has been superseded by src/upfirdn.cc.
   * 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
@@ -9,7 +13,11 @@ octave-signal (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
-  * debian/rules: Fix wrong permission of script sampled2continuous.m
+  * debian/rules:
+    + Include patchsys-quilt.mk
+    + Fix wrong permission of script sampled2continuous.m
+  * debian/README.source: Add file explaining the quilt patch system, as
+    required by the Policy
 
  -- Rafael Laboissiere <rafael at debian.org>  Sun, 12 Apr 2009 17:47:25 +0200
 
diff --git a/debian/control b/debian/control
index a07ebfe..b73b811 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ 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 (>= 6), cdbs, octave-pkg-dev (>= 0.6.4)
+Build-Depends: debhelper (>= 6), cdbs, octave-pkg-dev (>= 0.6.4), quilt
 Standards-Version: 3.8.1
 Homepage: http://octave.sourceforge.net/signal
 Vcs-Git: git://git.debian.org/git/pkg-octave/octave-signal.git
diff --git a/debian/patches/remove-upfirdn-m.diff b/debian/patches/remove-upfirdn-m.diff
new file mode 100644
index 0000000..8e55375
--- /dev/null
+++ b/debian/patches/remove-upfirdn-m.diff
@@ -0,0 +1,51 @@
+Remove file inst/upfridn.m prior to package building.  This file is
+obsolete and has been superseded by src/upfirdn.cc.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sat, 23 May 2009 13:02:04 +0200
+
+--- a/inst/upfirdn.m
++++ /dev/null
+@@ -1,42 +0,0 @@
+-## Copyright (C) 2008   Sylvain Pelissier   <sylvain.pelissier at gmail.com>
+-##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful,
+-## but WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-## GNU General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; If not, see <http://www.gnu.org/licenses/>.
+-
+-## -*- texinfo -*-
+-## @deftypefn {Function File} {[@var{yout}] =} bohmanwin(@var{xin}, at var{h}), at var{p}, at var{q})
+-##	Upsample, filter and downsample a signal.
+-## @seealso{rectwin,  bartlett}
+-## @end deftypefn
+-
+-function yout = upfirdn(xin,h,p,q)
+-	if(nargin < 2)
+-		error('usage : yout = upfirdn(xin,h,p,q)');
+-	end
+-	
+-	if(nargin < 3)
+-		p = 1;
+-		q = 1;
+-	end
+-	
+-	if(nargin < 4)
+-		q = 1;
+-	end
+-	
+-	if(floor(p) ~= p || floor(q) ~= q || p < 1 || q < 1)
+-		error('p and q must be positive integer');
+-	end
+-	
+-	yout = upsample(xin,p);
+-	yout = filter(h,1,yout);
+-	yout = downsample(yout,q);
+\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..70bd2cf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove-upfirdn-m.diff
diff --git a/debian/rules b/debian/rules
index ae25ddf..ac40f02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 # -*- makefile -*-
 
 include /usr/share/cdbs/1/class/octave-pkg.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 wrongperm = sampled2continuous.m
 pkgdir = $(CURDIR)/debian/octave-signal/usr/share/octave/packages/*/signal-*

-- 
octave-signal

