autoproj 1.7.9 → 1.7.10

data/History.txt

@@ -1,18 +1,19 @@
+= Version 1.7.10
+ * really fix support of virtual packages on dpkg-based systems (debian, ubuntu)
+   1.7.9 was only supporting packages that were providing only one package
+  
 = Version 1.7.9
  * improve ruby 1.9 compatibility
  * fix ignoring osdeps dependencies completely, i.e.
-
     ruby: ignore
-
    is now working fine (before, one had to provide at least an OS name)
-
  * on dpkg-based systems (debian, ubuntu), fix detection of installed virtual packages
  * fix passing autoproj options from aup and amake to autoproj itself (it was
    broken). One can now *really* do
-
      amake --no-deps
-
    as advertised by the 1.7.8 release notes.
+ * autoproj_bootstrap now follows the AUTOPROJ_DEFAULT_OSDEPS environment
+   variable
 
 = Version 1.7.8
  * fix bootstrap and switch-config with VCS options (i.e. setting a branch on

data/bin/autoproj_bootstrap

@@ -196,7 +196,7 @@ module Autoproj
                     root_dir ||= "#{Autoproj.root_dir}/"
                     old = source_of(h).gsub(root_dir, '')
                     new = info.source_of(h).gsub(root_dir, '')
-                    Autoproj.warn("osdeps definition for #{h}, previously defined in #{old} overriden by #{new}")
+                    Autoproj.warn("osdeps definition for #{h}, previously defined in #{old} overridden by #{new}")
                 end
                 v2
             end
@@ -359,7 +359,7 @@ module Autoproj
                     elsif line =~ /Package: (.*)$/
                         current_packages << $1
                     elsif line =~ /Provides: (.*)$/
-                        current_packages << $1
+                        current_packages.concat($1.split(',').map(&:strip))
                     elsif line == "Status: install ok installed"
                         is_installed = true
                     end
@@ -941,7 +941,7 @@ So, what do you want ? (all, ruby, os or none)
       #{cmdlines.map { |c| c.join(" ") }.join("\n      ")}
     
     Autoproj expects these Gems to be installed in #{Autoproj.gem_home} This can
-    be overriden by setting the AUTOPROJ_GEM_HOME environment variable manually
+    be overridden by setting the AUTOPROJ_GEM_HOME environment variable manually
 
             EOMSG
             print "    #{Autoproj.color("Press ENTER to continue ", :bold)}"
@@ -1527,7 +1527,12 @@ ENV['AUTOPROJ_OSDEPS_MODE'] = osdeps_mode
 Autobuild.programs['gem'] = nil
 Autoproj::OSDependencies.autodetect_ruby
 
-osdeps_management = Autoproj::OSDependencies.new(YAML.load(DEFS))
+osdeps_management = 
+    if ENV['AUTOPROJ_DEFAULT_OSDEPS']
+        Autoproj::OSDependencies.load(ENV['AUTOPROJ_DEFAULT_OSDEPS'])
+    else
+        Autoproj::OSDependencies.new(YAML.load(DEFS))
+    end
 osdeps_management.silent = false
 
 begin

data/lib/autoproj/autobuild.rb

@@ -313,7 +313,7 @@ def package_common(package_type, spec, &block) # :nodoc:
     if Autobuild::Package[package_name]
         current_file = Autoproj.current_file[1]
         old_file     = Autoproj.manifest.definition_file(package_name)
-        Autoproj.warn "#{package_name} from #{current_file} is overriden by the definition in #{old_file}"
+        Autoproj.warn "#{package_name} from #{current_file} is overridden by the definition in #{old_file}"
 
         return
     end

data/lib/autoproj/osdeps.rb

@@ -97,7 +97,7 @@ module Autoproj
                     root_dir ||= "#{Autoproj.root_dir}/"
                     old = source_of(h).gsub(root_dir, '')
                     new = info.source_of(h).gsub(root_dir, '')
-                    Autoproj.warn("osdeps definition for #{h}, previously defined in #{old} overriden by #{new}")
+                    Autoproj.warn("osdeps definition for #{h}, previously defined in #{old} overridden by #{new}")
                 end
                 v2
             end
@@ -260,7 +260,7 @@ module Autoproj
                     elsif line =~ /Package: (.*)$/
                         current_packages << $1
                     elsif line =~ /Provides: (.*)$/
-                        current_packages << $1
+                        current_packages.concat($1.split(',').map(&:strip))
                     elsif line == "Status: install ok installed"
                         is_installed = true
                     end
@@ -842,7 +842,7 @@ So, what do you want ? (all, ruby, os or none)
       #{cmdlines.map { |c| c.join(" ") }.join("\n      ")}
     
     Autoproj expects these Gems to be installed in #{Autoproj.gem_home} This can
-    be overriden by setting the AUTOPROJ_GEM_HOME environment variable manually
+    be overridden by setting the AUTOPROJ_GEM_HOME environment variable manually
 
             EOMSG
             print "    #{Autoproj.color("Press ENTER to continue ", :bold)}"

data/lib/autoproj/version.rb

@@ -1,3 +1,3 @@
 module Autoproj
-    VERSION = "1.7.9"
+    VERSION = "1.7.10"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: autoproj
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 1
   - 7
-  - 9
-  version: 1.7.9
+  - 10
+  version: 1.7.10
 platform: ruby
 authors: 
 - Sylvain Joyeux
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-02 00:00:00 +02:00
-default_executable: 
+date: 2011-05-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: autobuild
@@ -222,7 +221,6 @@ files:
 - test/data/test_manifest/autoproj/manifest
 - test/test_debian.rb
 - test/test_manifest.rb
-has_rdoc: true
 homepage: http://doudou.github.com/autoproj
 licenses: []
 
@@ -253,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: autobuild
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Easy installation and management of robotics software