Author: tille Date: 2009-04-01 12:13:30 +0000 (Wed, 01 Apr 2009) New Revision: 3260
Added: trunk/packages/plink/trunk/debian/patches/plink-1.05-gcc43.patch Modified: trunk/packages/plink/trunk/debian/changelog trunk/packages/plink/trunk/debian/copyright trunk/packages/plink/trunk/debian/patches/series Log: Added gcc4.3 patch from Gentoo (Thanks to Andrey Kislyuk <[email protected]>) Modified: trunk/packages/plink/trunk/debian/changelog =================================================================== --- trunk/packages/plink/trunk/debian/changelog 2009-03-31 21:24:28 UTC (rev 3259) +++ trunk/packages/plink/trunk/debian/changelog 2009-04-01 12:13:30 UTC (rev 3260) @@ -3,6 +3,8 @@ * New upstream version * debian/get-orig-source * Standards-Version: 3.8.1 (no changes needed) + * Applied gcc4.3 patch from gentoo (Thanks to Andrey Kislyuk + <[email protected]>) -- Andreas Tille <[email protected]> Tue, 31 Mar 2009 22:28:25 +0200 Modified: trunk/packages/plink/trunk/debian/copyright =================================================================== --- trunk/packages/plink/trunk/debian/copyright 2009-03-31 21:24:28 UTC (rev 3259) +++ trunk/packages/plink/trunk/debian/copyright 2009-04-01 12:13:30 UTC (rev 3260) @@ -40,4 +40,4 @@ Public License can be found in `/usr/share/common-licenses/GPL'. The Debian packaging is (C) 2008, Steffen Moeller <[email protected]> and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. Added: trunk/packages/plink/trunk/debian/patches/plink-1.05-gcc43.patch =================================================================== --- trunk/packages/plink/trunk/debian/patches/plink-1.05-gcc43.patch (rev 0) +++ trunk/packages/plink/trunk/debian/patches/plink-1.05-gcc43.patch 2009-04-01 12:13:30 UTC (rev 3260) @@ -0,0 +1,47 @@ +--- plink-1.05-src.orig/helper.cpp ++++ plink-1.05-src/helper.cpp +@@ -36,7 +36,7 @@ + + extern ofstream LOG; + extern Plink * PP; +- ++/* + template <class T> + bool from_string(T& t, + const std::string& s, +@@ -45,7 +45,7 @@ + std::istringstream iss(s); + return !(iss >> f >> t).fail(); + } +- ++*/ + vector<bool> nvec_bool() + { + vector<bool> t(0); +--- plink-1.05-src.orig/helper.h ++++ plink-1.05-src/helper.h +@@ -18,6 +18,9 @@ + #include <vector> + #include <cstdio> + ++#include <iostream> ++#include <sstream> ++ + #include "plink.h" + + template<class T> +@@ -89,7 +92,13 @@ + template <class T> + bool from_string(T& t, + const std::string& s, +- std::ios_base& (*f)(std::ios_base&)); ++ std::ios_base& (*f)(std::ios_base&)) ++{ ++ std::istringstream iss(s); ++ return !(iss >> f >> t).fail(); ++ } ++ ++ + + void error(string); + void shutdown(); Modified: trunk/packages/plink/trunk/debian/patches/series =================================================================== --- trunk/packages/plink/trunk/debian/patches/series 2009-03-31 21:24:28 UTC (rev 3259) +++ trunk/packages/plink/trunk/debian/patches/series 2009-04-01 12:13:30 UTC (rev 3260) @@ -1 +1,2 @@ dynamic.patch +plink-1.05-gcc43.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
