The following commit has been merged in the master branch:
commit d44d5848119b1b507f81e2ad1d24638273b570d4
Author: M. Hamish Bowman <hamis...@yahoo.com>
Date: Tue Sep 10 12:59:18 2013 +1200
prepare for 6.4.3
diff --git a/debian/changelog b/debian/changelog
index 1a83be0..a7ba1bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,15 @@
-grass (6.4.2-3) unstable; urgency=low
+grass (6.4.3-1) unstable; urgency=low
+ * Packaged new upstream version.
* Build-Depends on libpng-dev for LibPNG transition.
(closes: #662361)
* grass-dev needs to depend on libfreetype6-dev for building addons.
- * Enable GEOS support
+ * Enable GEOS support.
* Build-Depends on libmotif-dev for Motif transition.
(closes: #714679)
- * Partial enable of the hardening flags
+ * Partial enable of the hardening flags.
- -- M. Hamish Bowman <hamis...@yahoo.com> Mon, 05 Aug 2013 08:22:19 +1200
+ -- M. Hamish Bowman <hamis...@yahoo.com> Tue, 10 Sep 2013 12:50:42 +1200
grass (6.4.2-2) unstable; urgency=low
diff --git a/debian/patches/iostream_cpp470 b/debian/patches/iostream_cpp470
deleted file mode 100644
index 35b1b12..0000000
--- a/debian/patches/iostream_cpp470
+++ /dev/null
@@ -1,116 +0,0 @@
-Index: grass/lib/iostream/mm.cc
-===================================================================
---- grass.orig/lib/iostream/mm.cc (revision 48704)
-+++ grass/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/include/iostream/mm.h
-===================================================================
---- grass.orig/include/iostream/mm.h (revision 32629)
-+++ grass/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/include/iostream/minmaxheap.h
-===================================================================
---- grass.orig/include/iostream/minmaxheap.h (revision 41531)
-+++ grass/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 2272ff9..ee9d410 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,4 @@ pager
xterm
instdir
check4dev
-iostream_cpp470
+barscale_ui
--
Geographic Resources Analysis Support System
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
