rev 19314 - in kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2012-09-29 21:00:15 +0000 (Sat, 29 Sep 2012)
New Revision: 19314

Added:
   kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/patches/
   kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/patches/fix_gcc4.7_ftbfs.diff
   kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/patches/series
Modified:
   kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/changelog
Log:
Add 2.3.0~beta1-1+wheezy1 changes.


Modified: kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/changelog
===================================================================
--- kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/changelog	2012-09-29 20:59:03 UTC (rev 19313)
+++ kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/changelog	2012-09-29 21:00:15 UTC (rev 19314)
@@ -1,3 +1,10 @@
+krusader (1:2.3.0~beta1-1+wheezy1) testing-proposed-updates; urgency=low
+
+  * Backport a patch from upstream git to fix a FTBFS with gcc 4.7.
+    (Closes: #684843, #667231) Patch: fix_gcc4.7_ftbfs.diff.
+
+ -- Modestas Vainius <modax at debian.org>  Sat, 29 Sep 2012 23:01:06 +0300
+
 krusader (1:2.3.0~beta1-1) unstable; urgency=low
 
   * New upstream release.

Added: kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/patches/fix_gcc4.7_ftbfs.diff
===================================================================
--- kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/patches/fix_gcc4.7_ftbfs.diff	                        (rev 0)
+++ kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/patches/fix_gcc4.7_ftbfs.diff	2012-09-29 21:00:15 UTC (rev 19314)
@@ -0,0 +1,34 @@
+From: Christophe Giboudeaux <cgiboudeaux at gmx.com>
+Date: Tue, 01 May 2012 22:45:32 +0000
+Subject: Build with gcc4.7
+X-Git-Url: http://quickgit.kde.org/?p=krusader.git&a=commitdiff&h=ef3edb37ec8390a3128a4a22f5fad1238d1fbe88
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684843
+Origin: backport, commit: ef3edb37ec8390a3128a4a22f5fad1238d1fbe88
+
+---
+Build with gcc4.7
+---
+
+
+--- a/krusader/UserAction/tstring.h
++++ b/krusader/UserAction/tstring.h
+@@ -125,7 +125,7 @@
+     str += s.str;
+     const unsigned disp = length();
+     for (typename taglist::const_iterator it = s.tags.begin(), end = s.tags.end();it != end;++it) {
+-        tags.push_back(make_pair((*it).first + disp, (*it).second));
++        tags.push_back(std::make_pair((*it).first + disp, (*it).second));
+     }
+     return *this;
+ }
+@@ -134,7 +134,7 @@
+ void TagString_t<T>::insertTag(uint pos, const T& t)
+ {
+     assert(pos <= length());
+-    tags.push_back(make_pair(pos, t));
++    tags.push_back(std::make_pair(pos, t));
+ }
+ 
+ #endif
+
+

Added: kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/patches/series
===================================================================
--- kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/patches/series	                        (rev 0)
+++ kde-extras/krusader/tags/2.3.0~beta1-1+wheezy1/debian/patches/series	2012-09-29 21:00:15 UTC (rev 19314)
@@ -0,0 +1 @@
+fix_gcc4.7_ftbfs.diff