[Pkg-octave-commit] rev 314 - in trunk/packages/octave/debian: . in
Rafael Laboissiere
rafael at costa.debian.org
Sat Nov 12 18:42:32 UTC 2005
Author: rafael
Date: 2005-11-12 18:42:31 +0000 (Sat, 12 Nov 2005)
New Revision: 314
Modified:
trunk/packages/octave/debian/changelog
trunk/packages/octave/debian/in/PACKAGE-headers.postinst
trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.faq
trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib
trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.manual
trunk/packages/octave/debian/rules
Log:
Preliminary changes to get octave2.1-* and octave2.9-* packages installable
simultaneously. Not yet fully tested.
Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog 2005-11-05 09:31:17 UTC (rev 313)
+++ trunk/packages/octave/debian/changelog 2005-11-12 18:42:31 UTC (rev 314)
@@ -1,9 +1,20 @@
-octave2.9 (2.1.71-8) unstable; urgency=low
+octave2.9 (2.9.3-2) experimental; urgency=low
NOT YET RELEASED!
+++ Changes by Rafael Laboissiere
+ * Packages octave2.1-* and octave2.9-* can now be installed together
+ (FIXME: THIS DOES NOT WORK FOR octave2.x-info YET!!!)
+ * debian/control: Packages octave*-headers, octave*-doc, and
+ octave*-htmldoc conflict with versions << 2.1
+ * debian/in/PACKAGE-htmldoc.doc-base.*: Make versioned documents for
+ doc-base
+ * debian/rules: Install versioned octave-depends, defs.make, and
+ and 50octave.el files
+ * debian/in/PACKAGE-headers.postinst: Install alternatives to
+ octave-depends and defs.make
+
* debian/rules: cope with the new output of dpkg-architecture for arm
and m68k, which changed recently (thanks to Christian T. Steigies
<cts at debian.org> for spotting the problem)
Modified: trunk/packages/octave/debian/in/PACKAGE-headers.postinst
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-headers.postinst 2005-11-05 09:31:17 UTC (rev 313)
+++ trunk/packages/octave/debian/in/PACKAGE-headers.postinst 2005-11-12 18:42:31 UTC (rev 314)
@@ -14,21 +14,18 @@
#
# update-alternatives for multiple Octave versions
- update-alternatives --install /usr/bin/mkoctfile mkoctfile \
- /usr/bin/mkoctfile-$VERSION 15 \
- --slave /usr/share/man/man1/mkoctfile.1.gz \
- mkoctfile.1.gz \
- /usr/share/man/man1/mkoctfile-$VERSION.1.gz
+ for f in mkoctfile octave-config octave-depends ; do
+ update-alternatives --install /usr/bin/$f $f \
+ /usr/bin/$f-$VERSION 15 \
+ --slave /usr/share/man/man1/$f.1.gz $f.1.gz \
+ /usr/share/man/man1/$f-$VERSION.1.gz
+ done
+
+ for f in /usr/include/octave /usr/share/octave/debian/defs.make ; do
+ l=`echo $f | sed "s:.*/::"`
+ update-alternatives --install $f $l $f-$VERSION 15
+ done
- update-alternatives --install /usr/bin/octave-config octave-config \
- /usr/bin/octave-config-$VERSION 30 \
- --slave /usr/share/man/man1/octave-config.1.gz \
- octave-config.1.gz \
- /usr/share/man/man1/octave-config-$VERSION.1.gz
-
- update-alternatives --install /usr/include/octave octave-include\
- /usr/include/octave-$VERSION 15 \
-
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
Modified: trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.faq
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.faq 2005-11-05 09:31:17 UTC (rev 313)
+++ trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.faq 2005-11-12 18:42:31 UTC (rev 314)
@@ -1,11 +1,11 @@
-Document: octave-faq
-Title: The GNU Octave FAQ
+Document: octave at MAJOR@-faq
+Title: The GNU Octave FAQ (@MAJOR@ branch)
Author: John W. Eaton
-Abstract: This document provides answers to Frequently Asked
- Questions about Octave, a (mostly Matlab (R) compatible)
- high-level language, primarily intended for numerical
- computations. Octave provides a convenient command-line
- interface for solving linear and nonlinear problems
+Abstract: This document provides answers to Frequently Asked
+ Questions about Octave, a (mostly Matlab (R) compatible)
+ high-level language, primarily intended for numerical
+ computations. Octave provides a convenient command-line
+ interface for solving linear and nonlinear problems
numerically.
Section: Apps/Math
Modified: trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib 2005-11-05 09:31:17 UTC (rev 313)
+++ trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.lib 2005-11-12 18:42:31 UTC (rev 314)
@@ -1,10 +1,10 @@
-Document: octave-lib
-Title: The GNU Octave Library
+Document: octave at MAJOR@-lib
+Title: The GNU Octave Library (@MAJOR@ branch)
Author: John W. Eaton
-Abstract: This document describes the Octave libraries. Octave
- is a (mostly Matlab (R) compatible) high-level
- language, primarily intended for numerical computations.
- It provides a convenient command-line interface for solving
+Abstract: This document describes the Octave libraries. 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.
Section: Apps/Math
Modified: trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.manual
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.manual 2005-11-05 09:31:17 UTC (rev 313)
+++ trunk/packages/octave/debian/in/PACKAGE-htmldoc.doc-base.manual 2005-11-12 18:42:31 UTC (rev 314)
@@ -1,10 +1,10 @@
-Document: octave-manual
-Title: The GNU Octave Manual
+Document: octave at MAJOR@-manual
+Title: The GNU Octave Manual (@MAJOR@ branch)
Author: John W. Eaton
-Abstract: 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.
+Abstract: 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.
Section: Apps/Math
Format: HTML
Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules 2005-11-05 09:31:17 UTC (rev 313)
+++ trunk/packages/octave/debian/rules 2005-11-12 18:42:31 UTC (rev 314)
@@ -132,7 +132,7 @@
--disable-static \
--build $(arch)
- pod2man debian/octave-depends > octave-depends.1
+ pod2man debian/octave-depends > octave-depends-$(version).1
touch configure-stamp
@@ -167,7 +167,7 @@
test ! -f octave-bug.in.orig || mv octave-bug.in.orig octave-bug.in
rm -f `ls debian/in/PACKAGE* | sed 's/PACKAGE/$(PACKAGE)/;s:/in::'`
- rm -f octave-depends.1
+ rm -f octave-depends-$(version).1
dh_clean
@@ -185,9 +185,11 @@
libdir=$(debtmp)/usr/lib \
libexecdir=$(debtmp)/usr/lib \
mandir=$(debtmp)/usr/share/man install
- dh_installman octave-depends.1
- install debian/octave-depends $(debtmp)/usr/bin
- install --mode=644 debian/defs.make $(debtmp)/usr/share/octave/debian
+ dh_installman octave-depends-$(version).1
+ install debian/octave-depends \
+ $(debtmp)/usr/bin/octave-depends-$(version)
+ install --mode=644 debian/defs.make \
+ $(debtmp)/usr/share/octave/debian/defs.make-$(version)
(cd $(debtmp)/usr/share/man/man1; \
mv -v octave.1 octave-$(version).1; \
mv -v octave-bug.1 octave-bug-$(version).1; \
@@ -216,8 +218,8 @@
install -p -m 0644 emacs/otags.1 \
$(debbase)/$(emacs_package)/usr/share/man/man1/otags-$(version).1
# fix emacs startup name
- (cd debian/$(emacs_package)/etc/emacs/site-start.d/; \
- mv 50$(emacs_package).el 50$(source).el)
+# (cd debian/$(emacs_package)/etc/emacs/site-start.d/; \
+# mv 50$(emacs_package).el 50$(source).el)
# dh_installexamples -i
# dh_installmenu -p$(html_package)
# dh_installinit -i
@@ -249,11 +251,11 @@
usr/include/ \
usr/bin/mkoctfile-$(version) \
usr/bin/octave-config-$(version) \
- usr/bin/octave-depends \
+ usr/bin/octave-depends-$(version) \
usr/share/man/man1/mkoctfile-$(version).1 \
usr/share/man/man1/octave-config-$(version).1 \
- usr/share/man/man1/octave-depends.1 \
- usr/share/octave/debian/defs.make
+ usr/share/man/man1/octave-depends-$(version).1 \
+ usr/share/octave/debian/defs.make-$(version)
rm -r $(debtmp)/usr/include
# save the info files for the info package
dh_movefiles -p$(info_package) --sourcedir=debian/$(PACKAGE) \
More information about the Pkg-octave-commit
mailing list