[Pkg-octave-commit] rev 299 - in trunk/packages/octave/debian: . in
patches
Rafael Laboissiere
rafael at costa.debian.org
Sun Oct 30 22:16:57 UTC 2005
Author: rafael
Date: 2005-10-30 22:16:56 +0000 (Sun, 30 Oct 2005)
New Revision: 299
Added:
trunk/packages/octave/debian/in/octave2.1-00list
trunk/packages/octave/debian/in/octave2.9-00list
trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.1.dpatch
trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.9.dpatch
Removed:
trunk/packages/octave/debian/patches/00list
Modified:
trunk/packages/octave/debian/changelog
trunk/packages/octave/debian/patches/50_mkoctfile.1-no-negative.dpatch
trunk/packages/octave/debian/rules
Log:
>From the debian/changelog:
* The patches applied by dpatch are now done selectively according to
the version of Octave. For that, the debian/patches/00list file is
now generated when running "./debian/rules maintainer-scripts" from
the files debian/in/$(PACKAGE)-00list.
* debian/rules (maintainer-scripts): Generate file
debian/patches/00list
* debian/in/octave2.1-00list, debian/in/octave2.9-00list: New files.
* debian/patches/50_no-check-nested-functions-2.1.dpatch: New patch,
which is actually the same used in the last version of the package
octave2.1.
* debian/patches/50_no-check-nested-functions-2.9.dpatch: New patch,
only for octave2.9, which is equivalent to the one used for
octave2.1.
Also, add author and description to the header of file
debian/patches/50_mkoctfile.1-no-negative.dpatch
Modified: trunk/packages/octave/debian/changelog
===================================================================
--- trunk/packages/octave/debian/changelog 2005-10-30 02:01:19 UTC (rev 298)
+++ trunk/packages/octave/debian/changelog 2005-10-30 22:16:56 UTC (rev 299)
@@ -1,16 +1,32 @@
octave2.9 (2.9.3-1) experimental; urgency=low
- NOT YET RELEASED
-
+ NOT YET RELEASED
+
+++ Changes by Colin Ingram
* New Upstream Release
* debian/rules: adjusted to build from octave2.9 source directory
* debian/patches/50_no-check-nested-functions.dpatch removed
- * debian/patches/50_mkoctfile.1-no-negative.dpatch added
+ * debian/patches/50_mkoctfile.1-no-negative.dpatch added
- --
+ +++ Changes by Rafael Laboissiere
+ * The patches applied by dpatch are now done selectively according to
+ the version of Octave. For that, the debian/patches/00list file is
+ now generated when running "./debian/rules maintainer-scripts" from
+ the files debian/in/$(PACKAGE)-00list.
+ * debian/rules (maintainer-scripts): Generate file
+ debian/patches/00list
+ * debian/in/octave2.1-00list, debian/in/octave2.9-00list: New files.
+ * debian/patches/50_no-check-nested-functions-2.1.dpatch: New patch,
+ which is actually the same used in the last version of the package
+ octave2.1.
+ * debian/patches/50_no-check-nested-functions-2.9.dpatch: New patch,
+ only for octave2.9, which is equivalent to the one used for
+ octave2.1.
+
+ -- Debian Octave Group <pkg-octave-devel at lists.alioth.debian.org> Sun, 30 Oct 2005 19:54:29 +0100
+
octave2.1 (2.1.71-6) unstable; urgency=low
+++ Changes by Rafael Laboissiere
Added: trunk/packages/octave/debian/in/octave2.1-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.1-00list 2005-10-30 02:01:19 UTC (rev 298)
+++ trunk/packages/octave/debian/in/octave2.1-00list 2005-10-30 22:16:56 UTC (rev 299)
@@ -0,0 +1 @@
+50_no-check-nested-functions-2.1
Added: trunk/packages/octave/debian/in/octave2.9-00list
===================================================================
--- trunk/packages/octave/debian/in/octave2.9-00list 2005-10-30 02:01:19 UTC (rev 298)
+++ trunk/packages/octave/debian/in/octave2.9-00list 2005-10-30 22:16:56 UTC (rev 299)
@@ -0,0 +1,2 @@
+50_mkoctfile.1-no-negative
+50_no-check-nested-functions-2.9
Deleted: trunk/packages/octave/debian/patches/00list
Modified: trunk/packages/octave/debian/patches/50_mkoctfile.1-no-negative.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_mkoctfile.1-no-negative.dpatch 2005-10-30 02:01:19 UTC (rev 298)
+++ trunk/packages/octave/debian/patches/50_mkoctfile.1-no-negative.dpatch 2005-10-30 22:16:56 UTC (rev 299)
@@ -1,8 +1,7 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_mkoctfile.1-no-negative.dpatch by <colin at localhost.localdomain>
+## 50_mkoctfile.1-no-negative.dpatch by Colin Ingram <synergizedmusic at gmail.com>
##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: back-slash escape all minus characters ("-")
@DPATCH@
diff -urNad octave2.9-2.9.3/doc/interpreter/mkoctfile.1 /tmp/dpep.ZFAvG6/octave2.9-2.9.3/doc/interpreter/mkoctfile.1
Added: trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.1.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.1.dpatch 2005-10-30 02:01:19 UTC (rev 298)
+++ trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.1.dpatch 2005-10-30 22:16:56 UTC (rev 299)
@@ -0,0 +1,25 @@
+#! /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
+## DP: (this patch is for octave2.1 only)
+
+ 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-2.1.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.9.dpatch
===================================================================
--- trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.9.dpatch 2005-10-30 02:01:19 UTC (rev 298)
+++ trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.9.dpatch 2005-10-30 22:16:56 UTC (rev 299)
@@ -0,0 +1,25 @@
+#! /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
+## DP: (this patch is for octave2.9 only)
+
+ at DPATCH@
+
+--- octave2.9-2.9.3.orig/src/variables.cc
++++ octave2.9-2.9.3/src/variables.cc
+@@ -983,7 +983,12 @@
+ {
+ bool retval = false;
+
+- if (fcn)
++ // 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 (fcn && ! fcn->is_nested_function ())
+ {
+ std::string ff = fcn->fcn_file_name ();
+
Property changes on: trunk/packages/octave/debian/patches/50_no-check-nested-functions-2.9.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/octave/debian/rules
===================================================================
--- trunk/packages/octave/debian/rules 2005-10-30 02:01:19 UTC (rev 298)
+++ trunk/packages/octave/debian/rules 2005-10-30 22:16:56 UTC (rev 299)
@@ -89,6 +89,7 @@
< $$in > $$out ; \
done
sed 's/@MAJOR@/$(major)/g' < debian/in/watch > debian/watch
+ cp debian/in/$(PACKAGE)-00list debian/patches/00list
get-orig-source: upstream
upstream:
More information about the Pkg-octave-commit
mailing list