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

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 0a0e057c61f74f84b577d32480a73cc12876c72d
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Sat May 23 19:48:46 2009 +0200

    Switch from dpatch to quilt

diff --git a/debian/in/00list b/debian/in/00list
deleted file mode 100644
index 022c171..0000000
--- a/debian/in/00list
+++ /dev/null
@@ -1,17 +0,0 @@
-[V_3_0:
-50_octave-bug-tempfile
-50_fix_handle_for_plotyy.dpatch
-no_pdf_in_print.dpatch
-dont_set_helvetica.dpatch
-glpk-new-api.dpatch
-real-no-history.dpatch
-termios-h-check-3.0.dpatch
-no-argout-intersect.dpatch
-datenum-vector-input-any-orientation
-:][V_3_1:
-50_octave-bug-tempfile
-no_pdf_in_print.dpatch
-dont_set_helvetica-3.1.dpatch
-normal-markersize.dpatch
-termios-h-check-3.1.dpatch
-:]
diff --git a/debian/in/control b/debian/in/control
index 2d6493e..d5f6389 100644
--- a/debian/in/control
+++ b/debian/in/control
@@ -12,7 +12,7 @@ Build-Depends: g++-4.1 [arm], gcc-4.1 [arm], gfortran,
  libncurses5-dev, gperf, libhdf5-serial-dev (>= 1.6.6) |
  libhdf5-lam-dev (>= 1.6.6) | libhdf5-mpich-dev (>= 1.6.6) | libhdf5-openmpi-dev (>= 1.6.6),
  libblas-dev, liblapack-dev, gnuplot-nox, libfftw3-dev, texi2html,
- less, dpatch, slice[V_3_1:[V_3_0:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
+ less, quilt, slice[V_3_1:[V_3_0:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
  libsuitesparse-dev (>= 1:3.2.0), gawk, ghostscript, libcurl4-dev,
  libqhull-dev, desktop-file-utils:], libfltk1.1-dev, libgl1-mesa-swx11-dev,
  libglu1-mesa-dev, libgraphicsmagick++1-dev, libftgl-dev,
diff --git a/debian/in/series b/debian/in/series
new file mode 100644
index 0000000..08aa6c1
--- /dev/null
+++ b/debian/in/series
@@ -0,0 +1,17 @@
+[V_3_0:
+50_octave-bug-tempfile.diff
+50_fix_handle_for_plotyy.diff
+no_pdf_in_print.diff
+dont_set_helvetica.diff
+glpk-new-api.diff
+real-no-history.diff
+termios-h-check-3.0.diff
+no-argout-intersect.diff
+datenum-vector-input-any-orientation.diff
+:][V_3_1:
+50_octave-bug-tempfile.diff
+no_pdf_in_print.dpatch.diff
+dont_set_helvetica-3.1.diff
+normal-markersize.diff
+termios-h-check-3.1.diff
+:]
diff --git a/debian/patches/50_fix_handle_for_plotyy.dpatch b/debian/patches/50_fix_handle_for_plotyy.diff
old mode 100755
new mode 100644
similarity index 100%
rename from debian/patches/50_fix_handle_for_plotyy.dpatch
rename to debian/patches/50_fix_handle_for_plotyy.diff
diff --git a/debian/patches/50_octave-bug-tempfile.dpatch b/debian/patches/50_octave-bug-tempfile.diff
old mode 100755
new mode 100644
similarity index 100%
rename from debian/patches/50_octave-bug-tempfile.dpatch
rename to debian/patches/50_octave-bug-tempfile.diff
diff --git a/debian/patches/datenum-vector-input-any-orientation.dpatch b/debian/patches/datenum-vector-input-any-orientation.diff
old mode 100755
new mode 100644
similarity index 100%
rename from debian/patches/datenum-vector-input-any-orientation.dpatch
rename to debian/patches/datenum-vector-input-any-orientation.diff
diff --git a/debian/patches/dont_set_helvetica-3.1.dpatch b/debian/patches/dont_set_helvetica-3.1.diff
similarity index 100%
rename from debian/patches/dont_set_helvetica-3.1.dpatch
rename to debian/patches/dont_set_helvetica-3.1.diff
diff --git a/debian/patches/dont_set_helvetica.dpatch b/debian/patches/dont_set_helvetica.diff
old mode 100755
new mode 100644
similarity index 100%
rename from debian/patches/dont_set_helvetica.dpatch
rename to debian/patches/dont_set_helvetica.diff
diff --git a/debian/patches/glpk-new-api.dpatch b/debian/patches/glpk-new-api.diff
old mode 100755
new mode 100644
similarity index 100%
rename from debian/patches/glpk-new-api.dpatch
rename to debian/patches/glpk-new-api.diff
diff --git a/debian/patches/no-argout-intersect.dpatch b/debian/patches/no-argout-intersect.diff
old mode 100755
new mode 100644
similarity index 100%
rename from debian/patches/no-argout-intersect.dpatch
rename to debian/patches/no-argout-intersect.diff
diff --git a/debian/patches/no_pdf_in_print.dpatch b/debian/patches/no_pdf_in_print.diff
old mode 100755
new mode 100644
similarity index 100%
rename from debian/patches/no_pdf_in_print.dpatch
rename to debian/patches/no_pdf_in_print.diff
diff --git a/debian/patches/normal-markersize.dpatch b/debian/patches/normal-markersize.diff
similarity index 100%
rename from debian/patches/normal-markersize.dpatch
rename to debian/patches/normal-markersize.diff
diff --git a/debian/patches/real-no-history.dpatch b/debian/patches/real-no-history.diff
old mode 100755
new mode 100644
similarity index 100%
rename from debian/patches/real-no-history.dpatch
rename to debian/patches/real-no-history.diff
diff --git a/debian/patches/termios-h-check-3.0.dpatch b/debian/patches/termios-h-check-3.0.diff
old mode 100755
new mode 100644
similarity index 100%
rename from debian/patches/termios-h-check-3.0.dpatch
rename to debian/patches/termios-h-check-3.0.diff
diff --git a/debian/patches/termios-h-check-3.1.dpatch b/debian/patches/termios-h-check-3.1.diff
similarity index 100%
rename from debian/patches/termios-h-check-3.1.dpatch
rename to debian/patches/termios-h-check-3.1.diff
diff --git a/debian/rules b/debian/rules
index 15d9461..8aeeeb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@
 #
 # $Id$
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 # in order: octave, octave2.1, 2.1.28, 2.1  (or whatever the version is), 3.0
 # the difference in major and PACKAGEVER: first one is taken from the octave
@@ -136,7 +136,7 @@ maintainer-scripts: debian/control debian/copyright
 	done
 	## Remove empty NEWS file
 	-test ! -s debian/NEWS && rm -f debian/NEWS
-	slice -o $(sliceterm):debian/patches/00list debian/in/00list
+	slice -o $(sliceterm):debian/patches/series debian/in/series
 
 get-orig-source: upstream
 upstream:
@@ -154,7 +154,7 @@ save-files:
 		test -f $$f && cp $$f $$f-save ;	\
 	done
 
-configure: maintainer-scripts save-files patch-stamp configure-stamp
+configure: maintainer-scripts save-files patch configure-stamp
 configure-stamp:
 	dh_testdir
 

-- 
octave