From 2a2cabe4265ff094bd27b3cc1023c3fafd6c5d40 Mon Sep 17 00:00:00 2001
From: nmburgan <13688219+nmburgan@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:08:14 -0800
Subject: [PATCH] More changes for vox

---
 project.clj                                                     | 2 +-
 resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb     | 2 +-
 .../puppetlabs/lein-ezbake/template/global/tasks/build.rake     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/project.clj b/project.clj
index 33d30ed..37bc90e 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject openvox/lein-ezbake "2.6.3-SNAPSHOT"
+(defproject puppetlabs/lein-ezbake "2.6.3-SNAPSHOT-openvox"
   :description "A system for building packages for trapperkeeper-based applications"
   :url "https://github.com/openvoxproject/ezbake"
   :license {:name "Apache License 2.0"
diff --git a/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb b/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb
index ba9e870..d0ca6b9 100755
--- a/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb
+++ b/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb
@@ -332,7 +332,7 @@
 #deb specific options
 elsif options.output_type == 'deb'
   if options.dist != "#{options.operating_system}#{options.os_version}"
-    options.release = "#{options.release}#{options.dist}"
+    options.release = "#{options.release}+#{options.dist}"
   end
 
   if ! options.is_pe
diff --git a/resources/puppetlabs/lein-ezbake/template/global/tasks/build.rake b/resources/puppetlabs/lein-ezbake/template/global/tasks/build.rake
index eee51f8..ebe615e 100644
--- a/resources/puppetlabs/lein-ezbake/template/global/tasks/build.rake
+++ b/resources/puppetlabs/lein-ezbake/template/global/tasks/build.rake
@@ -82,7 +82,7 @@ namespace :pl do
         stdout, stderr, exitstatus = Pkg::Util::Execution.capture3(%(bash controller.sh debian #{platform} #{staging_path}))
         Pkg::Util::Execution.success?(exitstatus) or raise "Error running packaging: #{stdout}\n#{stderr}"
         puts "#{stdout}\n#{stderr}"
-        FileUtils.cp(Dir.glob("*#{platform}*.deb"), "#{pkg_path}/#{platform_path}")
+        FileUtils.cp(Dir.glob("*.deb"), "#{pkg_path}/#{platform_path}")
       end
       FileUtils.cp_r(pkg_path, nested_output)
       FileUtils.rm_r(staging_path)