# HG changeset patch
# User Bjoern Gruening <bjoern.gruening@gmail.com>
# Date 1369775498 -7200
# Node ID 172caea2920dc047a575c8be6054c27745f94045
# Parent  f35921c5d68d7d6b14a7e942968b7c34b123d303# Parent  c904022ce8e2c2da9d1de14f2e1c8860fa0b5ccb
merge

diff -r f35921c5d68d -r 172caea2920d repository_dependencies.xml
--- a/repository_dependencies.xml	Tue May 28 23:11:21 2013 +0200
+++ b/repository_dependencies.xml	Tue May 28 23:11:38 2013 +0200
@@ -1,4 +1,3 @@
-<?xml version='1.0' encoding='utf-8'?>
 <repositories description="This requires the Molecule datatype definitions (e.g. SMILES, InChI, SD-format).">
-    <repository changeset_revision="a1474892287e" name="molecule_datatypes" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
-</repositories>
\ No newline at end of file
+    <repository changeset_revision="c5383bd4d006" name="molecule_datatypes" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
+</repositories>
diff -r f35921c5d68d -r 172caea2920d tool_dependencies.xml
--- a/tool_dependencies.xml	Tue May 28 23:11:21 2013 +0200
+++ b/tool_dependencies.xml	Tue May 28 23:11:38 2013 +0200
@@ -1,30 +1,27 @@
-<?xml version='1.0' encoding='utf-8'?>
 <tool_dependency>
     <package name="numpy" version="1.7.1">
-        <repository changeset_revision="ed486cc40881" name="package_numpy_1_7" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
+        <repository changeset_revision="1aa6410e151b" name="package_numpy_1_7" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
     </package>
     <package name="openbabel" version="2.3.2">
-        <repository changeset_revision="3a993ff17df5" name="package_openbabel_2_3" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
+        <repository changeset_revision="ccda1b8ebc72" name="package_openbabel_2_3" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
     </package>
     <package name="rdkit" version="2012_12_1">
-        <repository changeset_revision="e5e8ba9d607a" name="package_rdkit_2012_12" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
+        <repository changeset_revision="884c95a27e40" name="package_rdkit_2012_12" owner="bgruening" prior_installation_required="True" toolshed="http://testtoolshed.g2.bx.psu.edu/" />
     </package>
     <package name="silicos_it" version="1.0.0">
         <install version="1.0">
             <actions>
-                <!-- first action is always downloading -->
+                
                 <action type="download_by_url">http://www.silicos-it.com/_php/download.php?file=strip-it-1.0.1.tar.gz</action>
 
-                <!-- populate the environment variables from the dependend repos 
-                    $OPENBABEL_INCLUDE_DIR and $OPENBABEL_LIB_DIR
-                -->
+                
                 <action type="set_environment_for_install">
-                    <repository changeset_revision="3a993ff17df5" name="package_openbabel_2_3" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
+                    <repository changeset_revision="ccda1b8ebc72" name="package_openbabel_2_3" owner="bgruening" toolshed="http://testtoolshed.g2.bx.psu.edu/">
                         <package name="openbabel" version="2.3.2" />
                     </repository>
                 </action>
 
-                <!--compiling strip-it -->
+                
                 <action type="shell_command">
                     cd strip-it-1.0.1 &amp;&amp;
                     cmake . -DOPENBABEL2_INCLUDE_DIRS=$OPENBABEL_INCLUDE_DIR/openbabel-2.0/ -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR/strip-it/ -DOPENBABEL2_LIBRARIES=$OPENBABEL_LIB_DIR/libopenbabel.so &amp;&amp; 
@@ -34,7 +31,7 @@
                     <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/strip-it/bin</environment_variable>
                 </action>
 
-                <!-- compiling align-it -->
+                
                 <action type="shell_command">wget http://www.silicos-it.com/_php/download.php?file=align-it-1.0.3.tar.gz</action>
                 <action type="shell_command">tar xfvz download.php?file=align-it-1.0.3.tar.gz &amp;&amp; 
                     cd align-it-1.0.3 &amp;&amp; 
@@ -45,7 +42,7 @@
                     <environment_variable action="prepend_to" name="PATH">$INSTALL_DIR/align-it/bin</environment_variable>
                 </action>
 
-                <!-- compiling shape-it -->
+                
                 <action type="shell_command">wget http://www.silicos-it.com/_php/download.php?file=shape-it-1.0.1.tar.gz</action>
                 <action type="shell_command">tar xfvz download.php?file=shape-it-1.0.1.tar.gz &amp;&amp; 
                     cd shape-it-1.0.1 &amp;&amp; 
@@ -60,4 +57,4 @@
         </install>
         <readme>Compiling silicos-it requires g++ and CMake 2.4+.</readme>
     </package>
-</tool_dependency>
\ No newline at end of file
+</tool_dependency>