[Pkg-octave-commit] rev 236 - in trunk/packages/octave/debian: . in
patches
Rafael Laboissiere
rafael at costa.debian.org
Tue Sep 6 20:59:43 UTC 2005
Author: rafael
Date: 2005-09-06 20:59:42 +0000 (Tue, 06 Sep 2005)
New Revision: 236
Added:
trunk/packages/octave/debian/changelog-old
trunk/packages/octave/debian/compat
trunk/packages/octave/debian/patches/50_no-check-nested-functions.dpatch
Removed:
trunk/packages/octave/debian/in/PACKAGE-emacsen.conffiles
trunk/packages/octave/debian/in/PACKAGE.conffiles
trunk/packages/octave/debian/octave-config.1
Modified:
trunk/packages/octave/debian/changelog
trunk/packages/octave/debian/copyright
trunk/packages/octave/debian/patches/00list
trunk/packages/octave/debian/rules
Log:
Preparation for Debian release 2.1.71-3
Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog 2005-07-09 19:38:25 UTC (rev 235)
+++ trunk/packages/octave/debian/changelog 2005-09-06 20:59:42 UTC (rev 236)
@@ -1,3 +1,41 @@
+octave2.1 (2.1.71-3) unstable; urgency=low
+
+ NOT YET RELEASED !!!
+
+ +++ Changes by Rafael Laboissiere
+
+ * Recompiled against libhdf5-serial-1.6.4-0c2. This should complete the
+ C++ ABI transition for the octave2.1 package.
+
+ * debian/compat: Created this file, containing the compatibility level 4
+ for debhelper. This avoids warning messages from the debhelper
+ scripts.
+ * debian/rules: Change installation directory from debian/tmp to
+ debian/octave2.1 and also gives the later as --sourcedir for the
+ dh_movefiles command. This allows building the package under
+ debhelper compatibility level = 4.
+ * debian/in/PACKAGE.conffiles, debian/octave2.1.conffiles,
+ debian/in/PACKAGE-emacsen.conffiles,
+ debian/octave2.1-emacsen.conffiles: Removed files, since debhelper in
+ compatibility level 4 adds automatically all files in /etc/ to the
+ conffiles file.
+
+ * debian/copyright: Updated Free Software Foundation address.
+
+ * debian/changelog: Removed all instances of the deprecated
+ "[Cc]loses=*" from the package version lines. Removed all the entries
+ before version 1.1.1-7, because they were not in the correct format.
+ This legacy material is now in debian/changelog-old.
+
+ * debian/patches/50_no-check-nested-functions.dpatch: Added patch which
+ avoid global function definitions to take over local ones (see
+ http://www.octave.org/mailing-lists/help-octave/2005/3189).
+
+ * debian/octave-config.1: Removed this file, since there is another one
+ upstream which is up-to-date (in doc/interpreter).
+
+ --
+
octave2.1 (2.1.71-2) unstable; urgency=low
+++ Changes by Rafael Laboissiere
@@ -1035,7 +1073,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Sun, 15 Aug 1999 17:26:47 -0400
-octave (2.0.14-1) unstable; urgency=low, Closes=35751
+octave (2.0.14-1) unstable; urgency=low
* Upgraded to new upstream release 2.0.14
@@ -1050,7 +1088,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Wed, 31 Mar 1999 07:58:40 -0500
-octave (2.0.13.96-3) unstable; urgency=low, Closes=27707
+octave (2.0.13.96-3) unstable; urgency=low
* Starting with this release of the Debian package, Octave is linked
against Debian's copy of libreadline (instead of its own) as Debian's
@@ -1062,7 +1100,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Wed, 24 Mar 1999 20:15:53 -0500
-octave (2.0.13.96-2) unstable; urgency=low, Closes=32802
+octave (2.0.13.96-2) unstable; urgency=low
* debian/octave.conffiles: Registered the emacs config file
/etc/emacs/site-start.d/50octave.el as a conffile (fixes #32802)
@@ -1083,7 +1121,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Thu, 10 Dec 1998 19:52:59 -0500
-octave (2.0.13.94-2) frozen unstable; urgency=low, Closes=30377
+octave (2.0.13.94-2) frozen unstable; urgency=low
* Applied patch from foka at debian.org to mkoctfile.in (fixes #30377)
* Made emacsen install script output slightly less verbose
@@ -1101,7 +1139,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Fri, 4 Dec 1998 20:44:57 -0500
-octave (2.0.13.93-1) frozen unstable; urgency=low, Closes=29674
+octave (2.0.13.93-1) frozen unstable; urgency=low
* Upgraded to fourth pre-release of Octave 2.0.14 which contains
an upstream bug fix to Bessel function arguments
@@ -1110,7 +1148,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Wed, 18 Nov 1998 19:51:24 -0500
-octave (2.0.13.92-1) frozen unstable; urgency=low, Closes=27516
+octave (2.0.13.92-1) frozen unstable; urgency=low
* Upgraded to third pre-release of Octave 2.0.14
* Among other things, this defines __NO_MATH_INLINES to prevent the use
@@ -1135,7 +1173,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Thu, 22 Oct 1998 19:16:46 -0400
-octave (2.0.13-6) unstable; urgency=low, Closes=26468 26776
+octave (2.0.13-6) unstable; urgency=low
* Recompiled under egcs_2.91.57 and libstdc++_2.91.57 (fixes #26776)
* Changed cursor keybindings for inferior-octave-mode to comments in
@@ -1151,7 +1189,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Sat, 19 Sep 1998 12:34:22 -0400
-octave (2.0.13-5) unstable; urgency=low, Closes=24490 24497
+octave (2.0.13-5) unstable; urgency=low
* Added the default LOADPATH to LOADPATH setting in /etc/octave.conf
* Changed emacsen-common to be more tolerant on rmdir (fixes #24490)
@@ -1159,7 +1197,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Fri, 17 Jul 1998 18:21:34 -0400
-octave (2.0.13-4) frozen unstable; urgency=medium, Closes=23674
+octave (2.0.13-4) frozen unstable; urgency=medium
* Applied patch by Roman Hodek <Roman.Hodek at informatik.uni-erlangen.de>
to configure{,.in} to also use the -rpath linker option on non-Intel
@@ -1171,7 +1209,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Fri, 19 Jun 1998 19:47:42 -0400
-octave (2.0.13-3) unstable; urgency=low, Closes=23293
+octave (2.0.13-3) unstable; urgency=low
* Changed debian/rules to set CC=egcc only after an explicit test for
either of i386, alpha or sparc (fixes #23293)
@@ -1199,7 +1237,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Tue, 19 May 1998 20:00:25 -0400
-octave (2.0.12.90-1) unstable frozen; urgency=low, Closes=22424 22491
+octave (2.0.12.90-1) unstable frozen; urgency=low
* Upgraded to new upstream test-release 2.0.12.90 (fixes #22424)
* Changed debian/rules to remove usr/info/dir (fixes #22491)
@@ -1218,7 +1256,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Wed, 29 Apr 1998 07:46:22 -0400
-octave (2.0.11.93-1) unstable; urgency=low, Closes=20372 21222
+octave (2.0.11.93-1) unstable; urgency=low
* Upgraded to new upstream test-release 2.0.11.93
* Adapted to new Emacsen policy (fixes #20372, #21222)
@@ -1232,7 +1270,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Fri, 17 Apr 1998 18:44:10 -0400
-octave (2.0.11.92-2) unstable; urgency=low, closes=20033 20978
+octave (2.0.11.92-2) unstable; urgency=low,
* Added Depends: on "info (>= 3.12-1) | info-browser" to debian/control
as Octave no longer comes with an info binary
@@ -1242,7 +1280,7 @@
-- Dirk Eddelbuettel <edd at debian.org> Thu, 16 Apr 1998 22:46:32 -0400
-octave (2.0.11.92-1) unstable; urgency=low, closes=20033 20978
+octave (2.0.11.92-1) unstable; urgency=low
* Upgraded to new upstream test-release 2.0.11.92
* Compiled with libstdc++2.8_2.90.27-0.6 which provides a correctly
@@ -1421,31 +1459,7 @@
-- Dale Scheetz <dwarf at polaris.net> Mon, 14 Oct 1996 08:42:54 -0400
-Octave-1.1.1-5 dcs
- * Added extended description field.
-Octave-1.1.1-4 dcs
- * Added dependencies for libc5, ncurses3.0, libgr++27 to debian.control.
-
-Octave-1.1.1-3 dcs
- * Removed dld to repair symbol loading problems in ELF.
-
-Octave-1.1.1-2 dcs
-Dale Scheetz <dwarf at polaris.net>
- * Took over package maintenance from Andrew
- * Added this change log
- * Built as ELF with a change from termcap to ncurses
-
-Octave-1.1.1-1 adf
-Andrew D. Fernandes <adfernan at cnd.mcgill.ca>
- * added Debian GNU/Linux package maintenance system files
- * changed configure and configure.in to use debian's dld
- instead of the dld packaged here
-
-GNU Octave is Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997 John W. Eaton
-Source available from: http://bevo.che.utexas.edu/octave
-
-
Local Variables:
debian-changelog-full-name: "Debian Octave Group"
debian-changelog-mailing-address: "pkg-octave-devel at lists.alioth.debian.org"
Added: trunk/packages/octave/debian/changelog-old
===================================================================
--- trunk/packages/octave/debian/changelog-old 2005-07-09 19:38:25 UTC (rev 235)
+++ trunk/packages/octave/debian/changelog-old 2005-09-06 20:59:42 UTC (rev 236)
@@ -0,0 +1,25 @@
+Octave-1.1.1-5 dcs
+ * Added extended description field.
+
+Octave-1.1.1-4 dcs
+ * Added dependencies for libc5, ncurses3.0, libgr++27 to debian.control.
+
+Octave-1.1.1-3 dcs
+ * Removed dld to repair symbol loading problems in ELF.
+
+Octave-1.1.1-2 dcs
+Dale Scheetz <dwarf at polaris.net>
+ * Took over package maintenance from Andrew
+ * Added this change log
+ * Built as ELF with a change from termcap to ncurses
+
+Octave-1.1.1-1 adf
+Andrew D. Fernandes <adfernan at cnd.mcgill.ca>
+ * added Debian GNU/Linux package maintenance system files
+ * changed configure and configure.in to use debian's dld
+ instead of the dld packaged here
+
+GNU Octave is Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997 John W. Eaton
+Source available from: http://bevo.che.utexas.edu/octave
+
+
Added: trunk/packages/octave/debian/compat
===================================================================
--- trunk/packages/octave/debian/compat 2005-07-09 19:38:25 UTC (rev 235)
+++ trunk/packages/octave/debian/compat 2005-09-06 20:59:42 UTC (rev 236)
@@ -0,0 +1 @@
+4
Modified: trunk/packages/octave/debian/copyright
===================================================================
--- trunk/packages/octave/debian/copyright 2005-07-09 19:38:25 UTC (rev 235)
+++ trunk/packages/octave/debian/copyright 2005-09-06 20:59:42 UTC (rev 236)
@@ -1,17 +1,17 @@
This is the Debian GNU/Linux prepackaged version of the GNU Octave
-interactive numerical programming language. GNU Octave was written by
+interactive numerical programming language. GNU Octave was written by
John W. Eaton <jwe at bevo.che.wisc.edu>.
This package was first initially maintained by Andrew D. Fernandes
<adfernan at cnd.mcgill.ca> who passed it to Dale Scheetz <dwarf at polaris.net>.
-The current maintainer is Dirk Eddelbuettel <edd at debian.org>.
+The current maintainer is Dirk Eddelbuettel <edd at debian.org>.
-The original sources can be obtained at
- ftp://bevo.che.wisc.edu/pub/octave
- http://www.octave.org
+The original sources can be obtained at
+ ftp://bevo.che.wisc.edu/pub/octave
+ http://www.octave.org
-See /usr/share/doc/octave/changelog.Debian.gz for details on the
+See /usr/share/doc/octave/changelog.Debian.gz for details on the
applied changes.
GNU Octave is Copyright (C) 1992 - 2003 John W. Eaton
@@ -26,8 +26,8 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
Deleted: trunk/packages/octave/debian/in/PACKAGE-emacsen.conffiles
Deleted: trunk/packages/octave/debian/in/PACKAGE.conffiles
Deleted: trunk/packages/octave/debian/octave-config.1
Modified: trunk/packages/octave/debian/patches/00list
===================================================================
--- trunk/packages/octave/debian/patches/00list 2005-07-09 19:38:25 UTC (rev 235)
+++ trunk/packages/octave/debian/patches/00list 2005-09-06 20:59:42 UTC (rev 236)
@@ -0,0 +1 @@
+50_no-check-nested-functions
Added: trunk/packages/octave/debian/patches/50_no-check-nested-functions.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_no-check-nested-functions.dpatch 2005-07-09 19:38:25 UTC (rev 235)
+++ trunk/packages/octave/debian/patches/50_no-check-nested-functions.dpatch 2005-09-06 20:59:42 UTC (rev 236)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_no-check-nested-functions.dpatch
+## by Rafael Laboissiere <rafael at debian.org>
+##
+## DP: Avoid global function definitions taking over local ones
+
+ at DPATCH@
+
+--- octave2.1-2.1.71.orig/src/variables.cc
++++ octave2.1-2.1.71/src/variables.cc
+@@ -778,7 +778,12 @@
+
+ octave_function *tmp = ans.function_value (true);
+
+- if (tmp)
++ // No need to check nested functions. They can only be executed
++ // from within the parent function that contains them. Parent
++ // and nested functions will be updated simultaneously when we
++ // check the parent.
++
++ if (tmp && ! tmp->is_nested_function ())
+ {
+ std::string ff = tmp->fcn_file_name ();
+
Property changes on: trunk/packages/octave/debian/patches/50_no-check-nested-functions.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules 2005-07-09 19:38:25 UTC (rev 235)
+++ trunk/packages/octave/debian/rules 2005-09-06 20:59:42 UTC (rev 236)
@@ -25,7 +25,7 @@
info_package = $(PACKAGE)-info
debbase := $(CURDIR)/debian
-debtmp := $(debbase)/tmp
+debtmp := $(debbase)/octave2.1
debdoc := $(debtmp)/usr/share/doc/$(PACKAGE)
deblsp := $(debbase)/$(emacs_package)/usr/share/emacs/site-lisp/$(emacs_package)
debini := $(debtmp)/usr/share/octave/site/m/startup
@@ -33,12 +33,12 @@
## edd 3 Feb 2003 gcc 3.2, also imposed uniformly via Build-Depends
## edd 27 Jun 2003 now that gcc 3.3 is in unstable and testing, relax this
-#c_compiler = /usr/bin/gcc-3.2
-#cxx_compiler = /usr/bin/g++-3.2
-#f77_compiler = /usr/bin/g77-3.2
+#c_compiler = /usr/bin/gcc-3.3
+#cxx_compiler = /usr/bin/g++-3.3
+#f77_compiler = /usr/bin/g77-3.3
c_compiler = /usr/bin/gcc
cxx_compiler = /usr/bin/g++
-f77_compiler = /usr/bin/g77
+f77_compiler = /usr/bin/gfortran
fc_flag = --with-f77=$(f77_compiler)
fc_libs =
compilerflags = -O2
@@ -79,7 +79,7 @@
debian/control: debian/in/control
slice -o UNDEF+V_`echo $(major) | sed s/\\\\./_/g`:$@ $<
-maintainer-clean:
+maintainer-clean:
rm -f debian/control
helper-files:
@@ -89,7 +89,7 @@
< $$in > $$out ; \
done
sed 's/@MAJOR@/$(major)/g' < debian/in/watch > debian/watch
-
+
get-orig-source: upstream
upstream:
links ftp://ftp.octave.org/pub/octave/bleeding-edge
@@ -170,11 +170,11 @@
done ; \
done
rm -f debian/$(PACKAGE).lintian octave-depends.1
-
+
for in in debian/in/PACKAGE* ; do \
rm -f `echo $$in | sed 's:/in/:/:;s/PACKAGE/$(PACKAGE)/'` ; \
- done
-
+ done
+
dh_clean
# install files
@@ -251,15 +251,17 @@
# save the static libs for seperate package octave-staticlibs
# dh_movefiles -p$(lib_package) usr/lib/$(source)-$(version)/*.a
# save the include files for the header package
- dh_movefiles -p$(dev_package) usr/include/ \
- usr/bin/mkoctfile-$(version) \
- usr/bin/octave-depends \
+ dh_movefiles -p$(dev_package) --sourcedir=debian/octave2.1 \
+ usr/include/ \
+ usr/bin/mkoctfile-$(version) \
+ usr/bin/octave-depends \
usr/share/man/man1/mkoctfile-$(version).1 \
usr/share/man/man1/octave-depends.1 \
usr/share/octave/debian/defs.make
rm -r $(debtmp)/usr/include
# save the info files for the info package
- dh_movefiles -p$(info_package) usr/share/info/
+ dh_movefiles -p$(info_package) --sourcedir=debian/octave2.1 \
+ usr/share/info/
# install /etc/octave.conf
install -p -m 0644 debian/octave.conf $(debtmp)/etc/$(PACKAGE).conf
# install lintian overrride
More information about the Pkg-octave-commit
mailing list