[Pkg-octave-commit] rev 172 - in trunk/packages/octave2.1/debian: . in
Rafael Laboissiere
pkg-octave-devel@lists.alioth.debian.org
Tue, 29 Mar 2005 17:05:50 +0000
Author: rafael
Date: 2005-03-29 17:05:49 +0000 (Tue, 29 Mar 2005)
New Revision: 172
Added:
trunk/packages/octave2.1/debian/README.Debian.Announce
trunk/packages/octave2.1/debian/README.Debian.VersionedPackages
trunk/packages/octave2.1/debian/in/
trunk/packages/octave2.1/debian/in/PACKAGE-emacsen.postinst
trunk/packages/octave2.1/debian/in/PACKAGE-emacsen.prerm
trunk/packages/octave2.1/debian/in/PACKAGE-headers.postinst
trunk/packages/octave2.1/debian/in/PACKAGE-headers.prerm
trunk/packages/octave2.1/debian/in/PACKAGE.lintian
trunk/packages/octave2.1/debian/in/PACKAGE.postinst
trunk/packages/octave2.1/debian/in/PACKAGE.prerm
trunk/packages/octave2.1/debian/in/control
trunk/packages/octave2.1/debian/in/pkgver-emacsen.conffiles
trunk/packages/octave2.1/debian/in/pkgver-emacsen.dirs
trunk/packages/octave2.1/debian/in/pkgver-emacsen.emacsen-install
trunk/packages/octave2.1/debian/in/pkgver-emacsen.emacsen-remove
trunk/packages/octave2.1/debian/in/pkgver-emacsen.emacsen-startup
trunk/packages/octave2.1/debian/in/pkgver-htmldoc.doc-base.faq
trunk/packages/octave2.1/debian/in/pkgver-htmldoc.doc-base.lib
trunk/packages/octave2.1/debian/in/pkgver-htmldoc.doc-base.manual
trunk/packages/octave2.1/debian/in/pkgver-htmldoc.menu
trunk/packages/octave2.1/debian/in/pkgver-htmldoc.postinst
trunk/packages/octave2.1/debian/in/pkgver-htmldoc.prerm
trunk/packages/octave2.1/debian/in/pkgver-info.postinst
trunk/packages/octave2.1/debian/in/pkgver-info.prerm
trunk/packages/octave2.1/debian/in/pkgver.conffiles
trunk/packages/octave2.1/debian/in/pkgver.dirs
trunk/packages/octave2.1/debian/in/pkgver.menu
Removed:
trunk/packages/octave2.1/debian/README.Debian.TwoPackages
trunk/packages/octave2.1/debian/control
trunk/packages/octave2.1/debian/octave2.1-emacsen.conffiles
trunk/packages/octave2.1/debian/octave2.1-emacsen.dirs
trunk/packages/octave2.1/debian/octave2.1-emacsen.emacsen-install
trunk/packages/octave2.1/debian/octave2.1-emacsen.emacsen-remove
trunk/packages/octave2.1/debian/octave2.1-emacsen.emacsen-startup
trunk/packages/octave2.1/debian/octave2.1-emacsen.postinst.in
trunk/packages/octave2.1/debian/octave2.1-emacsen.prerm.in
trunk/packages/octave2.1/debian/octave2.1-headers.postinst.in
trunk/packages/octave2.1/debian/octave2.1-headers.prerm.in
trunk/packages/octave2.1/debian/octave2.1-htmldoc.doc-base.faq
trunk/packages/octave2.1/debian/octave2.1-htmldoc.doc-base.lib
trunk/packages/octave2.1/debian/octave2.1-htmldoc.doc-base.manual
trunk/packages/octave2.1/debian/octave2.1-htmldoc.menu
trunk/packages/octave2.1/debian/octave2.1-htmldoc.postinst
trunk/packages/octave2.1/debian/octave2.1-htmldoc.prerm
trunk/packages/octave2.1/debian/octave2.1-info.postinst
trunk/packages/octave2.1/debian/octave2.1-info.prerm
trunk/packages/octave2.1/debian/octave2.1.announce
trunk/packages/octave2.1/debian/octave2.1.conffiles
trunk/packages/octave2.1/debian/octave2.1.dirs
trunk/packages/octave2.1/debian/octave2.1.lintian.in
trunk/packages/octave2.1/debian/octave2.1.menu
trunk/packages/octave2.1/debian/octave2.1.postinst.in
trunk/packages/octave2.1/debian/octave2.1.prerm.in
Modified:
trunk/packages/octave2.1/debian/rules
Log:
Allow automatic generation of helper files for the versioned octave<n.m>
package by debian/rules. This seems to work correctly, but should be
considered highly experimental.
Copied: trunk/packages/octave2.1/debian/README.Debian.Announce (from rev 169, trunk/packages/octave2.1/debian/octave2.1.announce)
===================================================================
--- trunk/packages/octave2.1/debian/octave2.1.announce 2005-03-28 19:34:33 UTC (rev 169)
+++ trunk/packages/octave2.1/debian/README.Debian.Announce 2005-03-29 17:05:49 UTC (rev 172)
@@ -0,0 +1,20 @@
+
+ Announcing Versioned Octave packages for Debian
+
+This is to announce the upload of new Octave packages for Debian, taken from
+the stable (currently octave-2.0.*), the recommended (currently
+octave-2.1.*) as well as the development (currently octave-2.9.*) branches,
+to Debian's master archive.
+
+Using Debian's update-alternatives mechanism, as well as minor
+reorganisation of the Octave file tree which John Eaton kindly provided in
+the upstream sources, permits to install *both* at the same time providing
+two main binaries (like octave2.0, octave2.1, and octave2.9) as well as the
+alternative octave which defaults to the stable branch. The adjunct packages
+for Emacs support, info docs, html docs and ps docs are also versioned.
+
+With this mechanism, Debian allows for the stability of the 2.1.* release
+(and thereby provides continued support for "legacy" applications in Octave
+which could break by subtle, but important, changes in Octave 2.9). At same
+time, it finally introduces the newer Octave 2.9.* which is the centre of
+current development into Debian.
Deleted: trunk/packages/octave2.1/debian/README.Debian.TwoPackages
Copied: trunk/packages/octave2.1/debian/README.Debian.VersionedPackages (from rev 169, trunk/packages/octave2.1/debian/README.Debian.TwoPackages)
===================================================================
--- trunk/packages/octave2.1/debian/README.Debian.TwoPackages 2005-03-28 19:34:33 UTC (rev 169)
+++ trunk/packages/octave2.1/debian/README.Debian.VersionedPackages 2005-03-29 17:05:49 UTC (rev 172)
@@ -0,0 +1,10 @@
+
+ /usr/share/octave/site/exec
+ /site/oct
+
+ are accessed by both versions -- if your scripts or .oct files
+ conflict between the two, I suggest that you version these and set
+ the LOADPATH accordingly
+
+If you have two packages installed, make sure you call the correct mkoctfile
+and octave bug
Deleted: trunk/packages/octave2.1/debian/control
Copied: trunk/packages/octave2.1/debian/in/PACKAGE-emacsen.postinst (from rev 169, trunk/packages/octave2.1/debian/octave2.1-emacsen.postinst.in)
Copied: trunk/packages/octave2.1/debian/in/PACKAGE-emacsen.prerm (from rev 169, trunk/packages/octave2.1/debian/octave2.1-emacsen.prerm.in)
Copied: trunk/packages/octave2.1/debian/in/PACKAGE-headers.postinst (from rev 169, trunk/packages/octave2.1/debian/octave2.1-headers.postinst.in)
Copied: trunk/packages/octave2.1/debian/in/PACKAGE-headers.prerm (from rev 169, trunk/packages/octave2.1/debian/octave2.1-headers.prerm.in)
Copied: trunk/packages/octave2.1/debian/in/PACKAGE.lintian (from rev 169, trunk/packages/octave2.1/debian/octave2.1.lintian.in)
Copied: trunk/packages/octave2.1/debian/in/PACKAGE.postinst (from rev 169, trunk/packages/octave2.1/debian/octave2.1.postinst.in)
Copied: trunk/packages/octave2.1/debian/in/PACKAGE.prerm (from rev 169, trunk/packages/octave2.1/debian/octave2.1.prerm.in)
Copied: trunk/packages/octave2.1/debian/in/control (from rev 169, trunk/packages/octave2.1/debian/control)
===================================================================
--- trunk/packages/octave2.1/debian/control 2005-03-28 19:34:33 UTC (rev 169)
+++ trunk/packages/octave2.1/debian/in/control 2005-03-29 17:05:49 UTC (rev 172)
@@ -0,0 +1,117 @@
+Source: octave[V_2_1:2.1:][V_2_9:2.9:]
+Section: math
+Priority: optional
+Maintainer: Debian Octave Group <pkg-octave-devel@lists.alioth.debian.org>
+Build-Depends: debhelper (>= 3.0.0), autoconf, texinfo, tetex-bin, g77 [!m68k], fort77 [m68k], libreadline5-dev, libncurses5-dev, gperf, refblas3-dev | atlas3-base-dev, lapack3-dev | atlas3-base-dev, gnuplot, fftw3-dev, dejagnu, texi2html, less, libhdf5-serial-dev, dpatch
+Standards-Version: 3.6.1.1
+
+Package: octave[V_2_1:2.1:][V_2_9:2.9:]
+Architecture: any
+Depends: ${shlibs:Depends}, texinfo
+Suggests: gnuplot, 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 (= ${Source-Version}), octave[V_2_1:2.1:][V_2_9:2.9:]-emacsen
+Replaces: octave (<= 2.0.16-2)
+Conflicts: octave (<= 2.0.16-2)
+Provides: octave
+Description: GNU Octave language for numerical computations ([V_2_1:2.1:][V_2_9:2.9:] 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.
+ .
+ Octave uses some of the best and most respected numerical libraries as
+ balgen, dassl, eispack, fftpack, lapack, linpack, minpack, odepack,
+ ranlib, slatec-fn and villad. Octave can be dynamically extended with
+ user-supplied C++ files.
+
+Package: octave[V_2_1:2.1:][V_2_9:2.9:]-doc
+Architecture: all
+Section: doc
+Suggests: octave[V_2_1:2.1:][V_2_9:2.9:], xpdf | pdf-viewer
+Conflicts: octave-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)
+ 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.
+ .
+ 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.
+
+Package: octave[V_2_1:2.1:][V_2_9:2.9:]-htmldoc
+Architecture: all
+Suggests: octave[V_2_1:2.1:][V_2_9:2.9:], lynx | www-browser
+Conflicts: octave-htmldoc, octave2.0-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)
+ 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.
+ .
+ This packages provides the following documentation in html format:
+ the FAQ, 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 main
+ Octave package.
+
+Package: octave[V_2_1:2.1:][V_2_9:2.9:]-headers
+Architecture: any
+Depends: octave[V_2_1:2.1:][V_2_9:2.9:] (= ${Source-Version}), g++, g77 | fort77, libreadline5-dev, libncurses5-dev, libhdf5-serial-dev | libhdf5-lam-dev | libhdf5-mpich-dev, lapack3-dev | atlas3-base-dev | liblapack-3.so, refblas3-dev | atlas3-base-dev | libblas-3.so, fftw3-dev, ${m68k:Depends}
+Conflicts: octave-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)
+ 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.
+ .
+ This packages provides the include files needed to compile and link
+ user-supplied code with GNU Octave. If you only write interpreted .m files,
+ you do not need this package.
+ .
+ The package is "Architecture: any" specific as it contains architecture-
+ specific compiler switches in the mkoctfile script.
+
+Package: octave[V_2_1:2.1:][V_2_9:2.9:]-emacsen
+Architecture: all
+Depends: octave[V_2_1:2.1:][V_2_9:2.9:] | octave2.0, emacs21 | xemacs21 | emacsen, debianutils (>= 1.6)
+Replaces: octave (<= 2.0.16-2)
+Conflicts: octave2.0-emacsen
+Provides: octave-emacsen
+Description: Emacs support for the GNU Octave language ([V_2_1:2.1:][V_2_9:2.9:] 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.
+ .
+ This packages provides the elisp files for the Octave modes for GNU Emacs
+ and XEmacs.
+
+Package: octave[V_2_1:2.1:][V_2_9:2.9:]-info
+Architecture: all
+Depends: info (>= 3.12) | info-browser
+Replaces: octave (<= 2.0.16-2)
+Conflicts: octave2.0-info
+Provides: octave-info
+Description: GNU Info documentation on the GNU Octave language ([V_2_1:2.1:][V_2_9:2.9:] 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.
+ .
+ This packages provides the following documentation in info format:
+ the FAQ, a document on the C++ classes used by Octave, as well as the main
+ octave documentation which is needed for the 'help -i foo' command within
+ Octave.
+
+Package: octave
+Architecture: any
+Depends: octave[V_2_1:2.1:][V_2_9:2.9:] (>= ${Source-Version})
+Description: GNU Octave language for numerical computations ([V_2_1:2.1:][V_2_9:2.9:] 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.
+ .
+ This package is an empty 'virtual' package whose sole purpose is to
+ install the current Octave version from the [V_2_1:2.1:][V_2_9:2.9:] branch.
+ .
+ Once you have the octave[V_2_1:2.1:][V_2_9:2.9:] package installed, you can remove this package.
Copied: trunk/packages/octave2.1/debian/in/pkgver-emacsen.conffiles (from rev 169, trunk/packages/octave2.1/debian/octave2.1-emacsen.conffiles)
Copied: trunk/packages/octave2.1/debian/in/pkgver-emacsen.dirs (from rev 169, trunk/packages/octave2.1/debian/octave2.1-emacsen.dirs)
Copied: trunk/packages/octave2.1/debian/in/pkgver-emacsen.emacsen-install (from rev 169, trunk/packages/octave2.1/debian/octave2.1-emacsen.emacsen-install)
Copied: trunk/packages/octave2.1/debian/in/pkgver-emacsen.emacsen-remove (from rev 169, trunk/packages/octave2.1/debian/octave2.1-emacsen.emacsen-remove)
Copied: trunk/packages/octave2.1/debian/in/pkgver-emacsen.emacsen-startup (from rev 169, trunk/packages/octave2.1/debian/octave2.1-emacsen.emacsen-startup)
Copied: trunk/packages/octave2.1/debian/in/pkgver-htmldoc.doc-base.faq (from rev 169, trunk/packages/octave2.1/debian/octave2.1-htmldoc.doc-base.faq)
Copied: trunk/packages/octave2.1/debian/in/pkgver-htmldoc.doc-base.lib (from rev 169, trunk/packages/octave2.1/debian/octave2.1-htmldoc.doc-base.lib)
Copied: trunk/packages/octave2.1/debian/in/pkgver-htmldoc.doc-base.manual (from rev 169, trunk/packages/octave2.1/debian/octave2.1-htmldoc.doc-base.manual)
Copied: trunk/packages/octave2.1/debian/in/pkgver-htmldoc.menu (from rev 169, trunk/packages/octave2.1/debian/octave2.1-htmldoc.menu)
Copied: trunk/packages/octave2.1/debian/in/pkgver-htmldoc.postinst (from rev 169, trunk/packages/octave2.1/debian/octave2.1-htmldoc.postinst)
Copied: trunk/packages/octave2.1/debian/in/pkgver-htmldoc.prerm (from rev 169, trunk/packages/octave2.1/debian/octave2.1-htmldoc.prerm)
Copied: trunk/packages/octave2.1/debian/in/pkgver-info.postinst (from rev 169, trunk/packages/octave2.1/debian/octave2.1-info.postinst)
Copied: trunk/packages/octave2.1/debian/in/pkgver-info.prerm (from rev 169, trunk/packages/octave2.1/debian/octave2.1-info.prerm)
Copied: trunk/packages/octave2.1/debian/in/pkgver.conffiles (from rev 169, trunk/packages/octave2.1/debian/octave2.1.conffiles)
Copied: trunk/packages/octave2.1/debian/in/pkgver.dirs (from rev 169, trunk/packages/octave2.1/debian/octave2.1.dirs)
Copied: trunk/packages/octave2.1/debian/in/pkgver.menu (from rev 169, trunk/packages/octave2.1/debian/octave2.1.menu)
Deleted: trunk/packages/octave2.1/debian/octave2.1-emacsen.conffiles
Deleted: trunk/packages/octave2.1/debian/octave2.1-emacsen.dirs
Deleted: trunk/packages/octave2.1/debian/octave2.1-emacsen.emacsen-install
Deleted: trunk/packages/octave2.1/debian/octave2.1-emacsen.emacsen-remove
Deleted: trunk/packages/octave2.1/debian/octave2.1-emacsen.emacsen-startup
Deleted: trunk/packages/octave2.1/debian/octave2.1-emacsen.postinst.in
Deleted: trunk/packages/octave2.1/debian/octave2.1-emacsen.prerm.in
Deleted: trunk/packages/octave2.1/debian/octave2.1-headers.postinst.in
Deleted: trunk/packages/octave2.1/debian/octave2.1-headers.prerm.in
Deleted: trunk/packages/octave2.1/debian/octave2.1-htmldoc.doc-base.faq
Deleted: trunk/packages/octave2.1/debian/octave2.1-htmldoc.doc-base.lib
Deleted: trunk/packages/octave2.1/debian/octave2.1-htmldoc.doc-base.manual
Deleted: trunk/packages/octave2.1/debian/octave2.1-htmldoc.menu
Deleted: trunk/packages/octave2.1/debian/octave2.1-htmldoc.postinst
Deleted: trunk/packages/octave2.1/debian/octave2.1-htmldoc.prerm
Deleted: trunk/packages/octave2.1/debian/octave2.1-info.postinst
Deleted: trunk/packages/octave2.1/debian/octave2.1-info.prerm
Deleted: trunk/packages/octave2.1/debian/octave2.1.announce
Deleted: trunk/packages/octave2.1/debian/octave2.1.conffiles
Deleted: trunk/packages/octave2.1/debian/octave2.1.dirs
Deleted: trunk/packages/octave2.1/debian/octave2.1.lintian.in
Deleted: trunk/packages/octave2.1/debian/octave2.1.menu
Deleted: trunk/packages/octave2.1/debian/octave2.1.postinst.in
Deleted: trunk/packages/octave2.1/debian/octave2.1.prerm.in
Modified: trunk/packages/octave2.1/debian/rules
===================================================================
--- trunk/packages/octave2.1/debian/rules 2005-03-28 22:02:23 UTC (rev 171)
+++ trunk/packages/octave2.1/debian/rules 2005-03-29 17:05:49 UTC (rev 172)
@@ -76,6 +76,19 @@
#export DH_VERBOSE=1
#export DH_COMPAT=3
+debian/control: debian/in/control
+ slice -o UNDEF+V_`echo $(major) | sed s/\\\\./_/g`:$@ $<
+
+maintainer-clean:
+ rm -f debian/control
+
+helper-files:
+ for in in debian/in/PACKAGE* ; do \
+ out=`echo $$in | sed 's:/in/:/:;s/PACKAGE/$(PACKAGE)/'` ; \
+ sed 's/@VERSION@/$(version)/g;s/@PACKAGE@/$(PACKAGE)/g;s/@MAJOR@/$(major)/g' \
+ < $$in > $$out ; \
+ done
+
get-orig-source: upstream
upstream:
links ftp://ftp.octave.org/pub/octave/bleeding-edge
@@ -84,7 +97,7 @@
build-stamp: configure make check
touch build-stamp
-configure: patch-stamp configure-stamp
+configure: helper-files patch-stamp configure-stamp
configure-stamp:
dh_testdir
@@ -117,18 +130,6 @@
--disable-static \
--build $(arch)
- # prepare the postinst and prerm files for the given version number
- @for i in octave2.1 octave2.1-headers octave2.1-emacsen; do \
- for j in postinst prerm; do \
- perl -p -e 's/\@VERSION@/$(version)/' \
- < debian/$${i}.$${j}.in > debian/$${i}.$${j}; \
- done ; \
- done
-
- # fix the lintian override and bring it up to date
- perl -p -e 's/\@VERSION@/$(version)/g' < debian/octave2.1.lintian.in \
- > debian/octave2.1.lintian
-
pod2man debian/octave-depends > octave-depends.1
touch configure-stamp
@@ -166,6 +167,11 @@
done ; \
done
rm -f debian/octave2.1.lintian octave-depends.1
+
+ for in in debian/in/PACKAGE* ; do \
+ rm -f `echo $$in | sed 's:/in/:/:;s/PACKAGE/$(PACKAGE)/'` ; \
+ done
+
dh_clean
# install files
@@ -296,6 +302,6 @@
source diff:
@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-binary: install binary-arch binary-indep
+binary: install helper-files binary-arch binary-indep
.PHONY: build clean make configure binary-indep binary-arch binary