From d44c4616461447e59a6cb4d9b54da5c67e1d3b34 Mon Sep 17 00:00:00 2001 From: Paulo Paracatu Date: Mon, 21 Oct 2024 11:10:52 -0300 Subject: [PATCH 1/3] Fix relationship field --- lib/fpm/package/deb.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fpm/package/deb.rb b/lib/fpm/package/deb.rb index 0d536528f..21c0bc0e4 100644 --- a/lib/fpm/package/deb.rb +++ b/lib/fpm/package/deb.rb @@ -49,7 +49,7 @@ class FPM::Package::Deb < FPM::Package (?:-[A-Za-z0-9+~.]+)? # debian_revision /x # Version field pattern RELATIONSHIP_FIELD_PATTERN = /^ - (?[A-z0-9][A-z0-9_.-]+) + (?[A-z0-9+][A-z0-9_.-]+) (?:\s*\((?[<>=]+)\s(?#{VERSION_FIELD_PATTERN})\))? $/x # Relationship field pattern @@ -733,7 +733,7 @@ def converted_from(origin) else # Also replace '::' in the perl module name with '-' modulename = m["name"].gsub("::", "-") - + # Fix any upper-casing or other naming concerns Debian has about packages name = "#{attributes[:cpan_package_name_prefix]}-#{modulename}" From efd25b121796a1255e519209ab38d7e69eb34af5 Mon Sep 17 00:00:00 2001 From: Paulo Paracatu Date: Mon, 21 Oct 2024 11:26:51 -0300 Subject: [PATCH 2/3] fix relationship field values --- lib/fpm/package/deb.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fpm/package/deb.rb b/lib/fpm/package/deb.rb index 21c0bc0e4..5247720c2 100644 --- a/lib/fpm/package/deb.rb +++ b/lib/fpm/package/deb.rb @@ -49,7 +49,7 @@ class FPM::Package::Deb < FPM::Package (?:-[A-Za-z0-9+~.]+)? # debian_revision /x # Version field pattern RELATIONSHIP_FIELD_PATTERN = /^ - (?[A-z0-9+][A-z0-9_.-]+) + (?[A-z0-9][A-z0-9+~.-]+) (?:\s*\((?[<>=]+)\s(?#{VERSION_FIELD_PATTERN})\))? $/x # Relationship field pattern From 1964df8c881cf1c4bed7da554b6e0a1e3c7a8785 Mon Sep 17 00:00:00 2001 From: Paulo Paracatu Date: Tue, 10 Dec 2024 11:10:32 -0300 Subject: [PATCH 3/3] Removed invalid symbol from RELATIONSHIP_FIELD_PATTERN --- lib/fpm/package/deb.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fpm/package/deb.rb b/lib/fpm/package/deb.rb index 5247720c2..c890563f8 100644 --- a/lib/fpm/package/deb.rb +++ b/lib/fpm/package/deb.rb @@ -49,7 +49,7 @@ class FPM::Package::Deb < FPM::Package (?:-[A-Za-z0-9+~.]+)? # debian_revision /x # Version field pattern RELATIONSHIP_FIELD_PATTERN = /^ - (?[A-z0-9][A-z0-9+~.-]+) + (?[A-z0-9][A-z0-9+.-]+) (?:\s*\((?[<>=]+)\s(?#{VERSION_FIELD_PATTERN})\))? $/x # Relationship field pattern