[med-svn] r8679 - in trunk/packages/autodock-vina/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2011-11-28 10:28:16 +0000 (Mon, 28 Nov 2011)
New Revision: 8679

Added:
   trunk/packages/autodock-vina/trunk/debian/patches/fix_boost.patch
Modified:
   trunk/packages/autodock-vina/trunk/debian/changelog
   trunk/packages/autodock-vina/trunk/debian/control
   trunk/packages/autodock-vina/trunk/debian/patches/series
Log:
Start fixing boost issues to close #642697 but not finished (new errors occured after fixing the first one


Modified: trunk/packages/autodock-vina/trunk/debian/changelog
===================================================================
--- trunk/packages/autodock-vina/trunk/debian/changelog	2011-11-27 15:27:45 UTC (rev 8678)
+++ trunk/packages/autodock-vina/trunk/debian/changelog	2011-11-28 10:28:16 UTC (rev 8679)
@@ -1,3 +1,11 @@
+autodock-vina (1.1.2-2) UNRELEASED; urgency=low
+
+  * Fix boost compatibility error
+    Closes: #642697
+  * debian/control: Fixed Vcs fields
+
+ -- Andreas Tille <tille at debian.org>  Mon, 28 Nov 2011 10:58:42 +0100
+
 autodock-vina (1.1.2-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/autodock-vina/trunk/debian/control
===================================================================
--- trunk/packages/autodock-vina/trunk/debian/control	2011-11-27 15:27:45 UTC (rev 8678)
+++ trunk/packages/autodock-vina/trunk/debian/control	2011-11-28 10:28:16 UTC (rev 8679)
@@ -10,8 +10,8 @@
 Build-Depends: debhelper (>= 7), libboost-all-dev
 Standards-Version: 3.9.2
 Homepage: http://vina.scripps.edu
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/autodock-vina/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/autodock-vina/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/autodock-vina/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/autodock-vina/trunk/
 
 Package: autodock-vina
 Architecture: any

Added: trunk/packages/autodock-vina/trunk/debian/patches/fix_boost.patch
===================================================================
--- trunk/packages/autodock-vina/trunk/debian/patches/fix_boost.patch	                        (rev 0)
+++ trunk/packages/autodock-vina/trunk/debian/patches/fix_boost.patch	2011-11-28 10:28:16 UTC (rev 8679)
@@ -0,0 +1,20 @@
+--- autodock-vina-1.1.2.orig/src/main/main.cpp
++++ autodock-vina-1.1.2/src/main/main.cpp
+@@ -661,7 +661,7 @@
+ 					cpu, seed, verbosity, max_modes_sz, energy_range, log);
+ 	}
+ 	catch(file_error& e) {
+-		std::cerr << "\n\nError: could not open \"" << e.name.native_file_string() << "\" for " << (e.in ? "reading" : "writing") << ".\n";
++		std::cerr << "\n\nError: could not open \"" << e.name.string() << "\" for " << (e.in ? "reading" : "writing") << ".\n";
+ 		return 1;
+ 	}
+ 	catch(boost::filesystem::filesystem_error& e) {
+@@ -673,7 +673,7 @@
+ 		return 1;
+ 	}
+ 	catch(parse_error& e) {
+-		std::cerr << "\n\nParse error on line " << e.line << " in file \"" << e.file.native_file_string() << "\": " << e.reason << '\n';
++		std::cerr << "\n\nParse error on line " << e.line << " in file \"" << e.file.string() << "\": " << e.reason << '\n';
+ 		return 1;
+ 	}
+ 	catch(std::bad_alloc&) {

Modified: trunk/packages/autodock-vina/trunk/debian/patches/series
===================================================================
--- trunk/packages/autodock-vina/trunk/debian/patches/series	2011-11-27 15:27:45 UTC (rev 8678)
+++ trunk/packages/autodock-vina/trunk/debian/patches/series	2011-11-28 10:28:16 UTC (rev 8679)
@@ -2,3 +2,4 @@
 top_level_Makefile.patch
 do_not_link_against_unneeded_libs.patch
 annoying_static_removed_was_in_for_a_reason_questionmark.patch
+fix_boost.patch