[libterralib] 05/24: Imported Debian patch 3.0.3b2-3.1

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libterralib.

commit df750529267dcfcdd2ba3bc14756a412f071bd2e
Author: Paul Wise <pabs3 at bonedaddy.net>
Date:   Wed Mar 22 15:57:53 2006 +0800

    Imported Debian patch 3.0.3b2-3.1
---
 debian/changelog                         |  7 ++++++
 debian/patches/358243_gcc4.1_FTBFS.patch | 37 ++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2d9e45b..45d8676 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libterralib (3.0.3b2-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix GCC 4.1 FTBFS, patch from Martin Michlmayr. Closes: #358243
+
+ -- Paul Wise <pabs3 at bonedaddy.net>  Wed, 22 Mar 2006 15:57:53 +0800
+
 libterralib (3.0.3b2-3) unstable; urgency=low
 
   * New maintainer.  (Closes: #342800)
diff --git a/debian/patches/358243_gcc4.1_FTBFS.patch b/debian/patches/358243_gcc4.1_FTBFS.patch
new file mode 100644
index 0000000..d413d64
--- /dev/null
+++ b/debian/patches/358243_gcc4.1_FTBFS.patch
@@ -0,0 +1,37 @@
+diff -Nur libterralib-3.0.3b2/src/terralib/kernel/TeLegendEntry.h libterralib-3.0.3b2.new/src/terralib/kernel/TeLegendEntry.h
+--- libterralib-3.0.3b2/src/terralib/kernel/TeLegendEntry.h	2004-11-20 02:27:45.000000000 +0800
++++ libterralib-3.0.3b2.new/src/terralib/kernel/TeLegendEntry.h	2006-03-22 15:55:51.000000000 +0800
+@@ -54,7 +54,7 @@
+ public:
+ 
+ 	//! Constructor
+-	TeLegendEntry::TeLegendEntry () : 
++	TeLegendEntry () : 
+ 		label_(""),
+ 		id_(-1),
+ 		theme_(0),
+@@ -62,7 +62,7 @@
+ 		{}
+ 
+ 	//! Constructor
+-	TeLegendEntry::TeLegendEntry (const TeSlice& slice) :
++	TeLegendEntry (const TeSlice& slice) :
+ 		slice_(slice),
+ 		id_(-1),
+ 		theme_(0),
+diff -Nur libterralib-3.0.3b2/src/terralib/kernel/TeSlice.h libterralib-3.0.3b2.new/src/terralib/kernel/TeSlice.h
+--- libterralib-3.0.3b2/src/terralib/kernel/TeSlice.h	2005-03-29 03:56:51.000000000 +0800
++++ libterralib-3.0.3b2.new/src/terralib/kernel/TeSlice.h	2006-03-22 15:55:51.000000000 +0800
+@@ -48,10 +48,10 @@
+ 	string		to_;			//! interval upper value
+ 	
+ 	//! Constructor
+-	TeSlice::TeSlice () : count_(0),from_(""),to_("") {}
++	TeSlice () : count_(0),from_(""),to_("") {}
+ 
+ 	//! Constructor
+-	TeSlice::TeSlice(const string& from, const string& to, int count=0) :
++	TeSlice(const string& from, const string& to, int count=0) :
+      count_(count),
+ 		from_(from),
+ 		to_(to) {}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libterralib.git