From 6e2217578e01c214b25649411ce36b6f2edbb2fb Mon Sep 17 00:00:00 2001 From: "loic.chabert" Date: Thu, 29 Sep 2022 10:06:47 +0200 Subject: [PATCH 1/2] Replace whatever in changelog.erb and deb.changes.erb In order to support packaging upload, the distribution must be set/aligned in changelog and changes files. Required for example inside dput-ng repo upload app. --- templates/deb/changelog.erb | 2 +- templates/deb/deb.changes.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/deb/changelog.erb b/templates/deb/changelog.erb index 52cf208267..98a2bcd84c 100644 --- a/templates/deb/changelog.erb +++ b/templates/deb/changelog.erb @@ -1,4 +1,4 @@ -<%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) whatever; urgency=medium +<%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) <%= distribution %>; urgency=medium * Package created with FPM. diff --git a/templates/deb/deb.changes.erb b/templates/deb/deb.changes.erb index 912740e03e..8ccfd266d4 100644 --- a/templates/deb/deb.changes.erb +++ b/templates/deb/deb.changes.erb @@ -14,7 +14,7 @@ Description: <%= firstline %> <%= remainder.collect { |l| l =~ /^ *$/ ? " ." : " #{l}" }.join("\n") %> <% end -%> Changes: - <%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) whatever; urgency=medium +<%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) <%= distribution %>; urgency=medium * Package created with FPM. Checksums-Sha1: <% changes_files.each do |file| -%> From 76123af786a680944e6ef32e98740742031b567d Mon Sep 17 00:00:00 2001 From: "loic.chabert" Date: Mon, 3 Oct 2022 14:45:02 +0200 Subject: [PATCH 2/2] Add space on changes.erb to conform with debian specs --- templates/deb/deb.changes.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/deb/deb.changes.erb b/templates/deb/deb.changes.erb index 8ccfd266d4..3f40ba7abc 100644 --- a/templates/deb/deb.changes.erb +++ b/templates/deb/deb.changes.erb @@ -14,7 +14,7 @@ Description: <%= firstline %> <%= remainder.collect { |l| l =~ /^ *$/ ? " ." : " #{l}" }.join("\n") %> <% end -%> Changes: -<%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) <%= distribution %>; urgency=medium + <%= name %> (<%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>) <%= distribution %>; urgency=medium * Package created with FPM. Checksums-Sha1: <% changes_files.each do |file| -%>