[Pkg-octave-commit] rev 318 - in trunk/packages/octave/debian: . in
Rafael Laboissiere
rafael at costa.debian.org
Mon Nov 14 16:51:23 UTC 2005
Author: rafael
Date: 2005-11-14 16:51:22 +0000 (Mon, 14 Nov 2005)
New Revision: 318
Modified:
trunk/packages/octave/debian/changelog
trunk/packages/octave/debian/in/PACKAGE-emacsen.postinst
trunk/packages/octave/debian/in/PACKAGE-headers.postinst
trunk/packages/octave/debian/in/PACKAGE-headers.prerm
trunk/packages/octave/debian/in/PACKAGE-info.postinst
trunk/packages/octave/debian/in/PACKAGE.postinst
trunk/packages/octave/debian/in/PACKAGE.prerm
trunk/packages/octave/debian/rules
Log:
Debian release octave2.1_2.1.72-1
Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog 2005-11-13 22:19:18 UTC (rev 317)
+++ trunk/packages/octave/debian/changelog 2005-11-14 16:51:22 UTC (rev 318)
@@ -1,9 +1,7 @@
octave2.1 (2.1.72-1) unstable; urgency=low
- NOT YET RELEASED!
+ +++ Changes by Rafael Laboissiere
- +++ Changes by Rafael Laboissiere
-
* New upstream release
* debian/in/octave2.1-00list: Removed patch
50_no-check-nested-functions-2.1, which has been applied upstream
@@ -22,8 +20,12 @@
- (make-stamp) Save texi files in *-save and replace setfilename
macros with versioned names
- (clean) Recover original *.texi files
- * debian/in/PACKAGE-headers.postinst: Install alternatives to
- octave-depends and defs.make
+ - Substitute PRIORITY variable in debian/in/*.postinst scripts,
+ with octave2.1 taking high priority than octave2.9 for all
+ alternatives set through update-alternatives
+ * debian/in/PACKAGE-headers.{postinst,prerm}: Install/remove
+ alternatives to octave-depends and defs.make
+ * debian/in/*.postinst: Set PRIORITY variable
* debian/in/PACKAGE-info.postinst:
- Install versioned info files
- Set alternatives to all versioned info files
@@ -35,7 +37,7 @@
* debian/in/PACKAGE-htmldoc.postinst: Removed this script, because it
does nothing more than include the debhelper-generated one
- --
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org> Sun, 13 Nov 2005 22:58:51 +0100
octave2.9 (2.9.3-1) experimental; urgency=low
Modified: trunk/packages/octave/debian/in/PACKAGE-emacsen.postinst
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-emacsen.postinst 2005-11-13 22:19:18 UTC (rev 317)
+++ trunk/packages/octave/debian/in/PACKAGE-emacsen.postinst 2005-11-14 16:51:22 UTC (rev 318)
@@ -3,7 +3,7 @@
# postinst script for the Debian GNU/Linux octave package
#
# Initial version written by Andrew D. Fernandes <adfernan at cnd.mcgill.ca>
-# This version written by Dirk Eddelbuettel <edd at debian.org>
+# This version written by Dirk Eddelbuettel <edd at debian.org>
set -e
@@ -11,13 +11,14 @@
# The current Octave version, known to debian/rules at build time
VERSION=@VERSION@
+PRIORITY=@PRIORITY@
case "$1" in
- configure)
+ configure)
#
# update-alternatives for multiple Octave versions
update-alternatives --install /usr/bin/otags otags \
- /usr/bin/otags-$VERSION 10 \
+ /usr/bin/otags-$VERSION $PRIORITY \
--slave /usr/share/man/man1/otags.1.gz \
otags.1.gz \
/usr/share/man/man1/otags-$VERSION.1.gz
@@ -29,4 +30,4 @@
;;
esac
-exit 0
+exit 0
Modified: trunk/packages/octave/debian/in/PACKAGE-headers.postinst
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-headers.postinst 2005-11-13 22:19:18 UTC (rev 317)
+++ trunk/packages/octave/debian/in/PACKAGE-headers.postinst 2005-11-14 16:51:22 UTC (rev 318)
@@ -8,6 +8,7 @@
# The current Octave version, known to debian/rules at build time
VERSION=@VERSION@
+PRIORITY=@PRIORITY@
case "$1" in
configure)
@@ -16,16 +17,21 @@
for f in mkoctfile octave-config octave-depends ; do
update-alternatives --install /usr/bin/$f $f \
- /usr/bin/$f-$VERSION 15 \
+ /usr/bin/$f-$VERSION $PRIORITY \
--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/include/octave octave-include \
+ /usr/include/octave-$VERSION $PRIORITY
+
+ update-alternatives \
+ --install /usr/share/octave/debian/defs.make \
+ octave-defs.make \
+ /usr/share/octave/debian/defs.make-$VERSION \
+ $PRIORITY
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
Modified: trunk/packages/octave/debian/in/PACKAGE-headers.prerm
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-headers.prerm 2005-11-13 22:19:18 UTC (rev 317)
+++ trunk/packages/octave/debian/in/PACKAGE-headers.prerm 2005-11-14 16:51:22 UTC (rev 318)
@@ -2,9 +2,9 @@
#
# prerm script for the Debian GNU/Linux octave2.0-headers package
#
-# Written by Dirk Eddelbuettel <edd at debian.org>
+# Written by Dirk Eddelbuettel <edd at debian.org>
-#DEBHELPER#
+#DEBHELPER#
# The current Octave version, known to debian/rules at build time
VERSION=@VERSION@
@@ -13,8 +13,14 @@
remove|upgrade|deconfigure)
#
# update-alternatives for multiple Octave versions
- update-alternatives --remove mkoctfile /usr/bin/mkoctfile-$VERSION
- update-alternatives --remove octave-include /usr/include/octave-$VERSION
+ for f in mkoctfile octave-config octave-depends ; do
+ update-alternatives --remove $f /usr/bin/$f-$VERSION
+ done
+ update-alternatives --remove octave-include \
+ /usr/include/octave-$VERSION
+ update-alternatives --remove octave-defs.make \
+ /usr/share/octave/debian/defs.make-$VERSION
+
;;
failed-upgrade)
;;
@@ -22,7 +28,7 @@
echo "prerm called with unknown argument \`$1'" >&2
exit 0
;;
-esac
+esac
Modified: trunk/packages/octave/debian/in/PACKAGE-info.postinst
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-info.postinst 2005-11-13 22:19:18 UTC (rev 317)
+++ trunk/packages/octave/debian/in/PACKAGE-info.postinst 2005-11-14 16:51:22 UTC (rev 318)
@@ -3,17 +3,18 @@
# postinst script for the Debian GNU/Linux octave package
#
# Initial version written by Andrew D. Fernandes <adfernan at cnd.mcgill.ca>
-# This version written by Dirk Eddelbuettel <edd at debian.org>
+# This version written by Dirk Eddelbuettel <edd at debian.org>
set -e
# The current Octave version, known to debian/rules at build time
MAJOR=@MAJOR@
+PRIORITY=@PRIORITY@
#DEBHELPER#
case "$1" in
- configure)
+ configure)
install-info --quiet --section "Math" "Octave" \
--description="The GNU Octave ($MAJOR) language for numerical computations."\
/usr/share/info/octave$MAJOR.info.gz
@@ -24,11 +25,11 @@
--description="The GNU Octave ($MAJOR) FAQ."\
/usr/share/info/Octave$MAJOR-FAQ.info.gz
- for f in octave liboctave Octave-FAQ ; do \
- update-alternatives --install \
- /usr/share/info/$f.info.gz \
- $f.info.gz \
- /usr/share/info/$f$MAJOR.info.gz 15
+ for f in octave liboctave Octave-FAQ ; do \
+ update-alternatives --install \
+ /usr/share/info/$f.info.gz \
+ $f.info.gz \
+ /usr/share/info/$f$MAJOR.info.gz $PRIORITY
done
;;
@@ -39,4 +40,4 @@
;;
esac
-exit 0
+exit 0
Modified: trunk/packages/octave/debian/in/PACKAGE.postinst
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE.postinst 2005-11-13 22:19:18 UTC (rev 317)
+++ trunk/packages/octave/debian/in/PACKAGE.postinst 2005-11-14 16:51:22 UTC (rev 318)
@@ -9,6 +9,7 @@
# The current Octave version, known to debian/rules at build time
VERSION=@VERSION@
+PRIORITY=@PRIORITY@
case "$1" in
configure)
@@ -27,21 +28,14 @@
fi
#
# update-alternatives for multiple Octave versions
- update-alternatives --install /usr/bin/octave octave \
- /usr/bin/octave-$VERSION 30 \
- --slave /usr/share/man/man1/octave.1.gz \
- octave.1.gz \
- /usr/share/man/man1/octave-$VERSION.1.gz
- update-alternatives --install /usr/bin/@PACKAGE@ @PACKAGE@ \
- /usr/bin/octave-$VERSION 30 \
- --slave /usr/share/man/man1/@PACKAGE at .1.gz \
- @PACKAGE at .1.gz \
- /usr/share/man/man1/octave-$VERSION.1.gz
- update-alternatives --install /usr/bin/octave-bug octave-bug \
- /usr/bin/octave-bug-$VERSION 30 \
- --slave /usr/share/man/man1/octave-bug.1.gz \
- octave-bug.1.gz \
- /usr/share/man/man1/octave-bug-$VERSION.1.gz
+ for f in octave octave-bug ; do
+ update-alternatives \
+ --install /usr/bin/$f $f \
+ /usr/bin/$f-$VERSION $PRIORITY \
+ --slave /usr/share/man/man1/$f.1.gz $f.1.gz \
+ /usr/share/man/man1/$f-$VERSION.1.gz
+ done
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
Modified: trunk/packages/octave/debian/in/PACKAGE.prerm
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE.prerm 2005-11-13 22:19:18 UTC (rev 317)
+++ trunk/packages/octave/debian/in/PACKAGE.prerm 2005-11-14 16:51:22 UTC (rev 318)
@@ -26,10 +26,10 @@
fi
#
# update-alternatives for multiple Octave versions
- update-alternatives --remove octave /usr/bin/octave-$VERSION
- update-alternatives --remove @PACKAGE@ /usr/bin/octave-$VERSION
- update-alternatives --remove octave-bug /usr/bin/octave-bug-$VERSION
- update-alternatives --remove octave-config /usr/bin/octave-config-$VERSION
+ for f in octave octave-bug ; do
+ update-alternatives --remove $f /usr/bin/$f-$VERSION
+ done
+
;;
failed-upgrade)
;;
Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules 2005-11-13 22:19:18 UTC (rev 317)
+++ trunk/packages/octave/debian/rules 2005-11-14 16:51:22 UTC (rev 318)
@@ -18,6 +18,12 @@
major := $(shell head -1 debian/changelog | perl -nle \
'm/\S+\s+\((\d\.\d)\.\d+-\S+\)/ and print $$1')
+ifeq ($(major),2.1)
+priority := 80
+else
+priority := 70
+endif
+
doc_package = $(PACKAGE)-doc
html_package = $(PACKAGE)-htmldoc
dev_package = $(PACKAGE)-headers
@@ -89,7 +95,7 @@
maintainer-scripts:
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' \
+ sed 's/@VERSION@/$(version)/g;s/@PACKAGE@/$(PACKAGE)/g;s/@MAJOR@/$(major)/g;s/@PRIORITY@/$(priority)/g;' \
< $$in > $$out ; \
done
sed 's/@MAJOR@/$(major)/g' < debian/in/watch > debian/watch
@@ -139,11 +145,6 @@
pod2man debian/octave-depends > octave-depends-$(version).1
- touch configure-stamp
-
-make: configure-stamp make-stamp
-make-stamp:
-
for f in $(texifiles) ; do \
cp $$f $$f-save ; \
perl -pi -e 's/^(\@setfilename .+ctave)/$${1}$(major)/' \
@@ -152,7 +153,10 @@
# The following will prevent the build of pre-formatted docs
touch doc/*/*.{dvi,ps,pdf,html}
+ touch configure-stamp
+make: configure-stamp make-stamp
+make-stamp:
$(MAKE) CFLAGS="$(compilerflags)" \
CXXFLAGS="$(compilerflags)" \
FFLAGS="$(compilerflags)" \
@@ -176,7 +180,7 @@
-rm -vrf libcruft/libcruft.so libcruft/*/Makefile \
install.octave scripts/gethelp libcruft/misc/*.d \
scripts/autom4te.cache config.log Makefrag.f77 \
- src/PKG_ADD src/pic src/*.oct src/*.df
+ src/PKG_ADD src/pic src/*.oct src/*.df doc/*/HTML
##doc/interpreter/octave.{dvi,ps} doc/faq/Octave-FAQ_*.html
##scripts/DOCSTRINGS
test ! -f octave-bug.in.orig || mv octave-bug.in.orig octave-bug.in
@@ -277,9 +281,10 @@
usr/share/man/man1/octave-depends-$(version).1 \
usr/share/octave/debian/defs.make-$(version)
rm -r $(debtmp)/usr/include
+ rm -rf $(debtmp)/usr/share/info
# save the info files for the info package
- dh_movefiles -p$(info_package) --sourcedir=debian/$(PACKAGE) \
- usr/share/info/
+ #dh_movefiles -p$(info_package) --sourcedir=debian/$(PACKAGE) \
+ # usr/share/info/
# install /etc/octave.conf
install -p -m 0644 debian/octave.conf $(debtmp)/etc/$(PACKAGE).conf
# install lintian overrride
@@ -290,7 +295,7 @@
## this file would exist under 2.0 and 2.1 with the same name
rm -v $(debini)/octaverc
# already installed by make
- dh_installinfo -n -p$(info_package) doc/*/*.info*
+ dh_installinfo -n -p$(info_package) doc/*/*$(major)*.info*
dh_installdocs -a README README.kpathsea \
NEWS* PROJECTS
dh_installdocs -p$(PACKAGE) debian/README.Atlas
More information about the Pkg-octave-commit
mailing list