Merge pull request #221 from svenihoney/debian_fix_unequal

Introduced a dependency mapping for != dependency using Conflicts in deb instead of a Depends
jordansissel · May 23, 2012 · ac5a399 · ac5a399
2 parents 7ec2dd5 + 0182d6f
commit ac5a399
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/fpm/package/deb.rb b/lib/fpm/package/deb.rb
@@ -261,6 +261,10 @@ def fix_dependency(dep)
       nextversion[l-1] = 0
       nextversion = nextversion.join(".")
       return ["#{name} (>= #{version})", "#{name} (<< #{nextversion})"]
+    elsif (m = dep.match(/(\S+)\s+\(!= (.+)\)/))
+      # Append this to conflicts
+      self.conflicts += [dep.gsub(/!=/,"=")]
+      return []
     elsif (m = dep.match(/(\S+)\s+\(= (.+)\)/)) and
         self.attributes[:deb_ignore_iteration_in_dependencies?]
       # Convert 'foo (= x)' to 'foo (>= x)' and 'foo (<< x+1)'