[Pkg-octave-commit] r1012 - in octave/trunk/debian: . in patches
Thomas Weber
thomas-guest at alioth.debian.org
Sun Sep 23 09:08:50 UTC 2007
tags 441722 pending
thanks
Author: thomas-guest
Date: 2007-09-23 09:08:50 +0000 (Sun, 23 Sep 2007)
New Revision: 1012
Added:
octave/trunk/debian/patches/01_include_missing_files.dpatch
Removed:
octave/trunk/debian/patches/50_use_wxt_for_gnuplot.dpatch
Modified:
octave/trunk/debian/changelog
octave/trunk/debian/in/control
octave/trunk/debian/in/octave2.9-00list
octave/trunk/debian/rules
Log:
Changes for 2.9.14
- Remove the wxt patch (never part of a package in Debian, and now in upstream)
- Add 3 missing m files to the package and change Makefile.in accordingly (HTML
part of 441722)
- Add libqhull-dev to build-deps for the geometry stuff that was moved from
Forge into Octave core
- We don't compress PDF files anymore (PDF part of 441722)
Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog 2007-09-21 15:08:13 UTC (rev 1011)
+++ octave/trunk/debian/changelog 2007-09-23 09:08:50 UTC (rev 1012)
@@ -1,4 +1,4 @@
-octave2.9 (1:2.9.13-2) UNRELEASED; urgency=low
+octave2.9 (1:2.9.14-1) UNRELEASED; urgency=low
[ Rafael Laboissiere ]
* debian/in/PACKAGE.menu: Adapted to the new menu hierarchy, which will
@@ -8,13 +8,18 @@
* debian/in/control: Added Homepage field
[ Thomas Weber ]
+ * New upstream release
* debian/rules:
+ Don't force mkoctfile to strip .oct files (closes: #437672)
- * patches/50_use_wxt_for_gnuplot.dpatch: Allow choice of wxt terminal in
- gnuplot via GNUTERM, see
- https://www.cae.wisc.edu/pipermail/help-octave/2007-July/004977.html
+ + Don't compress PDF files (partly (closes: #441722))
+ * debian/in/control:
+ + Add qhull to build-dependencies. Octave-forge's geometry toolbox was
+ merged with Octave and needs this.
+ * patches/01_include_missing_files:
+ + Include .m files that were missed in the distribution tarball
+ (closes the other half of #441722)
- -- Thomas Weber <thomas.weber.mail at gmail.com> Wed, 22 Aug 2007 08:57:52 +0000
+ -- Thomas Weber <thomas.weber.mail at gmail.com> Sat, 22 Sep 2007 17:13:51 +0000
octave2.9 (1:2.9.13-1) unstable; urgency=low
Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control 2007-09-21 15:08:13 UTC (rev 1011)
+++ octave/trunk/debian/in/control 2007-09-23 09:08:50 UTC (rev 1012)
@@ -11,7 +11,7 @@
refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev,
gnuplot-nox, fftw3-dev, texi2html, less, dpatch,
slice[V_2_9:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
- libsuitesparse-dev, gawk, gs-gpl, libcurl4-dev:]
+ libsuitesparse-dev, gawk, gs-gpl, libcurl4-dev, libqhull-dev:]
Standards-Version: 3.7.2
Homepage: http://www.octave.org/
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/octave/
Modified: octave/trunk/debian/in/octave2.9-00list
===================================================================
--- octave/trunk/debian/in/octave2.9-00list 2007-09-21 15:08:13 UTC (rev 1011)
+++ octave/trunk/debian/in/octave2.9-00list 2007-09-23 09:08:50 UTC (rev 1012)
@@ -1,3 +1,3 @@
50_octave-bug-tempfile
-50_use_wxt_for_gnuplot.dpatch
+01_include_missing_files.dpatch
Added: octave/trunk/debian/patches/01_include_missing_files.dpatch
===================================================================
--- octave/trunk/debian/patches/01_include_missing_files.dpatch (rev 0)
+++ octave/trunk/debian/patches/01_include_missing_files.dpatch 2007-09-23 09:08:50 UTC (rev 1012)
@@ -0,0 +1,156 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_include_missing_files.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The files unidcdf.m, unidpdf.m and unidinv.m were missing in the
+## DP: upstream tarball (due to them missed in the SOURCES line in Makefile.in)
+## DP: http://www.cae.wisc.edu/pipermail/octave-maintainers/2007-September/004040.html
+
+ at DPATCH@
+diff -urNad octave-2.9.14~/scripts/statistics/distributions/Makefile.in octave-2.9.14/scripts/statistics/distributions/Makefile.in
+--- octave-2.9.14~/scripts/statistics/distributions/Makefile.in 2007-07-25 15:49:17.000000000 +0000
++++ octave-2.9.14/scripts/statistics/distributions/Makefile.in 2007-09-22 17:21:58.000000000 +0000
+@@ -35,8 +35,9 @@
+ nbinrnd.m normcdf.m norminv.m normpdf.m normrnd.m \
+ poisscdf.m poissinv.m poisspdf.m poissrnd.m stdnormal_cdf.m \
+ stdnormal_inv.m stdnormal_pdf.m stdnormal_rnd.m tcdf.m tinv.m \
+- tpdf.m trnd.m unidrnd.m unifcdf.m unifinv.m unifpdf.m unifrnd.m \
+- wblcdf.m wblinv.m wblpdf.m wblrnd.m wienrnd.m
++ tpdf.m trnd.m unidrnd.m unidcdf.m unidinv.m unidpdf.m unifrnd.m \
++ unifcdf.m unifinv.m unifpdf.m wblcdf.m wblinv.m wblpdf.m wblrnd.m \
++ wienrnd.m
+
+ DISTFILES = $(addprefix $(srcdir)/, Makefile.in $(SOURCES))
+
+diff -urNad octave-2.9.14~/scripts/statistics/distributions/unidcdf.m octave-2.9.14/scripts/statistics/distributions/unidcdf.m
+--- octave-2.9.14~/scripts/statistics/distributions/unidcdf.m 1970-01-01 00:00:00.000000000 +0000
++++ octave-2.9.14/scripts/statistics/distributions/unidcdf.m 2007-09-22 17:20:17.000000000 +0000
+@@ -0,0 +1,40 @@
++## Copyright (C) 2007 David Bateman
++##
++## This file is part of Octave.
++##
++## Octave 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, or (at your option)
++## any later version.
++##
++## Octave 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 Octave; see the file COPYING. If not, write to the Free
++## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++## 02110-1301, USA.
++
++## -*- texinfo -*-
++## @deftypefn {Function File} {} unidcdf (@var{x}, @var{v})
++## For each element of @var{x}, compute the cumulative distribution
++## function (CDF) at @var{x} of a univariate discrete distribution which
++## assumes the values in @var{v} with equal probability.
++## @end deftypefn
++
++function cdf = unidcdf (x, v)
++
++ if (nargin != 2)
++ print_usage ();
++ endif
++
++ if (isscalar(v))
++ v = [1:v].';
++ else
++ v = v(:);
++ endif
++
++ cdf = discrete_cdf (x, v, ones(size(v)));
++endfunction
+diff -urNad octave-2.9.14~/scripts/statistics/distributions/unidinv.m octave-2.9.14/scripts/statistics/distributions/unidinv.m
+--- octave-2.9.14~/scripts/statistics/distributions/unidinv.m 1970-01-01 00:00:00.000000000 +0000
++++ octave-2.9.14/scripts/statistics/distributions/unidinv.m 2007-09-22 17:20:39.000000000 +0000
+@@ -0,0 +1,40 @@
++## Copyright (C) 2007 David Bateman
++##
++## This file is part of Octave.
++##
++## Octave 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, or (at your option)
++## any later version.
++##
++## Octave 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 Octave; see the file COPYING. If not, write to the Free
++## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++## 02110-1301, USA.
++
++## -*- texinfo -*-
++## @deftypefn {Function File} {} unidinv (@var{x}, @var{v})
++## For each component of @var{x}, compute the quantile (the inverse of
++## the CDF) at @var{x} of the univariate discrete distribution which assumes the
++## values in @var{v} with equal probability
++## @end deftypefn
++
++function inv = unidinv (x, v)
++
++ if (nargin != 2)
++ print_usage ();
++ endif
++
++ if (isscalar(v))
++ v = [1:v].';
++ else
++ v = v(:);
++ endif
++
++ inv = discrete_inv (x, v, ones(size(v)));
++endfunction
+diff -urNad octave-2.9.14~/scripts/statistics/distributions/unidpdf.m octave-2.9.14/scripts/statistics/distributions/unidpdf.m
+--- octave-2.9.14~/scripts/statistics/distributions/unidpdf.m 1970-01-01 00:00:00.000000000 +0000
++++ octave-2.9.14/scripts/statistics/distributions/unidpdf.m 2007-09-22 17:20:27.000000000 +0000
+@@ -0,0 +1,40 @@
++## Copyright (C) 2007 David Bateman
++##
++## This file is part of Octave.
++##
++## Octave 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, or (at your option)
++## any later version.
++##
++## Octave 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 Octave; see the file COPYING. If not, write to the Free
++## Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++## 02110-1301, USA.
++
++## -*- texinfo -*-
++## @deftypefn {Function File} {} unidpdf (@var{x}, @var{v})
++## For each element of @var{x}, compute the probability density function
++## (PDF) at @var{x} of a univariate discrete distribution which assumes
++## the values in @var{v} with equal probability.
++## @end deftypefn
++
++function pdf = unidpdf (x, v)
++
++ if (nargin != 2)
++ print_usage ();
++ endif
++
++ if (isscalar(v))
++ v = [1:v].';
++ else
++ v = v(:);
++ endif
++
++ pdf = discrete_pdf (x, v, ones(size(v)));
++endfunction
Property changes on: octave/trunk/debian/patches/01_include_missing_files.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: octave/trunk/debian/patches/50_use_wxt_for_gnuplot.dpatch
===================================================================
--- octave/trunk/debian/patches/50_use_wxt_for_gnuplot.dpatch 2007-09-21 15:08:13 UTC (rev 1011)
+++ octave/trunk/debian/patches/50_use_wxt_for_gnuplot.dpatch 2007-09-23 09:08:50 UTC (rev 1012)
@@ -1,42 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_use_wxt_for_gnuplot.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Enable the use of wxt as terminal for gnuplot via the GNUTERM environment variable
-## DP: https://www.cae.wisc.edu/pipermail/help-octave/2007-July/004977.html
-
- at DPATCH@
-diff -urNad octave2.9-2.9.13~/scripts/plot/drawnow.m octave2.9-2.9.13/scripts/plot/drawnow.m
---- octave2.9-2.9.13~/scripts/plot/drawnow.m 2007-07-18 17:43:51.000000000 +0000
-+++ octave2.9-2.9.13/scripts/plot/drawnow.m 2007-08-22 08:22:17.000000000 +0000
-@@ -109,17 +109,19 @@
-
- ## Guess the terminal type.
- term = getenv ("GNUTERM");
-- if (isempty (term) && ! isempty (getenv ("DISPLAY")))
-- term = "x11";
-- elseif (! isunix ())
-- term = "windows";
-- else
-- term = "aqua";
-- ## This should really be checking for os x before setting
-- ## the terminal type to aqua, but nobody will notice because
-- ## every other unix will be using x11 and windows will be
-- ## using windows. Those diehards still running octave from
-- ## a linux console know how to set the GNUTERM variable.
-+ if (isempty (term))
-+ if (! isempty (getenv ("DISPLAY")))
-+ term = "x11";
-+ elseif (! isunix ())
-+ term = "windows";
-+ else
-+ ## This should really be checking for os x before setting
-+ ## the terminal type to aqua, but nobody will notice because
-+ ## every other unix will be using x11 and windows will be
-+ ## using windows. Those diehards still running octave from
-+ ## a linux console know how to set the GNUTERM variable.
-+ term = "aqua";
-+ endif
- endif
-
- ## If no 'h' (why not?) then open the terminal as Figure 0.
Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules 2007-09-21 15:08:13 UTC (rev 1011)
+++ octave/trunk/debian/rules 2007-09-23 09:08:50 UTC (rev 1012)
@@ -293,7 +293,7 @@
$(debbase)/$(emacs_package)/usr/share/man/man1/octave-tags-$(version).1
dh_installchangelogs -i ChangeLog
- dh_compress -i
+ dh_compress -i --exclude=.pdf
dh_fixperms -i
dh_installdeb -i
dh_gencontrol -i
More information about the Pkg-octave-commit
mailing list