Fix deb package naming

Author: nmburgan

lib/vanagon/platform/deb.rb

@@ -56,15 +56,15 @@ def generate_packaging_artifacts(workdir, name, binding, project) # rubocop:disa
       # @param project [Vanagon::Project] project to name
       # @return [String] name of the debian package for this project
       def package_name(project)
-        "#{project.name}_#{project.version}-#{project.release}#{dist}_#{project.noarch ? 'all' : @architecture}.deb"
+        "#{project.name}-#{project.version}-#{project.release}+#{project.platform.os_name}#{project.platform.os_version}_#{project.noarch ? 'all' : @architecture}.deb"
       end
 
       # Get the expected output dir for the debian packages. This allows us to
       # use some standard tools to ship internally.
       #
       # @return [String] relative path to where debian packages should be staged
       def output_dir(target_repo = "")
-        @output_dir ||= File.join("deb", @platform.dist, target_repo)
+        @output_dir ||= File.join("deb", os_name + os_version, target_repo)
       end
 
       # Returns the string to add a target repo to the platforms' provisioning

resources/deb/changelog.erb

@@ -1,4 +1,4 @@
-<%= @name %> (<%= @version %>-<%= @release %><%= @platform.codename %>) <%= @platform.codename %>; urgency=low
+<%= @name %> (<%= @version %>-<%= @release %>+<%= @platform.os_name %><%= @platform.os_version %>) <%= @platform.os_name %><%= @platform.os_version %>; urgency=low
 
   * Update to version <%= @version %>