Bug 26685: Move starman out of debian/control.in and into cpanfile

to test...
 - apply patch
 - build and install new package
 - confirm starman package displays correctly in about.pl page

Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

diff --git a/cpanfile b/cpanfile
index d86c248..1cc10fa 100644 (file)
--- a/cpanfile
+++ b/cpanfile
@@ -96,6 +96,7 @@ requires 'Schedule::At', '1.06';
 requires 'Search::Elasticsearch', '5.01';
 requires 'Sereal::Decoder', '3.0';
 requires 'Sereal::Encoder', '3.0';
+requires 'Starman', '0.4014';
 requires 'Storable', '2.20';
 requires 'String::Random', '0.22';
 requires 'Template', '>= 2.22, != 3.008';

diff --git a/debian/control.in b/debian/control.in
index a6cbf7d..e1efe67 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -28,7 +28,6 @@ Depends: ${misc:Depends}, ${koha:Depends},
  perl-doc,
  pwgen,
  rabbitmq-server,
- starman,
  sudo,
  fonts-dejavu | ttf-dejavu,
  unzip,
@@ -76,7 +75,6 @@ Depends: ${misc:Depends},
  perl-doc,
  pwgen,
  rabbitmq-server,
- starman,
  sudo,
  fonts-dejavu | ttf-dejavu,
  unzip,

diff --git a/debian/list-deps b/debian/list-deps
index 877e4a5..687fb26 100755 (executable)
--- a/debian/list-deps
+++ b/debian/list-deps
@@ -35,6 +35,7 @@ my %overrides = (
     'CPAN::Meta'           => 'libcpan-meta-perl (>= 2.150010) | perl-modules-5.28 | perl-modules-5.30 | perl-modules (>= 5.20.2)',
     'CGI::Compile'         => 'libcgi-compile-perl (>= 0.25) | libcgi-compile-perl (<< 0.24)',
     'DBD::SQLite'          => 'libdbd-sqlite3-perl',
+    'Starman'              => 'starman',
 );
 
 # These are packages we're going to ignore