autoproj 1.5.5 → 1.5.6

data/History.txt

@@ -1,3 +1,6 @@
+= Version 1.5.6
+ * quickfix stupid bug in 1.5.5
+
 = Version 1.5.5
  * allow to exclude some packages on some architectures
 

data/Manifest.txt

@@ -29,6 +29,7 @@ doc/guide/src/package_sets/index.page
 doc/guide/src/package_sets/manifest-xml.page
 doc/guide/src/package_sets/osdeps.page
 doc/guide/src/quick_start.page
+doc/guide/src/toc.page
 doc/guide/src/writing_manifest.page
 lib/autoproj.rb
 lib/autoproj/autobuild.rb

data/doc/guide/src/customization.page

@@ -114,11 +114,19 @@ This file can in particular be used to avoid further updates to a given software
 package. Simply do:
 
 {coderay:: yaml}
-version_control:
+overrides:
   - orocos/rtt:
     type: none
 {coderay}
 
+To track a different branch that the default branch, you will have to do:
+
+{coderay:: yaml}
+overrides:
+  - orocos/rtt:
+    branch: experimental
+{coderay}
+
 Building local packages
 -----------------------
 

data/doc/guide/src/toc.page

@@ -0,0 +1,7 @@
+---
+title: Table of Contents
+sort_info: -1
+---
+
+{menu: {nested: true, used_nodes: all, min_levels: 10, max_levels: 10}}
+

data/lib/autoproj/osdeps.rb

@@ -211,7 +211,7 @@ module Autoproj
 
 
         def generate_os_script(dependencies)
-            os_name, os_version = operating_system
+            os_name, os_version = OSDependencies.operating_system
             os_packages, shell_snippets = resolve_os_dependencies(dependencies)
 
             "#! /bin/bash\n" +

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.5.5"
+    VERSION = "1.5.6"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 5
-  version: 1.5.5
+  - 6
+  version: 1.5.6
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -210,6 +210,7 @@ files:
 - doc/guide/src/package_sets/manifest-xml.page
 - doc/guide/src/package_sets/osdeps.page
 - doc/guide/src/quick_start.page
+- doc/guide/src/toc.page
 - doc/guide/src/writing_manifest.page
 - lib/autoproj.rb
 - lib/autoproj/autobuild.rb