[Pkg-octave-commit] [SCM] Debian packaging for dynare branch, master, updated. debian/4.2.5-2-18-g2a35554

[Sébastien Villemot]

The following commit has been merged in the master branch:
commit 9b176e22f0d507675e4013c30a3b424ad9bb40ad
Author: Sébastien Villemot <sebastien.villemot at ens.fr>
Date:   Sun Jun 17 12:09:39 2012 +0200

    ftbfs-gcc-47.patch: remove patch, applied upstream

diff --git a/debian/patches/ftbfs-gcc-47.patch b/debian/patches/ftbfs-gcc-47.patch
deleted file mode 100644
index 55cc541..0000000
--- a/debian/patches/ftbfs-gcc-47.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-Description: Fix FTBFS with GCC 4.7
-Origin: upstream, commit: 36d2055d32c05c5c9c5d6251d552e618301d055f
-Bug-Debian: http://bugs.debian.org/672029
-Last-Update: 2012-05-08
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/dynare++/kord/decision_rule.hweb
-+++ b/dynare++/kord/decision_rule.hweb
-@@ -217,7 +217,7 @@
- 		_Ttensym* g_yud = new _Ttensym(ypart.ny(), ypart.nys()+nu, d);
- 		g_yud->zeros();
- 		@<fill tensor of |g_yud| of dimension |d|@>;
--		insert(g_yud);
-+		this->insert(g_yud);
- 	}
- }
- 
-@@ -274,7 +274,7 @@
- 		pol.derivative(d-1);
- 		_Ttensym* der = pol.evalPartially(d, dstate);
- 		der->mult(1.0/dfac);
--		insert(der);
-+		this->insert(der);
- 	}
- }
- 
-@@ -556,7 +556,7 @@
- 				g_yd->add(mult, *ten);
- 			}
- 		}
--		insert(g_yd);
-+		this->insert(g_yd);
- 	}
- }
- 
---- a/dynare++/kord/first_order.hweb
-+++ b/dynare++/kord/first_order.hweb
-@@ -74,10 +74,10 @@
- 			nvs[0] = fo.ypart.nys(); nvs[1] = fo.nu; nvs[2] = fo.nu; nvs[3] = 1;
- 			_Ttensor* ten = new _Ttensor(fo.ypart.ny(), TensorDimens(Symmetry(1,0,0,0),nvs));
- 			ten->zeros(); ten->add(1.0, fo.gy);
--			insert(ten);
-+			this->insert(ten);
- 			ten = new _Ttensor(fo.ypart.ny(), TensorDimens(Symmetry(0,1,0,0), nvs));
- 			ten->zeros(); ten->add(1.0, fo.gu);
--			insert(ten);
-+			this->insert(ten);
- 		}
- };
- 
---- a/dynare++/kord/korder_stoch.hweb
-+++ b/dynare++/kord/korder_stoch.hweb
-@@ -115,7 +115,7 @@
- 			Symmetry sym(i,0,0,p);
- 			_Ttensor* ten = new _Ttensor(r, TensorDimens(sym, nvs));
- 			@<calculate derivative $h_{y^i\sigma^p}$@>;
--			insert(ten);
-+			this->insert(ten);
- 		}
- 	}
- }
-@@ -256,7 +256,7 @@
- 				IntSequence coor(sym, pp);
- 				_Ttensor* ten = new _Ttensor(*(g_int_cent.get(Symmetry(d))), ss, coor,
- 											 TensorDimens(sym, true_nvs));
--				insert(ten);
-+				this->insert(ten);
- 			}
- 		}
- 	}
---- a/dynare++/tl/cc/sthread.hweb
-+++ b/dynare++/tl/cc/sthread.hweb
-@@ -340,7 +340,7 @@
- {
- 	iterator it = _Tparent::find(mmkey(c, id));
- 	if (it != _Tparent::end())
--		erase(it);
-+		this->erase(it);
- }
- 
- @ This is the |synchro| class. The constructor of this class tries to
---- a/preprocessor/ModFile.cc
-+++ b/preprocessor/ModFile.cc
-@@ -21,6 +21,10 @@
- #include <iostream>
- #include <fstream>
- #include <typeinfo>
-+#ifndef _WIN32
-+# include <unistd.h>
-+#endif
-+
- #include "ModFile.hh"
- #include "ConfigFile.hh"
- 
---- a/preprocessor/ModelTree.cc
-+++ b/preprocessor/ModelTree.cc
-@@ -802,8 +802,8 @@
-             {
-               int curr_variable = it->first;
-               int curr_lag = it->second;
--              vector<int>::const_iterator it = find(variable_reordered.begin()+first_count_equ, variable_reordered.begin()+(first_count_equ+Blck_Size), curr_variable);
--              if (it != variable_reordered.begin()+(first_count_equ+Blck_Size))
-+              vector<int>::const_iterator it2 = find(variable_reordered.begin()+first_count_equ, variable_reordered.begin()+(first_count_equ+Blck_Size), curr_variable);
-+              if (it2 != variable_reordered.begin()+(first_count_equ+Blck_Size))
-                 if (dynamic_jacobian.find(make_pair(curr_lag, make_pair(equation_reordered[count_equ], curr_variable))) != dynamic_jacobian.end())
-                   {
-                     if (curr_lag > Lead)
---- a/dynare++/kord/decision_rule.h
-+++ b/dynare++/kord/decision_rule.h
-@@ -236,7 +236,7 @@
- /*:6*/
- #line 219 "./decision_rule.hweb"
- ;
--insert(g_yud);
-+this->insert(g_yud);
- }
- }
- 
-@@ -262,7 +262,7 @@
- pol.derivative(d-1);
- _Ttensym*der= pol.evalPartially(d,dstate);
- der->mult(1.0/dfac);
--insert(der);
-+this->insert(der);
- }
- }
- 
-@@ -452,7 +452,7 @@
- g_yd->add(mult,*ten);
- }
- }
--insert(g_yd);
-+this->insert(g_yd);
- }
- }
- 
---- a/dynare++/kord/first_order.h
-+++ b/dynare++/kord/first_order.h
-@@ -65,10 +65,10 @@
- nvs[0]= fo.ypart.nys();nvs[1]= fo.nu;nvs[2]= fo.nu;nvs[3]= 1;
- _Ttensor*ten= new _Ttensor(fo.ypart.ny(),TensorDimens(Symmetry(1,0,0,0),nvs));
- ten->zeros();ten->add(1.0,fo.gy);
--insert(ten);
-+this->insert(ten);
- ten= new _Ttensor(fo.ypart.ny(),TensorDimens(Symmetry(0,1,0,0),nvs));
- ten->zeros();ten->add(1.0,fo.gu);
--insert(ten);
-+this->insert(ten);
- }
- };
- 
---- a/dynare++/kord/korder_stoch.h
-+++ b/dynare++/kord/korder_stoch.h
-@@ -49,7 +49,7 @@
- /*:4*/
- #line 117 "./korder_stoch.hweb"
- ;
--insert(ten);
-+this->insert(ten);
- }
- }
- }
-@@ -142,7 +142,7 @@
- IntSequence coor(sym,pp);
- _Ttensor*ten= new _Ttensor(*(g_int_cent.get(Symmetry(d))),ss,coor,
- TensorDimens(sym,true_nvs));
--insert(ten);
-+this->insert(ten);
- }
- }
- }
---- a/dynare++/tl/cc/sthread.h
-+++ b/dynare++/tl/cc/sthread.h
-@@ -231,7 +231,7 @@
- {
- iterator it= _Tparent::find(mmkey(c,id));
- if(it!=_Tparent::end())
--erase(it);
-+this->erase(it);
- }
- 
- /*:12*/
diff --git a/debian/patches/series b/debian/patches/series
index da48f3e..35dbb34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 extra-addpatch.patch
 fhs-compliance.patch
-ftbfs-gcc-47.patch
 remove-workaround-octave-32.patch

-- 
Debian packaging for dynare