[Pkg-octave-commit] r1031 - in octave/trunk/debian: . in patches
Thomas Weber
thomas-guest at alioth.debian.org
Sun Oct 14 11:27:44 UTC 2007
Author: thomas-guest
Date: 2007-10-14 11:27:44 +0000 (Sun, 14 Oct 2007)
New Revision: 1031
Added:
octave/trunk/debian/NEWS
octave/trunk/debian/in/octave3.0-00list
octave/trunk/debian/in/octave3.0-watch
octave/trunk/debian/patches/02_prelease_warning.dpatch
Modified:
octave/trunk/debian/changelog
octave/trunk/debian/in/control
octave/trunk/debian/rules
Log:
Release candidate for 3.0
Added: octave/trunk/debian/NEWS
===================================================================
--- octave/trunk/debian/NEWS (rev 0)
+++ octave/trunk/debian/NEWS 2007-10-14 11:27:44 UTC (rev 1031)
@@ -0,0 +1,8 @@
+octave3.0 (2.9.14-1) experimental; urgency=low
+
+ This is a pre-release of the upcoming Octave 3.0 series and is a package
+ is specific to the Debian GNU/Linux distribution. Please don't mistake it
+ for the final 3.0 release.
+
+ -- Thomas Weber <thomas.weber.mail at gmail.com> Thu, 11 Oct 2007 22:39:42 +0000
+
Modified: octave/trunk/debian/changelog
===================================================================
--- octave/trunk/debian/changelog 2007-10-08 08:36:34 UTC (rev 1030)
+++ octave/trunk/debian/changelog 2007-10-14 11:27:44 UTC (rev 1031)
@@ -1,15 +1,11 @@
-octave2.9 (1:2.9.14-2) unstable; urgency=low
+octave3.0 (2.9.14-1) UNRELEASED; urgency=low
[ Thomas Weber ]
- * Add atlas3-base to recommends (closes: #419556)
+ * Declare 2.9.14 as release candidate for 3.0. This has been discussed with
+ upstream and is encouraged.
- [ Rafael Laboissiere ]
- * debian/patches/50_mix-range-and-sparse.dpatch: Allow mixing range
- constructs and sparse matrix definitions when building matrices with
- brackets (thanks to Kim Hansen and David Bateman, closes: #444420)
+ -- Thomas Weber <thomas.weber.mail at gmail.com> Thu, 11 Oct 2007 22:39:42 +0000
- -- Rafael Laboissiere <rafael at debian.org> Sat, 29 Sep 2007 16:55:16 +0200
-
octave2.9 (1:2.9.14-1) unstable; urgency=low
[ Thomas Weber ]
Modified: octave/trunk/debian/in/control
===================================================================
--- octave/trunk/debian/in/control 2007-10-08 08:36:34 UTC (rev 1030)
+++ octave/trunk/debian/in/control 2007-10-14 11:27:44 UTC (rev 1031)
@@ -1,4 +1,4 @@
-Source: octave[V_2_1:2.1:][V_2_9:2.9:]
+Source: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]
Section: math
Priority: optional
Maintainer: Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org>
@@ -12,24 +12,27 @@
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, libqhull-dev,
+ desktop-file-utils:][V_3_0:, libpcre3-dev, flex, libglpk-dev (>= 4.15),
+ libsuitesparse-dev, gawk, gs-gpl, libcurl4-dev, libqhull-dev,
desktop-file-utils:]
Standards-Version: 3.7.2
Homepage: http://www.octave.org/
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-octave/octave/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-octave/octave/
-Package: octave[V_2_1:2.1:][V_2_9:2.9:]
+Package: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]
Architecture: any
Depends: ${shlibs:Depends}, texinfo
Recommends: gnuplot, atlas3-base
-Suggests: octave[V_2_1:2.1:][V_2_9:2.9:]-info,
- octave[V_2_1:2.1:][V_2_9:2.9:]-doc, octave[V_2_1:2.1:][V_2_9:2.9:]-htmldoc,
- octave[V_2_1:2.1:][V_2_9:2.9:]-headers (= ${binary:Version}),
- octave[V_2_1:2.1:][V_2_9:2.9:]-emacsen
+Suggests: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]-info,
+ octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]-doc,
+ octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]-htmldoc,
+ octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]-headers (= ${binary:Version}),
+ octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]-emacsen
Replaces: octave (<= 2.0.16-2)
-Conflicts: octave (<= 2.0.16-2)
+Conflicts: octave (<= 2.0.16-2)[V_3_0:,octave2.9:]
Provides: octave
-Description: GNU Octave language for numerical computations ([V_2_1:2.1:][V_2_9:2.9:] branch)
+Description: GNU Octave language for numerical computations ([V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:] branch)
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
@@ -41,14 +44,14 @@
.
Homepage: http://www.octave.org/
-Package: octave[V_2_1:2.1:][V_2_9:2.9:]-doc
+Package: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]-doc
Architecture: all
Section: doc
-Suggests: octave[V_2_1:2.1:][V_2_9:2.9:], xpdf | pdf-viewer
-Conflicts: octave-doc (<< 2.1)
+Suggests: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:], xpdf | pdf-viewer
+Conflicts: octave-doc (<< 2.1)[V_3_0:,octave2.9-doc:]
Provides: octave-doc
Replaces: octave-doc
-Description: PDF documentation on the GNU Octave language ([V_2_1:2.1:][V_2_9:2.9:] branch)
+Description: PDF documentation on the GNU Octave language ([V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:] branch)
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
@@ -56,17 +59,17 @@
This packages provides the following documentation in PDF format:
the FAQ, a reference card in a4, letter and legal formats, a document on the
C++ classes used by Octave, as well as the main octave documentation which
- is also included in info format in the octave[V_2_1:2.1:][V_2_9:2.9:]-info package.
+ is also included in info format in the octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]-info package.
.
Homepage: http://www.octave.org/
-Package: octave[V_2_1:2.1:][V_2_9:2.9:]-htmldoc
+Package: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]-htmldoc
Architecture: all
-Suggests: octave[V_2_1:2.1:][V_2_9:2.9:], lynx | www-browser
-Conflicts: octave-htmldoc (<< 2.1), octave2.0-htmldoc
+Suggests: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:], lynx | www-browser
+Conflicts: octave-htmldoc (<< 2.1), octave2.0-htmldoc[V_3_0:,octave2.9-htmldoc:]
Replaces: octave-htmldoc
Provides: octave-htmldoc
-Description: HTML documentation on the GNU Octave language ([V_2_1:2.1:][V_2_9:2.9:] branch)
+Description: HTML documentation on the GNU Octave language ([V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:] branch)
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
@@ -78,17 +81,17 @@
.
Homepage: http://www.octave.org/
-Package: octave[V_2_1:2.1:][V_2_9:2.9:]-headers
+Package: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]-headers
Architecture: any
-Depends: octave[V_2_1:2.1:][V_2_9:2.9:] (= ${binary:Version}), g++, g77,
+Depends: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:] (= ${binary:Version}), g++, g77,
libreadline5-dev, libncurses5-dev, libhdf5-serial-dev (>= 1.6.5)
| libhdf5-lam-dev (>= 1.6.5) | libhdf5-mpich-dev (>= 1.6.5),
refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev, fftw3-dev,
${m68k:Depends}
-Conflicts: octave-headers (<< 2.1)
+Conflicts: octave-headers (<< 2.1)[V_3_0:,octave2.9-headers:]
Provides: octave-headers
Replaces: octave-headers
-Description: header files for the GNU Octave language ([V_2_1:2.1:][V_2_9:2.9:] branch)
+Description: header files for the GNU Octave language ([V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:] branch)
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
@@ -102,14 +105,14 @@
.
Homepage: http://www.octave.org/
-Package: octave[V_2_1:2.1:][V_2_9:2.9:]-emacsen
+Package: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]-emacsen
Architecture: all
-Depends: octave[V_2_1:2.1:][V_2_9:2.9:], emacs22 | xemacs21 | emacsen,
+Depends: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:], emacs22 | xemacs21 | emacsen,
debianutils (>= 1.6)
Replaces: octave (<= 2.0.16-2)
-Conflicts: octave2.0-emacsen
+Conflicts: octave2.0-emacsen[V_3_0:,octave2.9-emacsen:]
Provides: octave-emacsen
-Description: Emacs support for the GNU Octave language ([V_2_1:2.1:][V_2_9:2.9:] branch)
+Description: Emacs support for the GNU Octave language ([V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:] branch)
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
@@ -119,13 +122,13 @@
.
Homepage: http://www.octave.org/
-Package: octave[V_2_1:2.1:][V_2_9:2.9:]-info
+Package: octave[V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:]-info
Architecture: all
Depends: info (>= 3.12) | info-browser
Replaces: octave (<= 2.0.16-2)
-Conflicts: octave2.0-info
+Conflicts: octave2.0-info[V_3_0:,octave2.9-info:]
Provides: octave-info
-Description: GNU Info documentation on the GNU Octave language ([V_2_1:2.1:][V_2_9:2.9:] branch)
+Description: GNU Info documentation on the GNU Octave language ([V_2_1:2.1:][V_2_9:2.9:][V_3_0:3.0:] branch)
Octave is a (mostly Matlab (R) compatible) high-level language, primarily
intended for numerical computations. It provides a convenient command-line
interface for solving linear and nonlinear problems numerically.
Copied: octave/trunk/debian/in/octave3.0-00list (from rev 1030, octave/trunk/debian/in/octave2.9-00list)
===================================================================
--- octave/trunk/debian/in/octave3.0-00list (rev 0)
+++ octave/trunk/debian/in/octave3.0-00list 2007-10-14 11:27:44 UTC (rev 1031)
@@ -0,0 +1,4 @@
+50_octave-bug-tempfile
+01_include_missing_files
+50_mix-range-and-sparse
+02_prelease_warning
Copied: octave/trunk/debian/in/octave3.0-watch (from rev 1030, octave/trunk/debian/in/octave2.9-watch)
===================================================================
--- octave/trunk/debian/in/octave3.0-watch (rev 0)
+++ octave/trunk/debian/in/octave3.0-watch 2007-10-14 11:27:44 UTC (rev 1031)
@@ -0,0 +1,3 @@
+version=3
+ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-([\d\.]+)\.tar\.gz
+
Added: octave/trunk/debian/patches/02_prelease_warning.dpatch
===================================================================
--- octave/trunk/debian/patches/02_prelease_warning.dpatch (rev 0)
+++ octave/trunk/debian/patches/02_prelease_warning.dpatch 2007-10-14 11:27:44 UTC (rev 1031)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_prelease_warning.dpatch by Thomas Weber <thomas.weber.mail at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad octave2.9-2.9.14~/src/version.h octave2.9-2.9.14/src/version.h
+--- octave2.9-2.9.14~/src/version.h 2007-09-17 17:31:10.000000000 +0000
++++ octave2.9-2.9.14/src/version.h 2007-10-12 14:49:19.000000000 +0000
+@@ -65,6 +65,12 @@
+
+ #define OCTAVE_NAME_VERSION_AND_COPYRIGHT \
+ OCTAVE_NAME_AND_VERSION "\n" \
++"***********************************************************************\n\
++* WARNING: Although this version of Octave was launched as octave3.0, *\n\
++* it is actually version 2.9.14, which is considered by the upstream *\n\
++* authors as a release candidate for the upcoming 3.0 version. This *\n\
++* version is specific to the Debian GNU/Linux distribution. *\n\
++***********************************************************************\n" \
+ OCTAVE_COPYRIGHT
+
+ #define OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_AND_WARRANTY \
Property changes on: octave/trunk/debian/patches/02_prelease_warning.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: octave/trunk/debian/rules
===================================================================
--- octave/trunk/debian/rules 2007-10-08 08:36:34 UTC (rev 1030)
+++ octave/trunk/debian/rules 2007-10-14 11:27:44 UTC (rev 1031)
@@ -7,7 +7,10 @@
include /usr/share/dpatch/dpatch.make
-# in order: octave, octave2.1, 2.1.28, 2.1 (or whatever the version is)
+# 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
+# version (ie 2.1.69), the second one from the binary package name in Debian
+# (ie octave2.1); necessary for the 3.0 rc uploads.
source := $(shell head -1 debian/changelog | \
perl -nle 'm/^([a-z]+)/ and print $$1')
PACKAGE := $(shell head -1 debian/changelog | \
@@ -16,6 +19,9 @@
perl -nle 'm/\S+\s+\((?:\d:)*(\S+)-\S+\)/ and print $$1')
major := $(shell echo $(version) | perl -nle \
'm/(\d\.\d)\.\d+/ and print $$1')
+PACKAGEVER := $(shell echo $(PACKAGE) | \
+ perl -nle 'm/.*(\d.\d)/ and print $$1')
+#FIXME: drop PACKAGEVER after the release of 3.0 source packages!
ifeq ($(major),2.9)
priority := 90
@@ -81,7 +87,7 @@
#export DH_VERBOSE=1
-sliceterm = UNDEF+V_$(shell echo $(major) | sed s/\\./_/g)
+sliceterm = UNDEF+V_$(shell echo $(PACKAGEVER) | sed s/\\./_/g)
debian/control: debian/in/control
slice -o $(sliceterm):$@ $<
@@ -299,7 +305,7 @@
install -p -m 0644 emacs/octave-tags.1 \
$(debbase)/$(emacs_package)/usr/share/man/man1/octave-tags-$(version).1
- dh_installchangelogs -i ChangeLog
+ dh_installchangelogs -i ChangeLog
dh_compress -i --exclude=.pdf
dh_fixperms -i
dh_installdeb -i
@@ -339,6 +345,7 @@
## this file would exist under 2.0 and 2.1 with the same name
rm -v $(debini)/octaverc
+
dh_installdocs -a README README.kpathsea \
NEWS* PROJECTS THANKS \
BUGS SENDING-PATCHES
More information about the Pkg-octave-commit
mailing list