[SCM] grass branch, master, updated. upstream/6.4.1-96-gb0d7a25

[M. Hamish Bowman]

The following commit has been merged in the master branch:
commit ae5c9deff2c6a4a61020d32749c15164ce9bf5bc
Author: M. Hamish Bowman <hamish_b at yahoo.com>
Date:   Thu May 17 20:08:36 2012 +1200

    Add patch to fix C++ FTBFS for gcc 4.7.0; fix -dev pkg warning message patch, was giving false negatives for previously-installed but now removed pkgs

diff --git a/debian/patches/check4dev b/debian/patches/check4dev
index 2c87afb..0c905e5 100644
--- a/debian/patches/check4dev
+++ b/debian/patches/check4dev
@@ -8,7 +8,7 @@ Index: grass/scripts/g.extension/g.extension
  
 +
 +# check if we have the grass include and Make files
-+dpkg-query -W grass-dev > /dev/null 2> /dev/null
++dpkg-query -l grass-dev | grep '^ii' > /dev/null 2> /dev/null
 +if [ $? -ne 0 ] ; then
 +   g.message -w "This module requires the \"grass-dev\" package"
 +fi
diff --git a/debian/patches/iostream_cpp470 b/debian/patches/iostream_cpp470
new file mode 100644
index 0000000..d1e7a4a
--- /dev/null
+++ b/debian/patches/iostream_cpp470
@@ -0,0 +1,116 @@
+Index: /grass/branches/releasebranch_6_4/lib/iostream/mm.cc
+===================================================================
+--- /grass/branches/releasebranch_6_4/lib/iostream/mm.cc	(revision 48704)
++++ /grass/branches/releasebranch_6_4/lib/iostream/mm.cc	(revision 51638)
+@@ -254,11 +254,11 @@
+ }
+ 
+ 
+  
+ /* ************************************************************ */
+-void* operator new[] (size_t sz) {
++void* operator new[] (size_t sz) throw(std::bad_alloc) {
+   void *p;
+   
+   MM_DEBUG cout << "new: sz=" << sz << ", register " 
+ 		<< sz+SIZE_SPACE << "B ,"; 
+ 
+@@ -305,11 +305,11 @@
+ }
+ 
+ 
+  
+ /* ************************************************************ */
+-void* operator new (size_t sz) {
++void* operator new (size_t sz) throw(std::bad_alloc) {
+   void *p;
+   
+   MM_DEBUG cout << "new: sz=" << sz << ", register " 
+ 		<< sz+SIZE_SPACE << "B ,"; 
+ 
+@@ -357,11 +357,11 @@
+ 
+ 
+ 
+ 
+ /* ---------------------------------------------------------------------- */
+-void operator delete (void *ptr)  {
++void operator delete (void *ptr) throw() {
+   size_t sz;
+   void *p;
+   
+   MM_DEBUG cout << "delete: ptr=" << ptr << ","; 
+ 
+@@ -397,11 +397,11 @@
+ 
+ 
+ 
+ 
+ /* ---------------------------------------------------------------------- */
+-void operator delete[] (void *ptr) {
++void operator delete[] (void *ptr) throw() {
+   size_t sz;
+   void *p;
+   
+   MM_DEBUG cout << "delete[]: ptr=" << ptr << ","; 
+ 
+Index: /grass/branches/releasebranch_6_4/include/iostream/mm.h
+===================================================================
+--- /grass/branches/releasebranch_6_4/include/iostream/mm.h	(revision 32629)
++++ /grass/branches/releasebranch_6_4/include/iostream/mm.h	(revision 51638)
+@@ -108,14 +108,14 @@
+   int    space_overhead ();          
+  
+   void print();
+ 
+   friend class mm_register_init;
+-  friend void * operator new(size_t);
+-  friend void * operator new[](size_t);
+-  friend void operator delete(void *);
+-  friend void operator delete[](void *);
++  friend void * operator new(size_t) throw(std::bad_alloc);
++  friend void * operator new[](size_t) throw(std::bad_alloc);
++  friend void operator delete(void *) throw();
++  friend void operator delete[](void *) throw();
+ };
+ 
+ 
+ 
+ 
+Index: /grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h
+===================================================================
+--- /grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h	(revision 41531)
++++ /grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h	(revision 51638)
+@@ -742,11 +742,11 @@
+ HeapIndex MinMaxHeap<T>::fill(T* arr, HeapIndex n) {
+   HeapIndex i;
+   //heap must be empty
+   assert(this->size()==0);
+   for (i = 0; !full() && i<n; i++) {
+-    insert(arr[i]);
++    this->insert(arr[i]);
+   }
+   if (i < n) {
+     assert(i == this->maxsize);
+     return n - i;
+   } else {
+@@ -775,17 +775,17 @@
+ 
+   assert(this->maxsize > 0);
+ 
+   if(old) {
+ 	HeapIndex n = this->size();
+-	this->A = allocateHeap(this->maxsize);	/* allocate a new array */
++	this->A = this->allocateHeap(this->maxsize);  /* allocate a new array */
+ 	/* copy over the old values */
+ 	assert(this->maxsize > n);
+ 	for(HeapIndex i=0; i<=n; i++) {	/* why extra value? -RW */
+ 	  this->A[i] = old[i];
+ 	}	
+-	freeHeap(old);				/* free up old storage */
++	this->freeHeap(old);			/* free up old storage */
+   }
+ 
+ }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e7797bd..2272ff9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ pager
 xterm
 instdir
 check4dev
+iostream_cpp470

-- 
Geographic Resources Analysis Support System