[Pkg-octave-commit] [SCM] octave-statistics branch, master, updated. e7bb306f0bd12bd7643e7ed97f8d0e1d88f4d32f

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit ae9a127a684210f29a05b7186f79f91ac3b142ef
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sun May 24 03:03:40 2009 +0200

    Add patch for fixing a bug related to str.find() in cell2csv
    
    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 8b48e5c..76f2c24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.pc/
 COPYING
 ChangeLog
 DESCRIPTION
@@ -6,8 +7,8 @@ Makefile
 configure
 debian/files
 debian/octave-statistics*
+debian/stamp-patched
 global-list
 inst/
 local-list
-octave-core
-tblwrite-space.dat
+*.dat
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..91e6077
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,8 @@
+README.source for octave-statistics
+===================================
+
+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>, Sun, 24 May 2009 02:11:03 +0200
diff --git a/debian/changelog b/debian/changelog
index c46bb0d..8a52e98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
 octave-statistics (1.0.8-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * debian/patches/data-files-for-tests.diff: New patch to add the
+    missing *.dat files, needed for the tests of functions caseread and
+    tblread.
+  * 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} and octave-gsl (for expm1)
     + (Vcs-Git, Vcs-Browser): Adjust to new Git repository
@@ -10,6 +15,8 @@ octave-statistics (1.0.8-1) UNRELEASED; urgency=low
   * debian/source.lintian-overrides: Add file for overriding Lintian
     warnings build-depends-without-arch-dep
   * debian/copyright: Use DEP5 URL in Format-Specification
+  * 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:51:29 +0200
 
diff --git a/debian/control b/debian/control
index 6af3ade..862d967 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
 Build-Depends-Indep: octave-gsl, octave-miscellaneous
 Standards-Version: 3.8.1
 Homepage: http://octave.sourceforge.net/statistics
diff --git a/debian/patches/data-files-for-tests.diff b/debian/patches/data-files-for-tests.diff
new file mode 100644
index 0000000..00cc4d4
--- /dev/null
+++ b/debian/patches/data-files-for-tests.diff
@@ -0,0 +1,22 @@
+Add missing *.dat files, needed for the tests of functions caseread and tblread.
+
+ -- Rafael Laboissiere <rafael at debian.org>  Sun, 23 May 2009 13:28:28 +0200
+
+--- /dev/null
++++ b/tblread-space.dat
+@@ -0,0 +1,3 @@
++ a bc
++de 1 2
++f 3 4
+--- /dev/null
++++ b/tblread-tab.dat
+@@ -0,0 +1,3 @@
++ 	a	bc
++de	1	2
++f	3	4
+--- /dev/null
++++ b/caseread.dat
+@@ -0,0 +1,3 @@
++a
++bcd
++ef
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..68a7154
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+data-files-for-tests.diff
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-statistics