[Pkg-octave-commit] rev 784 - in trunk/packages/octave/debian: . in
patches
Rafael Laboissiere
rafael at costa.debian.org
Tue Oct 24 02:08:56 UTC 2006
Author: rafael
Date: 2006-10-24 02:08:55 +0000 (Tue, 24 Oct 2006)
New Revision: 784
Added:
trunk/packages/octave/debian/patches/50_rename-octave-tags.dpatch
Modified:
trunk/packages/octave/debian/changelog
trunk/packages/octave/debian/in/PACKAGE-emacsen.postinst
trunk/packages/octave/debian/in/PACKAGE-emacsen.prerm
trunk/packages/octave/debian/in/octave-update-alternatives
trunk/packages/octave/debian/in/octave2.1-00list
trunk/packages/octave/debian/rules
Log:
Debian release octave2.1_1:2.1.73-13
Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog 2006-10-23 23:43:59 UTC (rev 783)
+++ trunk/packages/octave/debian/changelog 2006-10-24 02:08:55 UTC (rev 784)
@@ -1,3 +1,14 @@
+octave2.1 (1:2.1.73-13) unstable; urgency=low
+
+ * debian/rules, debian/in/PACKAGE-emacsen.{postinst,prerm}: Renamed
+ otags to be octave-tags, avoiding clashes with the Ocaml otags package
+ (closes: #394789).
+ * debian/patches/50_rename-octave-tags.dpatch: Added patch for renaming
+ otags to be octave-tags in the upstream files. These changes have been
+ also applied in upstream CVS.
+
+ -- Rafael Laboissiere <rafael at debian.org> Tue, 24 Oct 2006 02:41:03 +0200
+
octave2.1 (1:2.1.73-12) unstable; urgency=low
* Rebuilt with gnuplot-nox build-dependency instead of gnuplot, in order
Modified: trunk/packages/octave/debian/in/PACKAGE-emacsen.postinst
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-emacsen.postinst 2006-10-23 23:43:59 UTC (rev 783)
+++ trunk/packages/octave/debian/in/PACKAGE-emacsen.postinst 2006-10-24 02:08:55 UTC (rev 784)
@@ -17,11 +17,11 @@
configure)
#
# update-alternatives for multiple Octave versions
- update-alternatives --install /usr/bin/otags otags \
- /usr/bin/otags-$VERSION $PRIORITY \
- --slave /usr/share/man/man1/otags.1.gz \
- otags.1.gz \
- /usr/share/man/man1/otags-$VERSION.1.gz
+ update-alternatives --install /usr/bin/octave-tags octave-tags \
+ /usr/bin/octave-tags-$VERSION $PRIORITY \
+ --slave /usr/share/man/man1/octave-tags.1.gz \
+ octave-tags.1.gz \
+ /usr/share/man/man1/octave-tags-$VERSION.1.gz
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
Modified: trunk/packages/octave/debian/in/PACKAGE-emacsen.prerm
===================================================================
--- trunk/packages/octave/debian/in/PACKAGE-emacsen.prerm 2006-10-23 23:43:59 UTC (rev 783)
+++ trunk/packages/octave/debian/in/PACKAGE-emacsen.prerm 2006-10-24 02:08:55 UTC (rev 784)
@@ -15,7 +15,7 @@
remove|upgrade|deconfigure)
#
# update-alternatives for multiple Octave versions
- update-alternatives --remove otags /usr/bin/otags-$VERSION
+ update-alternatives --remove octave-tags /usr/bin/octave-tags-$VERSION
;;
failed-upgrade)
;;
Modified: trunk/packages/octave/debian/in/octave-update-alternatives
===================================================================
--- trunk/packages/octave/debian/in/octave-update-alternatives 2006-10-23 23:43:59 UTC (rev 783)
+++ trunk/packages/octave/debian/in/octave-update-alternatives 2006-10-24 02:08:55 UTC (rev 784)
@@ -29,9 +29,9 @@
${bin}octave-bug-$VERSION \
--slave ${man}octave-bug.1.gz \
octave-bug.1.gz \
- ${man}octave-bug-$VERSION.1.gz"
+ ${man}octave-bug-$VERSION.1.gz"
;;
-
+
octave2.?-headers ) if [ $REMOVE = $g ];then ;; fi
HEADERS="--slave ${bin}mkoctfile mkoctfile \
${bin}mkoctfile-$VERSION \
@@ -59,10 +59,10 @@
;;
octave2.?-emacsen ) if [ $REMOVE = $g ];then ;; fi
- EMACS="--slave ${bin}otags otags \
- ${bin}otags-$VERSION \
- --slave ${man}otags.1.gz otags.1.gz \
- ${man}otags-$VERSION.1.gz"
+ EMACS="--slave ${bin}octave-tags octave-tags \
+ ${bin}octave-tags-$VERSION \
+ --slave ${man}octave-tags.1.gz octave-tags.1.gz \
+ ${man}octave-tags-$VERSION.1.gz"
;;
octave2.?-info ) if [ -n `dpgk -l | grep -o "octave$v` ]
@@ -78,7 +78,7 @@
Octave-FAQ.info.gz \
${info}Octave$v-FAQ.info.gz"
else
- for f in octave at v liboctave at v Octave at v-FAQ
+ for f in octave at v liboctave at v Octave at v-FAQ
do
i=`echo $f | sed s/@v//`
h=`echo $f | sed s/@v/$v/`
@@ -86,7 +86,7 @@
then
INFO="--remove $i.info.gz \
/usr/share/info/$h.info.gz"
- else
+ else
INFO="--install ${info}$h.info.gz \
$i.info.gz \
${info}$i.info.gz \
@@ -103,9 +103,9 @@
# mex.1.gz \
# ${man}mex-$VERSION.1.gz"
# ;;
-
+
esac
fi
done
update-alternatives $OCTAVE $HEADERS $EMACS $INFO $FORGE
-done
+done
Modified: trunk/packages/octave/debian/in/octave2.1-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.1-00list 2006-10-23 23:43:59 UTC (rev 783)
+++ trunk/packages/octave/debian/in/octave2.1-00list 2006-10-24 02:08:55 UTC (rev 784)
@@ -7,3 +7,4 @@
50_OCTAVEHOME-texi.dpatch
50_octave-bug-tempfile
50_clean-pdf-docs
+50_rename-octave-tags
Added: trunk/packages/octave/debian/patches/50_rename-octave-tags.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_rename-octave-tags.dpatch (rev 0)
+++ trunk/packages/octave/debian/patches/50_rename-octave-tags.dpatch 2006-10-24 02:08:55 UTC (rev 784)
@@ -0,0 +1,60 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_rename-octave-tags.dpatch by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Rename otags to be octave-tags, to avoid conflict with the Ocaml otags
+## DP: package. These changes are already in upstream CVS.
+
+ at DPATCH@
+
+--- octave2.1-2.1.73.orig/doc/interpreter/emacs.txi
++++ octave2.1-2.1.73/doc/interpreter/emacs.txi
+@@ -339,9 +339,9 @@
+
+ @cindex TAGS
+ @cindex Emacs TAGS files
+- at cindex @code{otags}
++ at cindex @code{octave-tags}
+ You can generate TAGS files for Emacs from Octave @file{.m} files using
+-the shell script @code{otags} that is installed alongside your copy of
++the shell script @code{octave-tags} that is installed alongside your copy of
+ Octave.
+
+ Customization of Octave mode can be performed by modification of the
+--- octave2.1-2.1.73.orig/emacs/otags
++++ octave2.1-2.1.73/emacs/otags
+@@ -2,7 +2,7 @@
+
+ # Generate a TAGS file from a set of Octave .m files for use with Emacs.
+ #
+-# Run as '$ otags' in the given Octave directory to generate a
++# Run as '$ octave-tags' in the given Octave directory to generate a
+ # TAGS file. If you want to include another directory, add a line
+ # prior to the "*.m" line containing something like
+ # `--include=/path/to/other/directory/TAGS" \'.
+--- octave2.1-2.1.73.orig/emacs/otags.1
++++ octave2.1-2.1.73/emacs/otags.1
+@@ -1,19 +1,19 @@
+ .\" Man page contributed by Dirk Eddelbuettel <edd at debian.org>
+ .\" and released under the GNU GPL
+-.TH OTAGS 1 "31 October 2001" "GNU Octave"
++.TH OCTAVE-TAGS 1 "31 October 2001" "GNU Octave"
+ .SH NAME
+-OTAGS - Generate Emacs tags file from GNU Octave code
++OCTAVE-TAGS - Generate Emacs tags file from GNU Octave code
+ .SH SYNOPSIS
+-.BR otags\ [--include\ dir]
++.BR octave-tags\ [--include\ dir]
+ \fIfile\fP .\|.\|.
+ .SH DESCRIPTION
+ .PP
+-.B otags
++.B octave-tags
+ program is used to create a tag table file, in a format understood by
+ .BR emacs (1)
+ and
+ .BR xemacs (1).
+-.B otags
++.B octave-tags
+ reads the files specified on the command line, and write a tag table
+ (defaults: `TAGS') in the current working directory. Files specified with
+ relative file names will be recorded in the tag table with file names
Property changes on: trunk/packages/octave/debian/patches/50_rename-octave-tags.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules 2006-10-23 23:43:59 UTC (rev 783)
+++ trunk/packages/octave/debian/rules 2006-10-24 02:08:55 UTC (rev 784)
@@ -285,9 +285,9 @@
install -p -m 0644 emacs/*.el $(deblsp)
dh_installemacsen -p$(emacs_package)
install -p -m 0755 emacs/otags \
- $(debbase)/$(emacs_package)/usr/bin/otags-$(version)
+ $(debbase)/$(emacs_package)/usr/bin/octave-tags-$(version)
install -p -m 0644 emacs/otags.1 \
- $(debbase)/$(emacs_package)/usr/share/man/man1/otags-$(version).1
+ $(debbase)/$(emacs_package)/usr/share/man/man1/octave-tags-$(version).1
dh_installchangelogs -i ChangeLog
dh_compress -i
More information about the Pkg-octave-commit
mailing list